Merge pull request #109 from rodrigograca31/patch-3

kludge to fix null pointer on low memory devices
vstirbu · Mar 29, 2019 · 3620b63 · 3620b63
2 parents 492da6a + d64bc70
commit 3620b63
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.5.8 / 2019-03-29
+
+* fix for low memory devices
+
 # 0.5.7 / 2018-05-29
 
-* fixed support for Android 8
+* fixed support for Android 8
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cordova-instagram-plugin",
-  "version": "0.5.7",
+  "version": "0.5.8",
   "description": "Share the content of a canvas element or a dataUrl encoded image using the Instagram application for iOS and Android.",
   "cordova": {
     "id": "cordova-instagram-plugin",

diff --git a/plugin.xml b/plugin.xml
@@ -2,7 +2,7 @@
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
   xmlns:android="http://schemas.android.com/apk/res/android"
   id="cordova-instagram-plugin"
-  version="0.5.7">
+  version="0.5.8">
 
   <name>Instagram</name>
 

diff --git a/src/android/CDVInstagramPlugin.java b/src/android/CDVInstagramPlugin.java
@@ -151,10 +151,14 @@ private void share(String imageString, String captionString) {
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (resultCode == Activity.RESULT_OK) {
             Log.v("Instagram", "shared ok");
-            this.cbContext.success();
+            if(this.cbContext != null) {
+                this.cbContext.success();
+            }
         } else if (resultCode == Activity.RESULT_CANCELED) {
             Log.v("Instagram", "share cancelled");
-            this.cbContext.error("Share Cancelled");
+            if(this.cbContext != null) {
+                this.cbContext.error("Share Cancelled");
+            }
         }
     }
 }