Merge pull request #37 from leonardo-fernandes/outsystems-fix-system-callback

Do not lose callbackContext when opening a SYSTEM url

Author: nflsilva

src/android/InAppBrowser.java

@@ -164,7 +164,6 @@ public class InAppBrowser extends CordovaPlugin {
      */
     public boolean execute(String action, CordovaArgs args, final CallbackContext callbackContext) throws JSONException {
         if (action.equals("open")) {
-            this.callbackContext = callbackContext;
             final String url = args.getString(0);
             String t = args.optString(1);
             if (t == null || t.equals("") || t.equals(NULL)) {
@@ -175,6 +174,11 @@ public boolean execute(String action, CordovaArgs args, final CallbackContext ca
 
             LOG.d(LOG_TAG, "target = " + target);
 
+            final boolean keepCallback = !SYSTEM.equals(target);
+            if (keepCallback) {
+                this.callbackContext = callbackContext;
+            }
+
             this.cordova.getActivity().runOnUiThread(new Runnable() {
                 @Override
                 public void run() {
@@ -252,7 +256,7 @@ else if (SYSTEM.equals(target)) {
                     }
 
                     PluginResult pluginResult = new PluginResult(PluginResult.Status.OK, result);
-                    pluginResult.setKeepCallback(true);
+                    pluginResult.setKeepCallback(keepCallback);
                     callbackContext.sendPluginResult(pluginResult);
                 }
             });