Adds: delays for app restart in InAppUpdateManagerImpl

WordPress/src/main/java/org/wordpress/android/inappupdate/InAppUpdateAnalyticsTracker.kt

@@ -21,7 +21,7 @@ class InAppUpdateAnalyticsTracker @Inject constructor(
     }
 
     fun trackAppRestartToCompleteUpdate() {
-        tracker.track(AnalyticsTracker.Stat.IN_APP_UPDATE_COMPLETED_WITH_APP_RESTART)
+        tracker.track(AnalyticsTracker.Stat.IN_APP_UPDATE_COMPLETED_WITH_APP_RESTART_BY_USER)
     }
 
     private fun createPropertyMap(updateType: Int): Map<String, String> {

WordPress/src/main/java/org/wordpress/android/inappupdate/InAppUpdateManagerImpl.kt

@@ -22,6 +22,10 @@ import com.google.android.play.core.install.model.UpdateAvailability.DEVELOPER_T
 import com.google.android.play.core.install.model.UpdateAvailability.UPDATE_AVAILABLE
 import com.google.android.play.core.install.model.UpdateAvailability.UPDATE_NOT_AVAILABLE
 import dagger.hilt.android.qualifiers.ApplicationContext
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import org.wordpress.android.inappupdate.IInAppUpdateManager.Companion.APP_UPDATE_FLEXIBLE_REQUEST_CODE
 import org.wordpress.android.inappupdate.IInAppUpdateManager.Companion.APP_UPDATE_IMMEDIATE_REQUEST_CODE
 
@@ -33,6 +37,7 @@ import javax.inject.Singleton
 @Suppress("TooManyFunctions")
 class InAppUpdateManagerImpl(
     @ApplicationContext private val applicationContext: Context,
+    private val coroutineScope: CoroutineScope,
     private val appUpdateManager: AppUpdateManager,
     private val remoteConfigWrapper: RemoteConfigWrapper,
     private val buildConfigWrapper: BuildConfigWrapper,
@@ -51,8 +56,16 @@ class InAppUpdateManagerImpl(
     }
 
     override fun completeAppUpdate() {
-        inAppUpdateAnalyticsTracker.trackAppRestartToCompleteUpdate()
-        appUpdateManager.completeUpdate()
+        coroutineScope.launch(Dispatchers.Main) {
+            // Track the app restart to complete update
+            inAppUpdateAnalyticsTracker.trackAppRestartToCompleteUpdate()
+
+            // Delay so the event above can be logged
+            delay(RESTART_DELAY_IN_MILLIS)
+
+            // Complete the update
+            appUpdateManager.completeUpdate()
+        }
     }
 
     override fun cancelAppUpdate(updateType: Int) {
@@ -226,5 +239,6 @@ class InAppUpdateManagerImpl(
         private const val TAG = "AppUpdateChecker"
         private const val PREF_NAME = "in_app_update_prefs"
         private const val KEY_LAST_APP_UPDATE_CHECK_VERSION = "last_app_update_check_version"
+        private const val RESTART_DELAY_IN_MILLIS = 500L
     }
 }

WordPress/src/main/java/org/wordpress/android/modules/ApplicationModule.java

@@ -34,13 +34,17 @@
 import org.wordpress.android.viewmodel.helpers.ConnectionStatus;
 import org.wordpress.android.viewmodel.helpers.ConnectionStatusLiveData;
 
+import javax.inject.Named;
+
 import dagger.Binds;
 import dagger.Module;
 import dagger.Provides;
 import dagger.android.AndroidInjectionModule;
 import dagger.hilt.InstallIn;
 import dagger.hilt.android.qualifiers.ApplicationContext;
 import dagger.hilt.components.SingletonComponent;
+import kotlinx.coroutines.CoroutineScope;
+import static org.wordpress.android.modules.ThreadModuleKt.APPLICATION_SCOPE;
 
 @InstallIn(SingletonComponent.class)
 @Module(includes = AndroidInjectionModule.class)
@@ -93,6 +97,7 @@ public static AppUpdateManager provideAppUpdateManager(@ApplicationContext Conte
     @Provides
     public static IInAppUpdateManager provideInAppUpdateManager(
             @ApplicationContext Context context,
+            @Named(APPLICATION_SCOPE) CoroutineScope appScope,
             AppUpdateManager appUpdateManager,
             RemoteConfigWrapper remoteConfigWrapper,
             BuildConfigWrapper buildConfigWrapper,
@@ -103,6 +108,7 @@ public static IInAppUpdateManager provideInAppUpdateManager(
         return inAppUpdatesFeatureConfig.isEnabled()
                 ? new InAppUpdateManagerImpl(
                 context,
+                appScope,
                 appUpdateManager,
                 remoteConfigWrapper,
                 buildConfigWrapper,

WordPress/src/test/java/org/wordpress/android/inappupdate/InAppUpdateManagerImplTest.kt

@@ -12,6 +12,7 @@ import com.google.android.play.core.appupdate.AppUpdateOptions
 import com.google.android.play.core.install.model.AppUpdateType
 import com.google.android.play.core.install.model.InstallStatus
 import com.google.android.play.core.install.model.UpdateAvailability
+import kotlinx.coroutines.test.TestScope
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -82,6 +83,7 @@ class InAppUpdateManagerImplTest {
 
         inAppUpdateManager = InAppUpdateManagerImpl(
             applicationContext,
+            TestScope(),
             appUpdateManager,
             remoteConfigWrapper,
             buildConfigWrapper,

libs/analytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java

@@ -1140,7 +1140,7 @@ public enum Stat {
         IN_APP_UPDATE_SHOWN,
         IN_APP_UPDATE_DISMISSED,
         IN_APP_UPDATE_ACCEPTED,
-        IN_APP_UPDATE_COMPLETED_WITH_APP_RESTART;
+        IN_APP_UPDATE_COMPLETED_WITH_APP_RESTART_BY_USER;
 
         /*
          * Please set the event name in the enum only if the new Stat's name in lower case does not match it.