Merge pull request #535 from BranchMetrics/SDK-693-prep-RN-release

SDK-693 Prep RN release

Author: echo-branch

.travis.yml

@@ -10,7 +10,7 @@ cache: yarn
 
 install:
 # Set up RVM, RubyGems, Bundler
-  - rvm use 2.6.5 --default
+  - rvm use 2.6 --default
   - gem update --system
   - gem install bundler
   - bundle check || bundle install

Gemfile.lock

@@ -30,5 +30,5 @@ android {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+' // From node_modules
-    api 'io.branch.sdk.android:library:4.2.1'
+    api 'io.branch.sdk.android:library:4.3.2'
 }

android/build.gradle

@@ -114,7 +114,13 @@ else if (!useTest && liveKey != null) {
 
     public static void reInitSession(Activity reactActivity) {
         Branch branch = Branch.getInstance();
-        branch.reInitSession(reactActivity, referralInitListener);
+        Intent intent = reactActivity.getIntent();
+        if (intent != null) {
+            intent.putExtra("branch_force_new_session", true);
+            branch.reInitSession(reactActivity, referralInitListener);
+        } else {
+            Log.w(REACT_CLASS, "reInitSession was called but the Intent is null");
+        }
     }
 
     public static void initSession(final Uri uri, Activity reactActivity, Branch.BranchUniversalReferralInitListener anInitListener) {
@@ -133,6 +139,11 @@ public static void initSession(final Uri uri, Activity reactActivity) {
             @Override
             public void onInitFinished(JSONObject referringParams, BranchError error) {
 
+                // react native currently expects this to never be null
+                if (referringParams == null) {
+                    referringParams = new JSONObject();
+                }
+
                 Log.d(REACT_CLASS, "onInitFinished");
                 JSONObject result = new JSONObject();
                 Uri referringUri = null;