Remove user agent string query from start up (#1259)

* Remove user agent string query from opens

Only query when needed by v2 event

* revert test change

* adding unlock in catch

Author: gdeluna-branch

Branch-SDK-TestBed/src/main/java/io/branch/branchandroidtestbed/MainActivity.java

@@ -720,7 +720,7 @@ protected void onStart() {
 
     private void initSessionsWithTests() {
         boolean testUserAgent = true;
-        userAgentTests(testUserAgent, 10);
+        userAgentTests(testUserAgent, 1);
     }
 
     // Enqueue several v2 events prior to init to simulate worst timing conditions for user agent fetch

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

@@ -1465,6 +1465,7 @@ void registerAppInit(@NonNull ServerRequestInitSession request, boolean forceBra
 
          ServerRequestInitSession r = requestQueue_.getSelfInitRequest();
          BranchLogger.v("Ordering init calls");
+         BranchLogger.v("Self init request: " + r);
          requestQueue_.printQueue();
 
          // if forceBranchSession aka reInit is true, we want to preserve the callback order in case
@@ -1555,8 +1556,12 @@ public void notifyNetworkAvailable() {
     }
 
     private void setActivityLifeCycleObserver(Application application) {
+        BranchLogger.v("setActivityLifeCycleObserver activityLifeCycleObserver: " + activityLifeCycleObserver
+                + " application: " + application);
         try {
             activityLifeCycleObserver = new BranchActivityLifecycleObserver();
+            BranchLogger.v("setActivityLifeCycleObserver set new activityLifeCycleObserver: " + activityLifeCycleObserver
+                    + " application: " + application);
             /* Set an observer for activity life cycle events. */
             application.unregisterActivityLifecycleCallbacks(activityLifeCycleObserver);
             application.registerActivityLifecycleCallbacks(activityLifeCycleObserver);
@@ -1836,8 +1841,8 @@ void checkForAutoDeepLinkConfiguration() {
                         }
                     }
                 }
+                BranchLogger.v("deepLinkActivity " + deepLinkActivity + " getCurrentActivity " + getCurrentActivity());
                 if (deepLinkActivity != null && getCurrentActivity() != null) {
-                    BranchLogger.v("deepLinkActivity " + deepLinkActivity + " getCurrentActivity " + getCurrentActivity());
                     Activity currentActivity = getCurrentActivity();
 
                     Intent intent = new Intent(currentActivity, Class.forName(deepLinkActivity));

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

@@ -312,6 +312,8 @@ public void resumeWith(@NonNull Object o) {
         }
         catch (Exception exception){
             BranchLogger.w("Caught exception trying to set userAgent " + exception.getMessage());
+            Branch.getInstance().requestQueue_.unlockProcessWait(ServerRequest.PROCESS_WAIT_LOCK.USER_AGENT_STRING_LOCK);
+            Branch.getInstance().requestQueue_.processNextQueueItem("getUserAgentAsync");
         }
     }
 

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

@@ -92,32 +92,6 @@ public void onRequestSucceeded(ServerResponse response, Branch branch) {
     void onInitSessionCompleted(ServerResponse response, Branch branch) {
         DeepLinkRoutingValidator.validate(branch.currentActivityReference_);
         branch.updateSkipURLFormats();
-
-        // Run this after session init, ahead of any V2 event, in the background.
-        if (!Branch.userAgentSync && TextUtils.isEmpty(Branch._userAgentString)) {
-            DeviceSignalsKt.getUserAgentAsync(branch.getApplicationContext(), new Continuation<String>() {
-                @NonNull
-                @Override
-                public CoroutineContext getContext() {
-                    return EmptyCoroutineContext.INSTANCE;
-                }
-
-                @Override
-                public void resumeWith(@NonNull Object o) {
-                    if (o != null) {
-                        BranchLogger.v("onInitSessionCompleted resumeWith userAgent " + o + " on thread " + Thread.currentThread().getName());
-                        Branch._userAgentString = (String) o;
-                    }
-
-                    Branch.getInstance().requestQueue_.unlockProcessWait(PROCESS_WAIT_LOCK.USER_AGENT_STRING_LOCK);
-                    Branch.getInstance().requestQueue_.processNextQueueItem("getUserAgentAsync resumeWith");
-                }
-            });
-        }
-        else {
-            BranchLogger.v("Deferring userAgent string call for sync retrieval");
-        }
-
         BranchLogger.v("onInitSessionCompleted on thread " + Thread.currentThread().getName());
     }
 

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

@@ -256,6 +256,7 @@ void clear() {
     ServerRequestInitSession getSelfInitRequest() {
         synchronized (reqQueueLockObject) {
             for (ServerRequest req : queue) {
+                BranchLogger.v("Checking if " + req + " is instanceof ServerRequestInitSession");
                 if (req instanceof ServerRequestInitSession) {
                     ServerRequestInitSession r = (ServerRequestInitSession) req;
                     if (r.initiatedByClient) {
@@ -350,6 +351,7 @@ else if (requestNeedsSession(req) && !isSessionAvailableForRequest()) {
     }
 
     void insertRequestAtFront(ServerRequest req) {
+        BranchLogger.v("insertRequestAtFront " + req + " networkCount_: " + networkCount_);
         if (networkCount_ == 0) {
             this.insert(req, 0);
         } else {

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

@@ -287,7 +287,7 @@ public void handleFailure(int statusCode, String causeMsg) {
             BranchLogger.v("Preparing V2 event, user agent is " + Branch._userAgentString);
 
             if(TextUtils.isEmpty(Branch._userAgentString)){
-                BranchLogger.v("handleNewRequest adding process wait lock USER_AGENT_STRING_LOCK");
+                BranchLogger.v("User agent is empty, handleNewRequest adding process wait lock USER_AGENT_STRING_LOCK");
                 req.addProcessWaitLock(ServerRequest.PROCESS_WAIT_LOCK.USER_AGENT_STRING_LOCK);
             }