From dd8c37f221df9fa33457027823adac54b69c79a6 Mon Sep 17 00:00:00 2001
From: vojtasmrcek <planarvoid@gmail.com>
Date: Wed, 3 Mar 2021 11:50:54 +0100
Subject: [PATCH] Start QS only for the newly created site

---
 .../java/org/wordpress/android/ui/main/WPMainActivity.java  | 2 --
 .../wordpress/android/ui/mysite/ImprovedMySiteFragment.kt   | 4 ++--
 .../java/org/wordpress/android/ui/mysite/MySiteViewModel.kt | 4 ++--
 .../org/wordpress/android/ui/mysite/QuickStartRepository.kt | 6 +++---
 .../wordpress/android/ui/mysite/QuickStartRepositoryTest.kt | 3 +--
 5 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java
index cc241c4211ec..da86b761ba60 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java
+++ b/WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java
@@ -1060,7 +1060,6 @@ public void onClick(View v) {
                 }
                 break;
             case RequestCodes.CREATE_SITE:
-                passOnActivityResultToMySiteFragment(requestCode, resultCode, data);
                 QuickStartUtils.cancelQuickStartReminder(this);
                 AppPrefs.setQuickStartNoticeRequired(false);
                 AppPrefs.setLastSkippedQuickStartTask(null);
@@ -1096,7 +1095,6 @@ public void onClick(View v) {
                 }
                 break;
             case RequestCodes.SITE_PICKER:
-                passOnActivityResultToMySiteFragment(requestCode, resultCode, data);
                 if (getMySiteFragment() != null) {
                     boolean isSameSiteSelected = data != null
                                                  && data.getIntExtra(SitePickerActivity.KEY_LOCAL_ID, -1) == AppPrefs
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/ImprovedMySiteFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/ImprovedMySiteFragment.kt
index 916c2c8aac7f..0cb8c6be9adf 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/ImprovedMySiteFragment.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/ImprovedMySiteFragment.kt
@@ -434,11 +434,11 @@ class ImprovedMySiteFragment : Fragment(),
                 viewModel.handleSuccessfulDomainRegistrationResult(data.getStringExtra(RESULT_REGISTERED_DOMAIN_EMAIL))
             }
             RequestCodes.CREATE_SITE -> {
-                viewModel.startQuickStart()
+                viewModel.startQuickStart(data.getIntExtra(SitePickerActivity.KEY_LOCAL_ID, -1))
             }
             RequestCodes.SITE_PICKER -> {
                 if (data.getIntExtra(WPMainActivity.ARG_CREATE_SITE, 0) == RequestCodes.CREATE_SITE) {
-                    viewModel.startQuickStart()
+                    viewModel.startQuickStart(data.getIntExtra(SitePickerActivity.KEY_LOCAL_ID, -1))
                 }
             }
         }
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt
index 91ae0e882ada..7c2a06b14843 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/MySiteViewModel.kt
@@ -574,8 +574,8 @@ class MySiteViewModel
         }
     }
 
-    fun startQuickStart() {
-        quickStartRepository.startQuickStart()
+    fun startQuickStart(newSiteLocalID: Int) {
+        quickStartRepository.startQuickStart(newSiteLocalID)
     }
 
     fun onQuickStartMenuInteraction(interaction: DynamicCardMenuInteraction) {
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickStartRepository.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickStartRepository.kt
index 51182ce9a894..245ac4e21466 100644
--- a/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickStartRepository.kt
+++ b/WordPress/src/main/java/org/wordpress/android/ui/mysite/QuickStartRepository.kt
@@ -108,9 +108,9 @@ class QuickStartRepository
         }
     }
 
-    fun startQuickStart() {
-        selectedSiteRepository.getSelectedSite()?.let { site ->
-            quickStartStore.setDoneTask(site.id.toLong(), CREATE_SITE, true)
+    fun startQuickStart(newSiteLocalID: Int) {
+        if (newSiteLocalID != -1) {
+            quickStartStore.setDoneTask(newSiteLocalID.toLong(), CREATE_SITE, true)
             refresh()
         }
     }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/QuickStartRepositoryTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/QuickStartRepositoryTest.kt
index 914e7089704d..7c0a98c88791 100644
--- a/WordPress/src/test/java/org/wordpress/android/ui/mysite/QuickStartRepositoryTest.kt
+++ b/WordPress/src/test/java/org/wordpress/android/ui/mysite/QuickStartRepositoryTest.kt
@@ -139,10 +139,9 @@ class QuickStartRepositoryTest : BaseUnitTest() {
 
     @Test
     fun `start marks CREATE_SITE as done and loads model`() = test {
-        whenever(selectedSiteRepository.getSelectedSite()).thenReturn(site)
         initStore()
 
-        quickStartRepository.startQuickStart()
+        quickStartRepository.startQuickStart(siteId)
 
         verify(quickStartStore).setDoneTask(siteId.toLong(), CREATE_SITE, true)
         assertModel()