Merge pull request #14812 from wordpress-mobile/feature/updates-to-site-store

develric · web-flow · commit e4628191343a · 2021-06-23T17:37:00.000+02:00
Updates to site store
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/JetpackRemoteInstallViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/JetpackRemoteInstallViewModel.kt
@@ -139,7 +139,7 @@ class JetpackRemoteInstallViewModel
     ) {
         mutableActionOnResult.postValue(
                 JetpackResultActionData(
-                        siteStore.getSiteByLocalId(siteId),
+                        siteStore.getSiteByLocalId(siteId)!!,
                         hasAccessToken,
                         action
                 )
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/PublishSettingsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/PublishSettingsViewModel.kt
@@ -190,7 +190,7 @@ constructor(
         val description = resourceProvider.getString(
                 R.string.calendar_scheduled_post_description,
                 postRepository.title,
-                site.name ?: site.url,
+                site?.name ?: site?.url ?: "",
                 postRepository.link
         )
         _onAddToCalendar.value = Event(CalendarEvent(title, description, startTime))
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/StorePostViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/StorePostViewModel.kt
@@ -81,7 +81,7 @@ class StorePostViewModel
         return if (networkUtils.isNetworkAvailable()) {
             postUtils.trackSavePostAnalytics(
                     editPostRepository.getPost(),
-                    siteStore.getSiteByLocalId(editPostRepository.localSiteId)
+                    requireNotNull(siteStore.getSiteByLocalId(editPostRepository.localSiteId))
             )
             uploadService.uploadPost(context, editPostRepository.id, isFirstTimePublish)
             SAVED_ONLINE
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/FetchDomainsUseCase.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/usecases/FetchDomainsUseCase.kt
@@ -38,20 +38,19 @@ class FetchDomainsUseCase @Inject constructor(
         includeDotBlog: Boolean = false,
         size: Int = FETCH_DOMAINS_SIZE
     ): OnSuggestedDomains {
-        val payload = SuggestDomainsPayload(
-                query,
-                segmentId,
-                size,
-                includeVendorDot
-        )
-
         /**
          * Depending on the payload the server may override the following values. Setting this values here to get
          * reasonable results in case SKIP button is pressed ("default" template)
          */
-        payload.includeWordpressCom = true
-        payload.onlyWordpressCom = true
-        payload.includeDotBlogSubdomain = includeDotBlog
+        val payload = SuggestDomainsPayload(
+                query = query,
+                segmentId = segmentId,
+                quantity = size,
+                includeVendorDot = includeVendorDot,
+                includeWordpressCom = true,
+                onlyWordpressCom = true,
+                includeDotBlogSubdomain = includeDotBlog
+        )
 
         return suspendCancellableCoroutine { cont ->
             pair = Pair(payload.query, cont)
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/domains/DomainRegistrationDetailsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/domains/DomainRegistrationDetailsViewModel.kt
@@ -284,7 +284,7 @@ class DomainRegistrationDetailsViewModel @Inject constructor(
         val updatedSite = siteStore.getSiteByLocalId(site.id)
 
         // New domain is not is not reflected in SiteModel yet, try refreshing a site until we get it
-        if (updatedSite.url.endsWith(".wordpress.com") && siteCheckTries < MAX_SITE_CHECK_TRIES) {
+        if (updatedSite?.url?.endsWith(".wordpress.com") == true && siteCheckTries < MAX_SITE_CHECK_TRIES) {
             AppLog.v(
                     T.DOMAIN_REGISTRATION,
                     "Newly registered domain is still not reflected in site model. Refreshing site model..."
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/mlp/ModalLayoutPickerViewModel.kt
@@ -61,7 +61,9 @@ class ModalLayoutPickerViewModel @Inject constructor(
     private val _onCreateNewPageRequested = SingleLiveEvent<PageRequest.Create>()
     val onCreateNewPageRequested: LiveData<PageRequest.Create> = _onCreateNewPageRequested
 
-    private val site: SiteModel by lazy { siteStore.getSiteByLocalId(appPrefsWrapper.getSelectedSite()) }
+    private val site: SiteModel by lazy {
+        requireNotNull(siteStore.getSiteByLocalId(appPrefsWrapper.getSelectedSite()))
+    }
 
     override val useCachedData: Boolean = true
 
@@ -115,7 +117,10 @@ class ModalLayoutPickerViewModel @Inject constructor(
         if (event.isError) {
             setErrorState()
         } else {
-            handleResponse(event.layouts.toLayoutModels(), event.categories.toLayoutCategories())
+            handleResponse(
+                    (event.layouts ?: listOf()).toLayoutModels(),
+                    (event.categories ?: listOf()).toLayoutCategories()
+            )
         }
     }
 
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListEventListener.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/pages/PageListEventListener.kt
@@ -174,11 +174,12 @@ class PageListEventListener(
     @Subscribe(threadMode = MAIN)
     fun onSiteChanged(event: OnSiteChanged) {
         if (!event.isError) {
-            val updatedSite = siteStore.getSiteByLocalId(site.id)
-            if (updatedSite.showOnFront != site.showOnFront ||
-                    updatedSite.pageForPosts != site.pageForPosts ||
-                    updatedSite.pageOnFront != site.pageForPosts) {
-                handleHomepageSettingsChange(updatedSite)
+            siteStore.getSiteByLocalId(site.id)?.let { updatedSite ->
+                if (updatedSite.showOnFront != site.showOnFront ||
+                        updatedSite.pageForPosts != site.pageForPosts ||
+                        updatedSite.pageOnFront != site.pageForPosts) {
+                    handleHomepageSettingsChange(updatedSite)
+                }
             }
         }
     }
diff --git a/WordPress/src/main/java/org/wordpress/android/viewmodel/plugins/PluginBrowserViewModel.kt b/WordPress/src/main/java/org/wordpress/android/viewmodel/plugins/PluginBrowserViewModel.kt
@@ -336,7 +336,7 @@ class PluginBrowserViewModel @Inject constructor(
             return
         }
 
-        site = mSiteStore.getSiteBySiteId(site.siteId)
+        site = requireNotNull(mSiteStore.getSiteBySiteId(site.siteId))
     }
 
     // Keeping the data up to date
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/reader/reblog/ReblogUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/reader/reblog/ReblogUseCaseTest.kt
@@ -18,7 +18,6 @@ import org.wordpress.android.test
 import org.wordpress.android.ui.reader.reblog.ReblogState.MultipleSites
 import org.wordpress.android.ui.reader.reblog.ReblogState.NoSite
 import org.wordpress.android.ui.reader.reblog.ReblogState.SingleSite
-import org.wordpress.android.ui.reader.reblog.ReblogState.Unknown
 
 @InternalCoroutinesApi
 @RunWith(MockitoJUnitRunner::class)
@@ -102,29 +101,4 @@ class ReblogUseCaseTest {
         Assertions.assertThat(peState?.site).isEqualTo(site)
         Assertions.assertThat(peState?.post).isEqualTo(post)
     }
-
-    @Test
-    fun `when user has only one visible WPCOM site but the selected site is not retrieved an error occurs`() = test {
-        val post = ReaderPost()
-        val visibleWPComSites = listOf(null) // One site
-
-        whenever(siteStore.visibleSitesAccessedViaWPCom).thenReturn(visibleWPComSites)
-
-        val state = reblogUseCase.onReblogButtonClicked(post)
-
-        Assertions.assertThat(state).isInstanceOf(Unknown::class.java)
-    }
-
-    @Test
-    fun `when user has more than one visible WPCOM sites but the selected site is not retrieved an error occurs`() =
-            test {
-        val post = ReaderPost()
-        val visibleWPComSites = listOf(null, null) // More sites
-
-        whenever(siteStore.visibleSitesAccessedViaWPCom).thenReturn(visibleWPComSites)
-
-        val state = reblogUseCase.onReblogButtonClicked(post)
-
-        Assertions.assertThat(state).isInstanceOf(Unknown::class.java)
-    }
 }
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/previews/CreateSiteUseCaseTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/previews/CreateSiteUseCaseTest.kt
@@ -45,8 +45,7 @@ class CreateSiteUseCaseTest {
     @Before
     fun setUp() {
         useCase = CreateSiteUseCase(dispatcher, store, urlUtilsWrapper)
-        event = OnNewSiteCreated()
-        event.newSiteRemoteId = 123
+        event = OnNewSiteCreated(newSiteRemoteId = 123)
     }
 
     @Test
diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/services/SiteCreationServiceManagerTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/services/SiteCreationServiceManagerTest.kt
@@ -55,15 +55,15 @@ class SiteCreationServiceManagerTest {
 
     private lateinit var manager: SiteCreationServiceManager
 
-    private val successEvent = OnNewSiteCreated()
+    private lateinit var successEvent: OnNewSiteCreated
     private val genericErrorEvent = OnNewSiteCreated()
-    private val siteExistsErrorEvent = OnNewSiteCreated()
+    private lateinit var siteExistsErrorEvent: OnNewSiteCreated
 
     @Before
     fun setUp() {
         manager = SiteCreationServiceManager(useCase, dispatcher, tracker, TEST_DISPATCHER)
-        successEvent.newSiteRemoteId = NEW_SITE_REMOTE_ID
-        siteExistsErrorEvent.newSiteRemoteId = NEW_SITE_REMOTE_ID
+        successEvent = OnNewSiteCreated(newSiteRemoteId = NEW_SITE_REMOTE_ID)
+        siteExistsErrorEvent = OnNewSiteCreated(newSiteRemoteId = NEW_SITE_REMOTE_ID)
         genericErrorEvent.error = NewSiteError(GENERIC_ERROR, "")
         siteExistsErrorEvent.error = NewSiteError(SITE_NAME_EXISTS, "")
     }
diff --git a/build.gradle b/build.gradle
@@ -131,7 +131,7 @@ ext {
     androidxWorkVersion = "2.4.0"
 
     daggerVersion = '2.29.1'
-    fluxCVersion = '1.19.0'
+    fluxCVersion = '1.19.2-beta-1'
 
     appCompatVersion = '1.0.2'
     coreVersion = '1.3.2'

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ class JetpackRemoteInstallViewModel`
`139`	`139`	`) {`
`140`	`140`	`mutableActionOnResult.postValue(`
`141`	`141`	`JetpackResultActionData(`
`142`		`- siteStore.getSiteByLocalId(siteId),`
	`142`	`+ siteStore.getSiteByLocalId(siteId)!!,`
`143`	`143`	`hasAccessToken,`
`144`	`144`	`action`
`145`	`145`	`)`
Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ constructor(`
`190`	`190`	`val description = resourceProvider.getString(`
`191`	`191`	`R.string.calendar_scheduled_post_description,`
`192`	`192`	`postRepository.title,`
`193`		`- site.name ?: site.url,`
	`193`	`+ site?.name ?: site?.url ?: "",`
`194`	`194`	`postRepository.link`
`195`	`195`	`)`
`196`	`196`	`_onAddToCalendar.value = Event(CalendarEvent(title, description, startTime))`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ class StorePostViewModel`
`81`	`81`	`return if (networkUtils.isNetworkAvailable()) {`
`82`	`82`	`postUtils.trackSavePostAnalytics(`
`83`	`83`	`editPostRepository.getPost(),`
`84`		`- siteStore.getSiteByLocalId(editPostRepository.localSiteId)`
	`84`	`+ requireNotNull(siteStore.getSiteByLocalId(editPostRepository.localSiteId))`
`85`	`85`	`)`
`86`	`86`	`uploadService.uploadPost(context, editPostRepository.id, isFirstTimePublish)`
`87`	`87`	`SAVED_ONLINE`
Original file line number	Diff line number	Diff line change
`@@ -174,11 +174,12 @@ class PageListEventListener(`
`174`	`174`	`@Subscribe(threadMode = MAIN)`
`175`	`175`	`fun onSiteChanged(event: OnSiteChanged) {`
`176`	`176`	`if (!event.isError) {`
`177`		`- val updatedSite = siteStore.getSiteByLocalId(site.id)`
`178`		`- if (updatedSite.showOnFront != site.showOnFront \|\|`
`179`		`- updatedSite.pageForPosts != site.pageForPosts \|\|`
`180`		`- updatedSite.pageOnFront != site.pageForPosts) {`
`181`		`- handleHomepageSettingsChange(updatedSite)`
	`177`	`+ siteStore.getSiteByLocalId(site.id)?.let { updatedSite ->`
	`178`	`+ if (updatedSite.showOnFront != site.showOnFront \|\|`
	`179`	`+ updatedSite.pageForPosts != site.pageForPosts \|\|`
	`180`	`+ updatedSite.pageOnFront != site.pageForPosts) {`
	`181`	`+ handleHomepageSettingsChange(updatedSite)`
	`182`	`+ }`
`182`	`183`	`}`
`183`	`184`	`}`
`184`	`185`	`}`
Original file line number	Diff line number	Diff line change
`@@ -336,7 +336,7 @@ class PluginBrowserViewModel @Inject constructor(`
`336`	`336`	`return`
`337`	`337`	`}`
`338`	`338`
`339`		`- site = mSiteStore.getSiteBySiteId(site.siteId)`
	`339`	`+ site = requireNotNull(mSiteStore.getSiteBySiteId(site.siteId))`
`340`	`340`	`}`
`341`	`341`
`342`	`342`	`// Keeping the data up to date`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,7 @@ class CreateSiteUseCaseTest {`
`45`	`45`	`@Before`
`46`	`46`	`fun setUp() {`
`47`	`47`	`useCase = CreateSiteUseCase(dispatcher, store, urlUtilsWrapper)`
`48`		`- event = OnNewSiteCreated()`
`49`		`- event.newSiteRemoteId = 123`
	`48`	`+ event = OnNewSiteCreated(newSiteRemoteId = 123)`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`@Test`