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

…open Fix #187: Check WeakReference before calling get()
BranchMetrics · Apr 26, 2017 · 373c5df · 373c5df
2 parents 5867bb4 + a5fc5f4
commit 373c5df
Showing 1 changed file with 3 additions and 3 deletions.
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);
             }