Merge pull request #9101 from wordpress-mobile/issue/9081-site-creation-service-invalid-state

Fix bug in NewSiteCreationService - service started multiple times

Author: oguzkocer

WordPress/src/main/java/org/wordpress/android/ui/sitecreation/services/NewSiteCreationService.kt

@@ -111,17 +111,22 @@ class NewSiteCreationService : AutoForeground<NewSiteCreationServiceState>(NewSi
             retryFromState: NewSiteCreationServiceState?,
             data: NewSiteCreationServiceData
         ) {
-            clearSiteCreationServiceState()
+            val currentState = AutoForeground.getState(NewSiteCreationServiceState::class.java)
+            if (currentState == null || currentState.step == FAILURE) {
+                clearSiteCreationServiceState()
 
-            val intent = Intent(context, NewSiteCreationService::class.java)
+                val intent = Intent(context, NewSiteCreationService::class.java)
 
-            intent.putExtra(ARG_DATA, data)
+                intent.putExtra(ARG_DATA, data)
 
-            if (retryFromState != null) {
-                intent.putExtra(ARG_RESUME_PHASE, retryFromState.stepName)
-            }
+                if (retryFromState != null) {
+                    intent.putExtra(ARG_RESUME_PHASE, retryFromState.stepName)
+                }
 
-            context.startService(intent)
+                context.startService(intent)
+            } else {
+                AppLog.w(T.SITE_CREATION, "Service not started - it seems it's already running.")
+            }
         }
 
         fun clearSiteCreationServiceState() {