Always execute init tasks through Tracking Controller (#1228)

Always execute init tasks

Author: gdeluna-branch

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

@@ -1431,7 +1431,7 @@ private void initializeSession(ServerRequestInitSession initRequest, int delay)
             if (forceBranchSession && intent != null) {
                 intent.removeExtra(Defines.IntentKeys.ForceNewBranchSession.getKey()); // SDK-881, avoid double initialization
             }
-            registerAppInit(initRequest, false, forceBranchSession);
+            registerAppInit(initRequest, forceBranchSession);
         } else if (initRequest.callback_ != null) {
             // Else, let the user know session initialization failed because it's already initialized.
             initRequest.callback_.onInitFinished(null, new BranchError("Warning.", BranchError.ERR_BRANCH_ALREADY_INITIALIZED));
@@ -1442,7 +1442,7 @@ private void initializeSession(ServerRequestInitSession initRequest, int delay)
      * Registers app init with params filtered from the intent. Unless ignoreIntent = true, this
      * will wait on the wait locks to complete any pending operations
      */
-     void registerAppInit(@NonNull ServerRequestInitSession request, boolean ignoreWaitLocks, boolean forceBranchSession) {
+     void registerAppInit(@NonNull ServerRequestInitSession request, boolean forceBranchSession) {
          BranchLogger.v("registerAppInit " + request);
          setInitState(SESSION_STATE.INITIALISING);
 
@@ -1464,38 +1464,37 @@ void registerAppInit(@NonNull ServerRequestInitSession request, boolean ignoreWa
          }
          BranchLogger.v("Finished ordering init calls");
          requestQueue_.printQueue();
-         initTasks(request, ignoreWaitLocks);
+         initTasks(request);
 
          requestQueue_.processNextQueueItem("registerAppInit");
      }
 
-    private void initTasks(ServerRequest request, boolean ignoreWaitLocks) {
-         BranchLogger.v("initTasks " + request + " ignoreWaitLocks " + ignoreWaitLocks);
-        if (!ignoreWaitLocks) {
-            // Single top activities can be launched from stack and there may be a new intent provided with onNewIntent() call.
-            // In this case need to wait till onResume to get the latest intent. Bypass this if bypassWaitingForIntent_ is true.
-            if (intentState_ != INTENT_STATE.READY  && isWaitingForIntent()) {
-                BranchLogger.v("Adding INTENT_PENDING_WAIT_LOCK");
-                request.addProcessWaitLock(ServerRequest.PROCESS_WAIT_LOCK.INTENT_PENDING_WAIT_LOCK);
-            }
-
-            request.addProcessWaitLock(ServerRequest.PROCESS_WAIT_LOCK.GAID_FETCH_WAIT_LOCK);
-
-            if (request instanceof ServerRequestRegisterInstall) {
-                request.addProcessWaitLock(ServerRequest.PROCESS_WAIT_LOCK.INSTALL_REFERRER_FETCH_WAIT_LOCK);
-                BranchLogger.v("Adding INSTALL_REFERRER_FETCH_WAIT_LOCK");
-
-                deviceInfo_.getSystemObserver().fetchInstallReferrer(context_, new SystemObserver.InstallReferrerFetchEvents(){
-                    @Override
-                    public void onInstallReferrersFinished() {
-                        request.removeProcessWaitLock(ServerRequest.PROCESS_WAIT_LOCK.INSTALL_REFERRER_FETCH_WAIT_LOCK);
-                        BranchLogger.v("INSTALL_REFERRER_FETCH_WAIT_LOCK removed");
-                        requestQueue_.processNextQueueItem("onInstallReferrersFinished");
-                    }
-                });
-            }
+    private void initTasks(ServerRequest request) {
+        BranchLogger.v("initTasks " + request);
+        // Single top activities can be launched from stack and there may be a new intent provided with onNewIntent() call.
+        // In this case need to wait till onResume to get the latest intent. Bypass this if bypassWaitingForIntent_ is true.
+        if (intentState_ != INTENT_STATE.READY && isWaitingForIntent()) {
+            request.addProcessWaitLock(ServerRequest.PROCESS_WAIT_LOCK.INTENT_PENDING_WAIT_LOCK);
+            BranchLogger.v("Added INTENT_PENDING_WAIT_LOCK");
+        }
+
+        if (request instanceof ServerRequestRegisterInstall) {
+            request.addProcessWaitLock(ServerRequest.PROCESS_WAIT_LOCK.INSTALL_REFERRER_FETCH_WAIT_LOCK);
+            BranchLogger.v("Added INSTALL_REFERRER_FETCH_WAIT_LOCK");
+
+            deviceInfo_.getSystemObserver().fetchInstallReferrer(context_, new SystemObserver.InstallReferrerFetchEvents() {
+                @Override
+                public void onInstallReferrersFinished() {
+                    request.removeProcessWaitLock(ServerRequest.PROCESS_WAIT_LOCK.INSTALL_REFERRER_FETCH_WAIT_LOCK);
+                    BranchLogger.v("INSTALL_REFERRER_FETCH_WAIT_LOCK removed");
+                    requestQueue_.processNextQueueItem("onInstallReferrersFinished");
+                }
+            });
         }
 
+        request.addProcessWaitLock(ServerRequest.PROCESS_WAIT_LOCK.GAID_FETCH_WAIT_LOCK);
+        BranchLogger.v("Added GAID_FETCH_WAIT_LOCK");
+
         deviceInfo_.getSystemObserver().fetchAdId(context_, new SystemObserver.AdsParamsFetchEvents() {
             @Override
             public void onAdsParamsFetchFinished() {

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

@@ -459,6 +459,7 @@ else if (isHuaweiMobileServicesAvailable(context)) {
     }
 
     private void fetchHuaweiAdId(Context context, AdsParamsFetchEvents callback) {
+        BranchLogger.v("Begin fetchHuaweiAdId");
         if(DependencyUtilsKt.classExists(DependencyUtilsKt.huaweiAdvertisingIdClientClass)) {
             AdvertisingIdsKt.getHuaweiAdvertisingInfoObject(context, new Continuation<com.huawei.hms.ads.identifier.AdvertisingIdClient.Info>() {
                 @NonNull
@@ -508,6 +509,7 @@ public void resumeWith(Object o) {
 
 
     private void fetchGoogleAdId(Context context, AdsParamsFetchEvents callback) {
+        BranchLogger.v("Begin fetchGoogleAdId");
         if(DependencyUtilsKt.classExists(DependencyUtilsKt.playStoreAdvertisingIdClientClass)) {
             AdvertisingIdsKt.getGoogleAdvertisingInfoObject(context, new Continuation<AdvertisingIdClient.Info>() {
                 @NonNull
@@ -555,7 +557,7 @@ public void resumeWith(Object o) {
     }
 
     private void setFireAdId(Context context, AdsParamsFetchEvents callback) {
-        BranchLogger.v("setFireAdId");
+        BranchLogger.v("Begin setFireAdId");
         AdvertisingIdsKt.getAmazonFireAdvertisingInfoObject(context, new Continuation<Pair<? extends Integer, ? extends String>>() {
             @NonNull
             @Override
@@ -590,6 +592,7 @@ public void resumeWith(@NonNull Object o) {
     }
 
     public void fetchInstallReferrer(Context context_, InstallReferrerFetchEvents callback) {
+        BranchLogger.v("Begin fetchInstallReferrer");
         try {
             InstallReferrersKt.fetchLatestInstallReferrer(context_, new Continuation<InstallReferrerResult>() {
                 @NonNull

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

@@ -25,6 +25,7 @@ public class TrackingController {
     }
 
     void disableTracking(Context context, boolean disableTracking, @Nullable Branch.TrackingStateCallback callback) {
+        BranchLogger.v("disableTracking context: " + context + " disableTracking: " + disableTracking + " callback: " + callback);
         // If the tracking state is already set to the desired state, then return instantly
         if (trackingDisabled == disableTracking) {
             if (callback != null) {
@@ -86,9 +87,10 @@ private void onTrackingDisabled(Context context) {
     }
 
     private void onTrackingEnabled(Branch.BranchReferralInitListener callback) {
+        BranchLogger.v("onTrackingEnabled callback: " + callback);
         Branch branch = Branch.getInstance();
         if (branch != null) {
-            branch.registerAppInit(branch.getInstallOrOpenRequest(callback, true), true, false);
+            branch.registerAppInit(branch.getInstallOrOpenRequest(callback, true), false);
         }
     }
 }