Merge remote-tracking branch 'origin/trunk' into merge/23.8-rc-2-to-trunk

Author: oguzkocer

WordPress/src/main/java/org/wordpress/android/ui/blaze/blazepromote/BlazePromoteWebViewFragment.kt

@@ -124,7 +124,7 @@ class BlazePromoteWebViewFragment: Fragment(), OnBlazeWebViewClientListener,
 
     @Suppress("DEPRECATION")
     override fun startActivityForFileChooserResult(intent: Intent?, requestCode: Int) {
-        startActivityForResult(intent, requestCode)
+        intent?.let { startActivityForResult(it, requestCode) }
     }
 
     @Suppress("DEPRECATION", "OVERRIDE_DEPRECATION")

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/dashboard/CardsBuilder.kt

@@ -32,10 +32,6 @@ class CardsBuilder @Inject constructor(
             bloggingPromptCardBuilder.build(dashboardCardsBuilderParams.bloggingPromptCardBuilderParams)
                 ?.let { add(it) }
 
-            domainTransferCardBuilder
-                .build(dashboardCardsBuilderParams.domainTransferCardBuilderParams)
-                ?.let { add(it) }
-
             if (dashboardCardsBuilderParams.blazeCardBuilderParams != null) {
                 add(blazeCardBuilder.build(dashboardCardsBuilderParams.blazeCardBuilderParams))
             }
@@ -52,6 +48,10 @@ class CardsBuilder @Inject constructor(
             pagesCardBuilder.build(dashboardCardsBuilderParams.pagesCardBuilderParams)?.let { add(it) }
 
             activityCardBuilder.build(dashboardCardsBuilderParams.activityCardBuilderParams)?.let { add(it) }
+
+            domainTransferCardBuilder
+                .build(dashboardCardsBuilderParams.domainTransferCardBuilderParams)
+                ?.let { add(it) }
         }
     }.toList()
 

WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java

@@ -71,7 +71,6 @@
 import org.wordpress.android.editor.EditorMediaUtils;
 import org.wordpress.android.editor.EditorThemeUpdateListener;
 import org.wordpress.android.editor.ExceptionLogger;
-import org.wordpress.android.editor.ImageSettingsDialogFragment;
 import org.wordpress.android.editor.gutenberg.DialogVisibility;
 import org.wordpress.android.editor.gutenberg.GutenbergEditorFragment;
 import org.wordpress.android.editor.gutenberg.GutenbergPropsBuilder;
@@ -1487,17 +1486,6 @@ public void onRequestPermissionsResult(int requestCode,
     }
 
     private boolean handleBackPressed() {
-        Fragment fragment = getSupportFragmentManager().findFragmentByTag(
-                ImageSettingsDialogFragment.IMAGE_SETTINGS_DIALOG_TAG);
-        if (fragment != null && fragment.isVisible()) {
-            if (fragment instanceof ImageSettingsDialogFragment) {
-                ImageSettingsDialogFragment imFragment = (ImageSettingsDialogFragment) fragment;
-                imFragment.dismissFragment();
-            }
-
-            return false;
-        }
-
         if (mViewPager.getCurrentItem() == PAGE_PUBLISH_SETTINGS) {
             mViewPager.setCurrentItem(PAGE_SETTINGS);
             invalidateOptionsMenu();

WordPress/src/main/java/org/wordpress/android/ui/posts/prepublishing/home/PrepublishingHomeViewModel.kt

@@ -123,16 +123,18 @@ class PrepublishingHomeViewModel @Inject constructor(
                 site
             )
 
-            add(HomeUiState(
-                navigationAction = PrepublishingScreenNavigation.Categories,
-                actionResult = if (categoriesString.isNotEmpty()) {
-                    UiStringText(categoriesString)
-                } else {
-                    run { UiStringRes(R.string.prepublishing_nudges_home_categories_not_set) }
-                },
-                actionClickable = true,
-                onNavigationActionClicked = ::onActionClicked
-            ))
+            if (!editPostRepository.isPage) {
+                add(HomeUiState(
+                    navigationAction = PrepublishingScreenNavigation.Categories,
+                    actionResult = if (categoriesString.isNotEmpty()) {
+                        UiStringText(categoriesString)
+                    } else {
+                        run { UiStringRes(R.string.prepublishing_nudges_home_categories_not_set) }
+                    },
+                    actionClickable = true,
+                    onNavigationActionClicked = ::onActionClicked
+                ))
+            }
 
             add(SocialUiState.Hidden)
 

WordPress/src/main/res/drawable-night/browser_address_bar.xml

@@ -304,9 +304,6 @@ class CardsBuilderTest : BaseUnitTest() {
                 bloggingPromptCardBuilderParams = BloggingPromptCardBuilderParams(
                     mock(), mock(), mock(), mock(), mock(), mock(), mock()
                 ),
-                domainTransferCardBuilderParams = DomainTransferCardBuilderParams(
-                    isEligibleForDomainTransferCard, mock(), mock(), mock()
-                ),
                 blazeCardBuilderParams = PromoteWithBlazeCardBuilderParams(
                     mock(),
                     mock()
@@ -326,6 +323,9 @@ class CardsBuilderTest : BaseUnitTest() {
                     mock(),
                     mock(),
                     mock()
+                ),
+                domainTransferCardBuilderParams = DomainTransferCardBuilderParams(
+                    isEligibleForDomainTransferCard, mock(), mock(), mock()
                 )
             )
         )

WordPress/src/main/res/drawable/browser_address_bar.xml

@@ -112,7 +112,7 @@ class PrepublishingHomeViewModelTest : BaseUnitTest() {
     @Test
     fun `verify that page home actions are propagated to prepublishingHomeUiState once the viewModel is started`() {
         // arrange
-        val expectedActionsAmount = 2
+        val expectedActionsAmount = 1
         whenever(editPostRepository.isPage).thenReturn(true)
 
         // act
@@ -148,6 +148,30 @@ class PrepublishingHomeViewModelTest : BaseUnitTest() {
         assertThat(getHomeUiState(PrepublishingScreenNavigation.Tags)).isNull()
     }
 
+    @Test
+    fun `verify that categories actions is propagated to prepublishingHomeUiState once post is not a page`() {
+        // arrange
+        whenever(editPostRepository.isPage).thenReturn(false)
+
+        // act
+        viewModel.start(editPostRepository, site, false)
+
+        // assert
+        assertThat(getHomeUiState(PrepublishingScreenNavigation.Categories)).isNotNull()
+    }
+
+    @Test
+    fun `verify that categories actions is not propagated to prepublishingHomeUiState once post is a page`() {
+        // arrange
+        whenever(editPostRepository.isPage).thenReturn(true)
+
+        // act
+        viewModel.start(editPostRepository, site, false)
+
+        // assert
+        assertThat(getHomeUiState(PrepublishingScreenNavigation.Categories)).isNull()
+    }
+
     @Test
     fun `verify that header ui state is propagated to prepublishingHomeUiState once the viewModel is started`() {
         // arrange

WordPress/src/test/java/org/wordpress/android/ui/mysite/cards/dashboard/CardsBuilderTest.kt

@@ -22,7 +22,7 @@ ext {
     automatticTracksVersion = '3.3.0'
     gutenbergMobileVersion = 'v1.109.1'
     wordPressAztecVersion = 'v1.8.0'
-    wordPressFluxCVersion = '2.57.1'
+    wordPressFluxCVersion = 'trunk-cdc8effb2affbb1c6bcf01f6606c847f87071d28'
     wordPressLoginVersion = '1.10.0'
     wordPressPersistentEditTextVersion = '1.0.2'
     wordPressUtilsVersion = '3.10.0'
@@ -45,7 +45,7 @@ ext {
     androidxConstraintlayoutComposeVersion = '1.0.1'
     androidxCoreVersion = '1.10.0'
     androidxActivityVersion = '1.8.0'
-    androidxFragmentVersion = '1.5.7'
+    androidxFragmentVersion = '1.6.2'
     androidxGridlayoutVersion = '1.0.0'
     androidxLifecycleVersion = '2.6.2'
     androidxPercentlayoutVersion = '1.0.0'
@@ -105,7 +105,7 @@ ext {
     wiremockHttpClientVersion = '4.3.5.1'
 
     // other
-    androidDesugarVersion = '1.1.8'
+    androidDesugarVersion = '2.0.4'
     wordPressLintVersion = '2.0.0'
 }