Merge pull request #188 from BranchMetrics/fix-android-crash-on-link-open

jdee · web-flow · commit 373c5df3d523 · 2017-04-26T15:24:25.000-07:00
Fix #187: Check WeakReference before calling get()
diff --git a/android/src/main/java/io/branch/rnbranch/RNBranchModule.java b/android/src/main/java/io/branch/rnbranch/RNBranchModule.java
@@ -93,9 +93,9 @@ public void onInitFinished(JSONObject referringParams, BranchError error) {
                 BranchUniversalObject branchUniversalObject =  BranchUniversalObject.getReferredBranchUniversalObject();
                 LinkProperties linkProperties = LinkProperties.getReferredLinkProperties();
 
-                Branch.BranchUniversalReferralInitListener listener = initListener.get();
-                if (listener != null) {
-                    listener.onInitFinished(branchUniversalObject, linkProperties, error);
+                if (initListener != null) {
+                    Branch.BranchUniversalReferralInitListener listener = initListener.get();
+                    if (listener != null) listener.onInitFinished(branchUniversalObject, linkProperties, error);
                 }
                 generateLocalBroadcast(referringParams, uri, branchUniversalObject, linkProperties, error);
             }

Original file line number	Diff line number	Diff line change
`@@ -93,9 +93,9 @@ public void onInitFinished(JSONObject referringParams, BranchError error) {`
`93`	`93`	`BranchUniversalObject branchUniversalObject = BranchUniversalObject.getReferredBranchUniversalObject();`
`94`	`94`	`LinkProperties linkProperties = LinkProperties.getReferredLinkProperties();`
`95`	`95`
`96`		`- Branch.BranchUniversalReferralInitListener listener = initListener.get();`
`97`		`- if (listener != null) {`
`98`		`- listener.onInitFinished(branchUniversalObject, linkProperties, error);`
	`96`	`+ if (initListener != null) {`
	`97`	`+ Branch.BranchUniversalReferralInitListener listener = initListener.get();`
	`98`	`+ if (listener != null) listener.onInitFinished(branchUniversalObject, linkProperties, error);`
`99`	`99`	`}`
`100`	`100`	`generateLocalBroadcast(referringParams, uri, branchUniversalObject, linkProperties, error);`
`101`	`101`	`}`