Merge branch 'master' into wpinho-branch/EMT-1963

Author: wpinho-branch

Branch-SDK/src/main/java/io/branch/coroutines/InstallReferrers.kt

@@ -163,8 +163,9 @@ suspend fun getSamsungGalaxyStoreReferrerDetails(context: Context): InstallRefer
                                         null,
                                         null
                                     )
-                                } catch (e: RemoteException) {
-                                    BranchLogger.w("Caught getSamsungGalaxyStoreReferrerDetails exception: $e")
+                                }
+                                catch (e: Exception) {
+                                    BranchLogger.e("Caught getSamsungGalaxyStoreReferrerDetails exception: $e")
                                     null
                                 }
                             )
@@ -196,6 +197,7 @@ suspend fun getSamsungGalaxyStoreReferrerDetails(context: Context): InstallRefer
 
 suspend fun getXiaomiGetAppsReferrerDetails(context: Context): InstallReferrerResult? {
     return withContext(Dispatchers.Default) {
+        // Install Referrer API availability varies between Xiaomi's MIUI and HyperOS
         if(classExists(xiaomiInstallReferrerClass)) {
             try {
                 val deferredReferrerDetails = CompletableDeferred<InstallReferrerResult?>()
@@ -217,8 +219,8 @@ suspend fun getXiaomiGetAppsReferrerDetails(context: Context): InstallReferrerRe
                                         result.installBeginTimestampServerSeconds,
                                         result.referrerClickTimestampServerSeconds
                                     )
-                                } catch (e: RemoteException) {
-                                    BranchLogger.w("Caught getXiaomiGetAppsReferrerDetails exception: $e")
+                                } catch (e: Exception) {
+                                    BranchLogger.e("Caught getXiaomiGetAppsReferrerDetails exception: $e")
                                     null
                                 }
                             )

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

@@ -51,7 +51,7 @@ public void onActivityStarted(@NonNull Activity activity) {
     @Override
     public void onActivityResumed(@NonNull Activity activity) {
         Branch branch = Branch.getInstance();
-        BranchLogger.v("onActivityResumed, activity = " + activity + " branch: " + branch + " Activities on stack: " + activitiesOnStack_);
+        BranchLogger.v("onActivityResumed, activity = " + activity + " branch: " + branch);
         if (branch == null) return;
 
         // if the intent state is bypassed from the last activity as it was closed before onResume, we need to skip this with the current
@@ -76,18 +76,22 @@ public void onActivityResumed(@NonNull Activity activity) {
         // must be called after session initialization, which relies on checking whether activity
         // that is initializing the session is being launched from stack or anew
         activitiesOnStack_.add(activity.toString());
+        BranchLogger.v("activityCnt_: " + activityCnt_);
+        BranchLogger.v("activitiesOnStack_: " + activitiesOnStack_);
     }
 
     @Override
     public void onActivityPaused(@NonNull Activity activity) {
         Branch branch = Branch.getInstance();
-        BranchLogger.v("onActivityPaused, activity = " + activity  + " branch: " + branch + " Activities on stack: " + activitiesOnStack_);
+        BranchLogger.v("onActivityPaused, activity = " + activity  + " branch: " + branch);
         if (branch == null) return;
 
         /* Close any opened sharing dialog.*/
         if (branch.getShareLinkManager() != null) {
             branch.getShareLinkManager().cancelShareLinkDialog(true);
         }
+        BranchLogger.v("activityCnt_: " + activityCnt_);
+        BranchLogger.v("activitiesOnStack_: " + activitiesOnStack_);
     }
 
     @Override
@@ -101,7 +105,17 @@ public void onActivityStopped(@NonNull Activity activity) {
         if (activityCnt_ < 1) {
             branch.setInstantDeepLinkPossible(false);
             branch.closeSessionInternal();
+
+            /* It is possible some integrations do not call Branch.getAutoInstance() before the first
+            activity's lifecycle methods execute.
+            In such cases, activityCnt_ could be set to -1, which could cause the above line to clear
+            session parameters. Just reset to 0 if we're here.
+            */
+            activityCnt_ = 0;
+            BranchLogger.v("activityCnt_: reset to 0");
         }
+
+        BranchLogger.v("activitiesOnStack_: " + activitiesOnStack_);
     }
 
     @Override
@@ -111,14 +125,15 @@ public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bun
     @Override
     public void onActivityDestroyed(@NonNull Activity activity) {
         Branch branch = Branch.getInstance();
-        BranchLogger.v("onActivityDestroyed, activity = " + activity + " branch: " + branch + " Activities on stack: " + activitiesOnStack_);
+        BranchLogger.v("onActivityDestroyed, activity = " + activity + " branch: " + branch);
         if (branch == null) return;
 
         if (branch.getCurrentActivity() == activity) {
             branch.currentActivityReference_.clear();
         }
 
         activitiesOnStack_.remove(activity.toString());
+        BranchLogger.v("activitiesOnStack_: " + activitiesOnStack_);
     }
 
     boolean isCurrentActivityLaunchedFromStack() {

ChangeLog.md

@@ -1,4 +1,10 @@
 # Branch Android SDK change log
+- v5.18.1
+* _*Master Release*_ - May 27, 2025
+  - Fixes a bug affecting Xiaomi devices.
+  - Fix for rare instances of session parameters getting cleared.
+
+
 - v5.18.0
 * _*Master Release*_ - May 14, 2025
   - Add browser experience for apps that have opted in.

gradle.properties

@@ -1,5 +1,5 @@
-VERSION_NAME=5.18.0
-VERSION_CODE=052200
+VERSION_NAME=5.18.1
+VERSION_CODE=052201
 GROUP=io.branch.sdk.android
 
 POM_DESCRIPTION=Use the Branch SDK (branch.io) to create and power the links that point back to your apps for all of these things and more. Branch makes it incredibly simple to create powerful deep links that can pass data across app install and open while handling all edge cases (using on desktop vs. mobile vs. already having the app installed, etc). Best of all, it is really simple to start using the links for your own app: only 2 lines of code to register the deep link router and one more line of code to create the links with custom data.