Merge pull request #596 from BranchMetrics/Staging

Staging

Author: Aaron Lopez

Branch-2.19.0.jar Branch-2.19.1.jarBranch-2.19.0.jar renamed to Branch-2.19.1.jar

@@ -1,3 +1,3 @@
 fabric-identifier=io.branch.sdk.android.library
-fabric-version=2.19.0
+fabric-version=2.19.1
 fabric-build-type=source

Branch-2.19.0_core.jar Branch-2.19.1_core.jarBranch-2.19.0_core.jar renamed to Branch-2.19.1_core.jar

@@ -2342,16 +2342,24 @@ private void registerAppInit(BranchReferralInitListener
 
         registerInstallOrOpen(request, callback);
     }
-    
+
     /*
-     * Register app init without any wait on wait locks. This will not be getting any params from the intent
+     * Register app init without any wait on intents or other referring params. This will not be getting any params from the intent
      */
     void registerAppReInit() {
+        // on re-init make sure GAID is available
+        if (!trackingController.isTrackingDisabled()) { // Do not get GAID when tracking is disabled
+            isGAParamsFetchInProgress_ = systemObserver_.prefetchGAdsParams(this);
+        }
         if (networkCount_ != 0) {
             networkCount_ = 0;
             requestQueue_.clear();
         }
-        registerInstallOrOpen(getInstallOrOpenRequest(null), null);
+        ServerRequest initRequest = getInstallOrOpenRequest(null);
+        if(isGAParamsFetchInProgress_) {
+            initRequest.addProcessWaitLock(ServerRequest.PROCESS_WAIT_LOCK.GAID_FETCH_WAIT_LOCK);
+        }
+        registerInstallOrOpen(initRequest, null);
     }
 
     private ServerRequest getInstallOrOpenRequest(BranchReferralInitListener callback) {

Branch-SDK/resources/fabric/io.branch.sdk.android.library.properties

@@ -1,4 +1,6 @@
 Branch Android SDK change log
+- v2.19.1 [09-AUG-18] Fixed GAID fetch issue.
+
 - v2.19.0 [03-JUL-18] Support for adding custom install metadata. Fix for an ANR in debug mode. Fix for crash caused by reading user agent. SDK Integration validator.
 
 - v2.18.1 [17-JUN-18] Fixing issue with facebook app link check caused by incorrect value for facebook_app_link_checked state. Fix for app indexing to run on separate thread.

Branch-SDK/src/io/branch/referral/Branch.java

@@ -1,4 +1,4 @@
-VERSION_NAME=2.19.0
+VERSION_NAME=2.19.1
 VERSION_CODE=1
 GROUP=io.branch.sdk.android