Bug 1282289 - Crash when using Android add-on/HelperApps. r=nalexander draft
authordragoslav.mlakar <dragoslav.mlakar@gmail.com>
Thu, 28 Jul 2016 07:19:57 +0200
changeset 393606 a7653f0439cbe7a45fc8a6d34c69bf7980bb256d
parent 392191 80f8eb86d051bb8d62035df741f004e08ec5ab91
child 526626 efab61df4b2284fb948bfa04c85bba293f8a3100
push id24364
push userbmo:dragoslav.mlakar@gmail.com
push dateThu, 28 Jul 2016 05:21:09 +0000
reviewersnalexander
bugs1282289
milestone50.0a1
Bug 1282289 - Crash when using Android add-on/HelperApps. r=nalexander MozReview-Commit-ID: 9mBC1u9RCEE
mobile/android/base/java/org/mozilla/gecko/IntentHelper.java
--- a/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java
+++ b/mobile/android/base/java/org/mozilla/gecko/IntentHelper.java
@@ -582,32 +582,25 @@ public final class IntentHelper implemen
 
         public ResultHandler(JSONObject message) {
             this.message = message;
         }
 
         @Override
         public void onActivityResult(int resultCode, Intent data) {
             JSONObject response = new JSONObject();
-
             try {
                 if (data != null) {
                     if (data.getExtras() != null) {
                         response.put("extras", JSONUtils.bundleToJSON(data.getExtras()));
-                    } else {
-                        response.put("extras", null);
                     }
                     if (data.getData() != null) {
                         response.put("uri", data.getData().toString());
-                    } else {
-                        response.put("uri", null);
                     }
                 }
-
                 response.put("resultCode", resultCode);
             } catch (JSONException e) {
                 Log.w(LOGTAG, "Error building JSON response.", e);
             }
-
             EventDispatcher.sendResponse(message, response);
         }
     }
 }