Merge pull request #14979 from wordpress-mobile/issue/14944-sharing-m…

…enu-visibility Update site sharing menu visibility
wordpress-mobile · Jul 2, 2021 · 7c64af2 · 7c64af2
2 parents 84073f2 + 02b4a9f
commit 7c64af2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.kt b/WordPress/src/main/java/org/wordpress/android/ui/main/MySiteFragment.kt
@@ -1004,7 +1004,7 @@ class MySiteFragment : Fragment(R.layout.my_site_fragment),
         rowThemes.visibility = themesVisibility
 
         // sharing is only exposed for sites accessed via the WPCOM REST API (wpcom or Jetpack)
-        val sharingVisibility = if (SiteUtils.isAccessedViaWPComRest(site)) View.VISIBLE else View.GONE
+        val sharingVisibility = if (site.supportsSharing()) View.VISIBLE else View.GONE
         rowSharing.visibility = sharingVisibility
 
         // show settings for all self-hosted to expose Delete Site

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteListItemBuilder.kt b/WordPress/src/main/java/org/wordpress/android/ui/mysite/SiteListItemBuilder.kt
@@ -150,7 +150,7 @@ class SiteListItemBuilder
         onClick: (ListItemAction) -> Unit,
         showFocusPoint: Boolean = false
     ): ListItem? {
-        return if (siteUtilsWrapper.isAccessedViaWPComRest(site)) {
+        return if (site.supportsSharing()) {
             ListItem(
                     R.drawable.ic_share_white_24dp,
                     UiStringRes(R.string.my_site_btn_sharing),

diff --git a/WordPress/src/test/java/org/wordpress/android/ui/mysite/SiteListItemBuilderTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/mysite/SiteListItemBuilderTest.kt
@@ -386,17 +386,17 @@ class SiteListItemBuilderTest {
     }
 
     @Test
-    fun `share item built if is accessed through WPCom REST`() {
-        whenever(siteUtilsWrapper.isAccessedViaWPComRest(siteModel)).thenReturn(true)
+    fun `share item built if site supports sharing`() {
+        whenever(siteModel.supportsSharing()).thenReturn(true)
 
         val item = siteListItemBuilder.buildShareItemIfAvailable(siteModel, SITE_ITEM_ACTION)
 
         assertThat(item).isEqualTo(SHARING_ITEM)
     }
 
     @Test
-    fun `share item not built if is not accessed through WPCom REST`() {
-        whenever(siteUtilsWrapper.isAccessedViaWPComRest(siteModel)).thenReturn(false)
+    fun `share item not built if site does not supports sharing`() {
+        whenever(siteModel.supportsSharing()).thenReturn(false)
 
         val item = siteListItemBuilder.buildShareItemIfAvailable(siteModel, SITE_ITEM_ACTION)
 

diff --git a/build.gradle b/build.gradle
@@ -133,7 +133,7 @@ ext {
     androidxWorkVersion = "2.4.0"
 
     daggerVersion = '2.29.1'
-    fluxCVersion = '1.21.0-beta-1'
+    fluxCVersion = '1.21.0-beta-2'
 
     appCompatVersion = '1.0.2'
     coreVersion = '1.3.2'