From 95c3644fbc3f80fae4a1737c14c95e6968ebae80 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 25 Jan 2024 01:21:38 +0000 Subject: [PATCH 01/23] feat: Remove pop-up for in-editor photo selection --- .../android/ui/posts/EditPostActivity.java | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java index a6884db857a2..b7a9e24ab287 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java @@ -2842,12 +2842,6 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { // handleMediaPickerResult -> addExistingMediaToEditorAndSave break; case RequestCodes.PHOTO_PICKER: - if (WPMediaUtils.shouldAdvertiseImageOptimization(this)) { - WPMediaUtils.advertiseImageOptimization(this, () -> handlePhotoPickerResult(data)); - } else { - handlePhotoPickerResult(data); - } - break; case RequestCodes.STOCK_MEDIA_PICKER_SINGLE_SELECT: handlePhotoPickerResult(data); break; @@ -2861,18 +2855,12 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { break; case RequestCodes.MEDIA_LIBRARY: case RequestCodes.PICTURE_LIBRARY: - mEditorMedia.advertiseImageOptimisationAndAddMedia(WPMediaUtils.retrieveMediaUris(data)); - break; - case RequestCodes.TAKE_PHOTO: - if (WPMediaUtils.shouldAdvertiseImageOptimization(this)) { - WPMediaUtils.advertiseImageOptimization(this, this::addLastTakenPicture); - } else { - addLastTakenPicture(); - } - break; case RequestCodes.VIDEO_LIBRARY: mEditorMedia.addNewMediaItemsToEditorAsync(WPMediaUtils.retrieveMediaUris(data), false); break; + case RequestCodes.TAKE_PHOTO: + addLastTakenPicture(); + break; case RequestCodes.TAKE_VIDEO: Uri videoUri = data.getData(); mEditorMedia.addNewMediaToEditorAsync(videoUri, true); @@ -3940,10 +3928,6 @@ public void syncPostObjectWithUiAndSaveIt(@Nullable OnPostUpdatedFromUIListener updateAndSavePostAsync(listener); } - @Override public void advertiseImageOptimization(@NonNull Function0 listener) { - WPMediaUtils.advertiseImageOptimization(this, listener::invoke); - } - @Override public void onMediaModelsCreatedFromOptimizedUris(@NonNull Map oldUriToMediaModels) { // no op - we're not doing any special handling on MediaModels in EditPostActivity From b02c0029c90c4747c911307280366890d8de189d Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 25 Jan 2024 01:22:30 +0000 Subject: [PATCH 02/23] feat: Remove pop-up for Story posts --- .../ui/stories/StoryComposerActivity.kt | 4 -- .../ui/stories/media/StoryEditorMedia.kt | 21 +------ .../stories/usecase/StoryEditorMediaTest.kt | 58 +------------------ 3 files changed, 2 insertions(+), 81 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerActivity.kt index 4f6c7cdfa70e..793dc32ce3a5 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerActivity.kt @@ -488,10 +488,6 @@ class StoryComposerActivity : ComposeLoopFrameActivity(), listener?.onPostUpdatedFromUI(null) } - override fun advertiseImageOptimization(listener: () -> Unit) { - WPMediaUtils.advertiseImageOptimization(this) { listener.invoke() } - } - override fun onMediaModelsCreatedFromOptimizedUris(oldUriToMediaFiles: Map) { // no op - we're not doing any special handling while composing, only when saving in the UploadBridge } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stories/media/StoryEditorMedia.kt b/WordPress/src/main/java/org/wordpress/android/ui/stories/media/StoryEditorMedia.kt index 4a7dac9dd852..78f11123c791 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stories/media/StoryEditorMedia.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stories/media/StoryEditorMedia.kt @@ -55,20 +55,6 @@ class StoryEditorMedia @Inject constructor( _uiState.value = AddingMediaToStoryIdle } - // region Adding new media to a post - fun advertiseImageOptimisationAndAddMedia(uriList: List) { - if (mediaUtilsWrapper.shouldAdvertiseImageOptimization()) { - editorMediaListener.advertiseImageOptimization { - addNewMediaItemsToEditorAsync( - uriList, - false - ) - } - } else { - addNewMediaItemsToEditorAsync(uriList, false) - } - } - fun addNewMediaItemsToEditorAsync(uriList: List, freshlyTaken: Boolean) { launch { _uiState.value = if (uriList.size > 1) { @@ -92,12 +78,7 @@ class StoryEditorMedia @Inject constructor( } fun onPhotoPickerMediaChosen(uriList: List) { - val onlyVideos = uriList.all { mediaUtilsWrapper.isVideo(it.toString()) } - if (onlyVideos) { - addNewMediaItemsToEditorAsync(uriList, false) - } else { - advertiseImageOptimisationAndAddMedia(uriList) - } + addNewMediaItemsToEditorAsync(uriList, false) } // endregion diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt index 2bc45b71e985..a42a90bb2d11 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt @@ -28,38 +28,6 @@ import org.wordpress.android.viewmodel.Event @ExperimentalCoroutinesApi class StoryEditorMediaTest : BaseUnitTest() { - @Test - fun `advertiseImageOptimisationAndAddMedia shows dialog when shouldAdvertiseImageOptimization is true`() { - // Arrange - val editorMediaListener = mock() - val mediaUtilsWrapper = createMediaUtilsWrapper(shouldAdvertiseImageOptimization = true) - - // Act - createStoryEditorMedia( - editorMediaListener = editorMediaListener, - mediaUtilsWrapper = mediaUtilsWrapper - ).advertiseImageOptimisationAndAddMedia(mock()) - - // Assert - verify(editorMediaListener).advertiseImageOptimization(anyOrNull()) - } - - @Test - fun `advertiseImageOptimisationAndAddMedia does NOT show dialog when shouldAdvertiseImageOptimization is false`() { - // Arrange - val editorMediaListener = mock() - val mediaUtilsWrapper = createMediaUtilsWrapper(shouldAdvertiseImageOptimization = false) - - // Act - createStoryEditorMedia( - editorMediaListener = editorMediaListener, - mediaUtilsWrapper = mediaUtilsWrapper - ) - .advertiseImageOptimisationAndAddMedia(mock()) - // Assert - verify(editorMediaListener, never()).advertiseImageOptimization(anyOrNull()) - } - @Test fun `addNewMediaItemsToEditorAsync emits AddingSingleMedia for a single uri`() = test { // Arrange @@ -117,26 +85,6 @@ class StoryEditorMediaTest : BaseUnitTest() { verify(observer, never()).onChanged(captor.capture()) } - @Test - fun `onPhotoPickerMediaChosen does NOT invoke shouldAdvertiseImageOptimization when only video files`() = - test { - // Arrange - val uris = listOf(VIDEO_URI, VIDEO_URI, VIDEO_URI, VIDEO_URI) - val editorMediaListener = mock() - - val mediaUtilsWrapper = createMediaUtilsWrapper() - - // Act - createStoryEditorMedia( - mediaUtilsWrapper = mediaUtilsWrapper, - editorMediaListener = editorMediaListener - ) - .onPhotoPickerMediaChosen(uris) - // Assert - verify(editorMediaListener, never()).advertiseImageOptimization(anyOrNull()) - verify(mediaUtilsWrapper, never()).shouldAdvertiseImageOptimization() - } - @Test fun `onPhotoPickerMediaChosen invokes shouldAdvertiseImageOptimization when at least 1 image file`() = test { @@ -177,12 +125,8 @@ class StoryEditorMediaTest : BaseUnitTest() { return editorMedia } - fun createMediaUtilsWrapper( - shouldAdvertiseImageOptimization: Boolean = false - ) = + fun createMediaUtilsWrapper() = mock { - on { shouldAdvertiseImageOptimization() } - .thenReturn(shouldAdvertiseImageOptimization) on { isVideo(VIDEO_URI.toString()) }.thenReturn(true) on { isVideo(IMAGE_URI.toString()) }.thenReturn(false) } From 4c238dc6142b9f5b2805f21888207761c3e2fbfe Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 25 Jan 2024 01:24:38 +0000 Subject: [PATCH 03/23] feat: Remove pop-up for uploads in media screen --- .../ui/media/MediaBrowserActivity.java | 14 +--- .../ui/posts/editor/media/EditorMedia.kt | 21 +----- .../posts/editor/media/EditorMediaListener.kt | 1 - .../ui/posts/editor/media/EditorMediaTest.kt | 71 ------------------- 4 files changed, 3 insertions(+), 104 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java index 520773af12f0..d434f5024f09 100755 --- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java @@ -508,24 +508,14 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { case RequestCodes.PICTURE_LIBRARY: case RequestCodes.VIDEO_LIBRARY: case RequestCodes.AUDIO_LIBRARY: - handlePickerResult(data, resultCode); - break; case RequestCodes.FILE_LIBRARY: if (resultCode == Activity.RESULT_OK && data != null) { - if (WPMediaUtils.shouldAdvertiseImageOptimization(this)) { - WPMediaUtils.advertiseImageOptimization(this, () -> handlePickerResult(data, resultCode)); - } else { - handlePickerResult(data, resultCode); - } + handlePickerResult(data, resultCode); } break; case RequestCodes.TAKE_PHOTO: if (resultCode == Activity.RESULT_OK) { - if (WPMediaUtils.shouldAdvertiseImageOptimization(this)) { - WPMediaUtils.advertiseImageOptimization(this, this::addLastTakenPicture); - } else { - addLastTakenPicture(); - } + addLastTakenPicture(); } break; case RequestCodes.TAKE_VIDEO: diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/EditorMedia.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/EditorMedia.kt index 0edca25c46ee..90ae61b8893d 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/EditorMedia.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/EditorMedia.kt @@ -95,20 +95,6 @@ class EditorMedia @Inject constructor( _uiState.value = AddingMediaIdle } - // region Adding new media to a post - fun advertiseImageOptimisationAndAddMedia(uriList: List) { - if (mediaUtilsWrapper.shouldAdvertiseImageOptimization()) { - editorMediaListener.advertiseImageOptimization { - addNewMediaItemsToEditorAsync( - uriList, - false - ) - } - } else { - addNewMediaItemsToEditorAsync(uriList, false) - } - } - fun addNewMediaToEditorAsync(mediaUri: Uri, freshlyTaken: Boolean) { addNewMediaItemsToEditorAsync(listOf(mediaUri), freshlyTaken) } @@ -147,12 +133,7 @@ class EditorMedia @Inject constructor( } fun onPhotoPickerMediaChosen(uriList: List) { - val onlyVideos = uriList.all { mediaUtilsWrapper.isVideo(it.toString()) } - if (onlyVideos) { - addNewMediaItemsToEditorAsync(uriList, false) - } else { - advertiseImageOptimisationAndAddMedia(uriList) - } + addNewMediaItemsToEditorAsync(uriList, false) } // endregion diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/EditorMediaListener.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/EditorMediaListener.kt index 4f40d9affda0..b597d9c3ea18 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/EditorMediaListener.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/EditorMediaListener.kt @@ -9,7 +9,6 @@ import org.wordpress.android.util.helpers.MediaFile interface EditorMediaListener { fun appendMediaFiles(mediaFiles: Map) fun syncPostObjectWithUiAndSaveIt(listener: OnPostUpdatedFromUIListener? = null) - fun advertiseImageOptimization(listener: () -> Unit) fun onMediaModelsCreatedFromOptimizedUris(oldUriToMediaFiles: Map) fun getImmutablePost(): PostImmutableModel fun showVideoDurationLimitWarning(fileName: String) diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt index c081fceead0b..786662f9e9e6 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt @@ -36,38 +36,6 @@ import org.wordpress.android.viewmodel.helpers.ToastMessageHolder @ExperimentalCoroutinesApi class EditorMediaTest : BaseUnitTest() { - @Test - fun `advertiseImageOptimisationAndAddMedia shows dialog when shouldAdvertiseImageOptimization is true`() { - // Arrange - val editorMediaListener = mock() - val mediaUtilsWrapper = createMediaUtilsWrapper(shouldAdvertiseImageOptimization = true) - - // Act - createEditorMedia( - editorMediaListener = editorMediaListener, - mediaUtilsWrapper = mediaUtilsWrapper - ) - .advertiseImageOptimisationAndAddMedia(mock()) - // Assert - verify(editorMediaListener).advertiseImageOptimization(anyOrNull()) - } - - @Test - fun `advertiseImageOptimisationAndAddMedia does NOT show dialog when shouldAdvertiseImageOptimization is false`() { - // Arrange - val editorMediaListener = mock() - val mediaUtilsWrapper = createMediaUtilsWrapper(shouldAdvertiseImageOptimization = false) - - // Act - createEditorMedia( - editorMediaListener = editorMediaListener, - mediaUtilsWrapper = mediaUtilsWrapper - ) - .advertiseImageOptimisationAndAddMedia(mock()) - // Assert - verify(editorMediaListener, never()).advertiseImageOptimization(anyOrNull()) - } - @Test fun `addNewMediaItemsToEditorAsync emits AddingSingleMedia for a single uri`() = test { // Arrange @@ -142,45 +110,6 @@ class EditorMediaTest : BaseUnitTest() { ) } - @Test - fun `onPhotoPickerMediaChosen does NOT invoke shouldAdvertiseImageOptimization when only video files`() = - test { - // Arrange - val uris = listOf(VIDEO_URI, VIDEO_URI, VIDEO_URI, VIDEO_URI) - val editorMediaListener = mock() - - val mediaUtilsWrapper = createMediaUtilsWrapper() - - // Act - createEditorMedia( - mediaUtilsWrapper = mediaUtilsWrapper, - editorMediaListener = editorMediaListener - ) - .onPhotoPickerMediaChosen(uris) - // Assert - verify(editorMediaListener, never()).advertiseImageOptimization(anyOrNull()) - verify(mediaUtilsWrapper, never()).shouldAdvertiseImageOptimization() - } - - @Test - fun `onPhotoPickerMediaChosen invokes shouldAdvertiseImageOptimization when at least 1 image file`() = - test { - // Arrange - val uris = listOf(VIDEO_URI, VIDEO_URI, IMAGE_URI, VIDEO_URI) - val editorMediaListener = mock() - - val mediaUtilsWrapper = createMediaUtilsWrapper() - - // Act - createEditorMedia( - mediaUtilsWrapper = mediaUtilsWrapper, - editorMediaListener = editorMediaListener - ) - .onPhotoPickerMediaChosen(uris) - // Assert - verify(mediaUtilsWrapper).shouldAdvertiseImageOptimization() - } - @Test fun `addExistingMediaToEditorAsync passes mediaId to addExistingMediaToPostUseCase`() = test { From c30528e2f1c9660ffc72270a3384aea084cb56ca Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 25 Jan 2024 01:25:00 +0000 Subject: [PATCH 04/23] refactor: Delete unused logic for displaying promo --- .../UserFlagsProviderHelper.kt | 1 - .../wordpress/android/ui/prefs/AppPrefs.java | 11 --- .../android/util/MediaUtilsWrapper.kt | 3 - .../wordpress/android/util/WPMediaUtils.java | 69 ------------------- WordPress/src/main/res/values/strings.xml | 6 -- 5 files changed, 90 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/localcontentmigration/UserFlagsProviderHelper.kt b/WordPress/src/main/java/org/wordpress/android/localcontentmigration/UserFlagsProviderHelper.kt index fb11f809225b..839474dc2f14 100644 --- a/WordPress/src/main/java/org/wordpress/android/localcontentmigration/UserFlagsProviderHelper.kt +++ b/WordPress/src/main/java/org/wordpress/android/localcontentmigration/UserFlagsProviderHelper.kt @@ -66,7 +66,6 @@ class UserFlagsProviderHelper @Inject constructor( DeletablePrefKey.RECENTLY_PICKED_SITE_IDS.name, UndeletablePrefKey.THEME_IMAGE_SIZE_WIDTH.name, UndeletablePrefKey.BOOKMARKS_SAVED_LOCALLY_DIALOG_SHOWN.name, - UndeletablePrefKey.IMAGE_OPTIMIZE_PROMO_REQUIRED.name, UndeletablePrefKey.SWIPE_TO_NAVIGATE_NOTIFICATIONS.name, UndeletablePrefKey.SWIPE_TO_NAVIGATE_READER.name, UndeletablePrefKey.SHOULD_SHOW_STORIES_INTRO.name, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java index bfb0ae37d01a..eb9e37a9e514 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/AppPrefs.java @@ -218,9 +218,6 @@ public enum UndeletablePrefKey implements PrefKey { BOOKMARKS_SAVED_LOCALLY_DIALOG_SHOWN, - // When we need to show the new image optimize promo dialog - IMAGE_OPTIMIZE_PROMO_REQUIRED, - // When we need to show the snackbar indicating how notifications can be navigated through SWIPE_TO_NAVIGATE_NOTIFICATIONS, @@ -603,14 +600,6 @@ public static void setBookmarksSavedLocallyDialogShown() { setBoolean(UndeletablePrefKey.BOOKMARKS_SAVED_LOCALLY_DIALOG_SHOWN, false); } - public static boolean isImageOptimizePromoRequired() { - return getBoolean(UndeletablePrefKey.IMAGE_OPTIMIZE_PROMO_REQUIRED, true); - } - - public static void setImageOptimizePromoRequired(boolean required) { - setBoolean(UndeletablePrefKey.IMAGE_OPTIMIZE_PROMO_REQUIRED, required); - } - /** * This method should only be used by specific client classes that need access to the persisted selected site * instance due to the fact that the in-memory selected site instance might not be yet available. diff --git a/WordPress/src/main/java/org/wordpress/android/util/MediaUtilsWrapper.kt b/WordPress/src/main/java/org/wordpress/android/util/MediaUtilsWrapper.kt index 3ec86333c275..b906fbd95702 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/MediaUtilsWrapper.kt +++ b/WordPress/src/main/java/org/wordpress/android/util/MediaUtilsWrapper.kt @@ -41,9 +41,6 @@ class MediaUtilsWrapper @Inject constructor(private val appContext: Context) { fun copyFileToAppStorage(imageUri: Uri, headers: Map? = null): Uri? = MediaUtils.downloadExternalMedia(appContext, imageUri, headers) - fun shouldAdvertiseImageOptimization(): Boolean = - WPMediaUtils.shouldAdvertiseImageOptimization(appContext) - fun getMimeType(uri: Uri): String? = appContext.contentResolver.getType(uri) fun getVideoThumbnail(videoPath: String, headers: Map): String? = diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java b/WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java index ef971cb663ec..758517d80138 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java @@ -104,75 +104,6 @@ public static boolean isVideoOptimizationEnabled() { return AppPrefs.isVideoOptimize(); } - /** - * Check if we should advertise image optimization feature for the current site. - *

- * The following condition need to be all true: - * 1) Image optimization is ON on the site. - * 2) Didn't already ask to keep or disable the feature. - * 3) The user has granted storage access to the app. - * This is because we don't want to ask so much things to users the first time they try to add a picture to the app. - * - * @param context The context - * @return true if we should advertise the feature, false otherwise. - */ - public static boolean shouldAdvertiseImageOptimization(final Context context) { - boolean isPromoRequired = AppPrefs.isImageOptimizePromoRequired(); - if (!isPromoRequired) { - return false; - } - - // Check we can access storage before asking for optimizing image - boolean hasStoreAccess = Build.VERSION.SDK_INT >= Build.VERSION_CODES.R - || ContextCompat.checkSelfPermission(context, - android.Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED; - if (!hasStoreAccess) { - return false; - } - - // Check whether image optimization is enabled for the site - return AppPrefs.isImageOptimize(); - } - - public interface OnAdvertiseImageOptimizationListener { - void done(); - } - - public static void advertiseImageOptimization(final Context context, - final OnAdvertiseImageOptimizationListener listener) { - DialogInterface.OnClickListener onClickListener = new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - String propertyValue = (which == DialogInterface.BUTTON_POSITIVE) ? "on" : "off"; - AnalyticsTracker.track(AnalyticsTracker.Stat.APP_SETTINGS_OPTIMIZE_IMAGES_POPUP_TAPPED, - Collections.singletonMap("option", propertyValue)); - - if (which == DialogInterface.BUTTON_NEGATIVE && AppPrefs.isImageOptimize()) { - AppPrefs.setImageOptimize(false); - } - - listener.done(); - } - }; - - DialogInterface.OnCancelListener onCancelListener = new DialogInterface.OnCancelListener() { - @Override - public void onCancel(DialogInterface dialog) { - listener.done(); - } - }; - - AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context); - builder.setTitle(R.string.image_optimization_popup_title); - builder.setMessage(R.string.image_optimization_popup_desc); - builder.setPositiveButton(R.string.leave_on, onClickListener); - builder.setNegativeButton(R.string.turn_off, onClickListener); - builder.setOnCancelListener(onCancelListener); - builder.show(); - // Do not ask again - AppPrefs.setImageOptimizePromoRequired(false); - } - /** * Given a media error returns the error message to display on the UI. * diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index f7865454b8b2..32fe5037b220 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -2983,12 +2983,6 @@ Camera Microphone - - Yes, leave on - No, turn off - Keep optimizing images? - Image optimization shrinks images for faster uploading.\n\nThis option is enabled by default, but you can change it in the app settings at any time. - From b747605ff6164efacc8335171672cf346906ae99 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 25 Jan 2024 01:37:45 +0000 Subject: [PATCH 05/23] refactor: Remove tracking for deleted code --- .../java/org/wordpress/android/analytics/AnalyticsTracker.java | 1 - .../org/wordpress/android/analytics/AnalyticsTrackerNosara.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/libs/analytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java b/libs/analytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java index fbc2df7a413e..12ef44396989 100644 --- a/libs/analytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java +++ b/libs/analytics/src/main/java/org/wordpress/android/analytics/AnalyticsTracker.java @@ -896,7 +896,6 @@ public enum Stat { APP_SETTINGS_VIDEO_OPTIMIZATION_CHANGED, APP_SETTINGS_MAX_VIDEO_SIZE_CHANGED, APP_SETTINGS_VIDEO_QUALITY_CHANGED, - APP_SETTINGS_OPTIMIZE_IMAGES_POPUP_TAPPED, PRIVACY_SETTINGS_OPENED, PRIVACY_SETTINGS_REPORT_CRASHES_TOGGLED, SHARING_BUTTONS_EDIT_SHARING_BUTTONS_CHANGED, diff --git a/libs/analytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java b/libs/analytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java index 1ea594ddff90..6eeaa539722c 100644 --- a/libs/analytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java +++ b/libs/analytics/src/main/java/org/wordpress/android/analytics/AnalyticsTrackerNosara.java @@ -2273,8 +2273,6 @@ public static String getEventNameForStat(AnalyticsTracker.Stat stat) { return "app_settings_privacy_settings_tapped"; case APP_SETTINGS_OPEN_DEVICE_SETTINGS_TAPPED: return "app_settings_open_device_settings_tapped"; - case APP_SETTINGS_OPTIMIZE_IMAGES_POPUP_TAPPED: - return "app_settings_optimize_images_popup_tapped"; case APP_SETTINGS_MAX_IMAGE_SIZE_CHANGED: return "app_settings_max_image_size_changed"; case APP_SETTINGS_IMAGE_QUALITY_CHANGED: From 773a8f9787ffe778f7d55ef1aa3a1aead38bf5db Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 25 Jan 2024 11:47:32 +0000 Subject: [PATCH 06/23] refactor: Delete unused code after pop-up removal --- .../android/ui/posts/EditPostActivity.java | 3 --- .../android/ui/posts/editor/media/EditorMedia.kt | 2 -- .../android/ui/stories/StoryComposerActivity.kt | 1 - .../ui/stories/media/StoryMediaSaveUploadBridge.kt | 4 ---- .../org/wordpress/android/util/WPMediaUtils.java | 3 --- .../ui/posts/editor/media/EditorMediaTest.kt | 13 ------------- 6 files changed, 26 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java index b7a9e24ab287..e072bfe9d1c4 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java @@ -260,9 +260,6 @@ import static org.wordpress.android.imageeditor.preview.PreviewImageFragment.PREVIEW_IMAGE_REDUCED_SIZE_FACTOR; import static org.wordpress.android.ui.history.HistoryDetailContainerFragment.KEY_REVISION; -import kotlin.Unit; -import kotlin.jvm.functions.Function0; - public class EditPostActivity extends LocaleAwareActivity implements EditorFragmentActivity, EditorImageSettingsListener, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/EditorMedia.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/EditorMedia.kt index 90ae61b8893d..23a488455fdd 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/EditorMedia.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/EditorMedia.kt @@ -34,7 +34,6 @@ import org.wordpress.android.ui.posts.editor.media.EditorMedia.AddMediaToPostUiS import org.wordpress.android.ui.posts.editor.media.EditorMedia.AddMediaToPostUiState.AddingSingleMedia import org.wordpress.android.ui.uploads.UploadService import org.wordpress.android.ui.utils.UiString.UiStringRes -import org.wordpress.android.util.MediaUtilsWrapper import org.wordpress.android.util.NetworkUtilsWrapper import org.wordpress.android.util.StringUtils import org.wordpress.android.util.ToastUtils.Duration @@ -52,7 +51,6 @@ class EditorMedia @Inject constructor( private val updateMediaModelUseCase: UpdateMediaModelUseCase, private val getMediaModelUseCase: GetMediaModelUseCase, private val dispatcher: Dispatcher, - private val mediaUtilsWrapper: MediaUtilsWrapper, private val networkUtilsWrapper: NetworkUtilsWrapper, private val addLocalMediaToPostUseCase: AddLocalMediaToPostUseCase, private val addExistingMediaToPostUseCase: AddExistingMediaToPostUseCase, diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerActivity.kt index 793dc32ce3a5..62450f838df8 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerActivity.kt @@ -81,7 +81,6 @@ import org.wordpress.android.util.ListUtils import org.wordpress.android.util.MediaUtils import org.wordpress.android.util.ToastUtils import org.wordpress.android.util.ToastUtils.Duration.LONG -import org.wordpress.android.util.WPMediaUtils import org.wordpress.android.util.WPPermissionUtils import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stories/media/StoryMediaSaveUploadBridge.kt b/WordPress/src/main/java/org/wordpress/android/ui/stories/media/StoryMediaSaveUploadBridge.kt index cc84f6fad6d1..77c7c52fb953 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stories/media/StoryMediaSaveUploadBridge.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stories/media/StoryMediaSaveUploadBridge.kt @@ -133,10 +133,6 @@ class StoryMediaSaveUploadBridge @Inject constructor( listener?.onPostUpdatedFromUI(null) } - override fun advertiseImageOptimization(listener: () -> Unit) { - // no op - } - override fun onMediaModelsCreatedFromOptimizedUris(oldUriToMediaFiles: Map) { // in order to support Story editing capabilities, we save a serialized version of the Story slides // after their composedFrameFiles have been processed. diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java b/WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java index 758517d80138..753fbcdb14ac 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java @@ -6,10 +6,8 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; -import android.content.pm.PackageManager; import android.media.MediaScannerConnection; import android.net.Uri; -import android.os.Build; import android.os.Environment; import android.provider.MediaStore; import android.view.ViewConfiguration; @@ -19,7 +17,6 @@ import androidx.annotation.Nullable; import androidx.annotation.StringRes; import androidx.appcompat.app.AlertDialog; -import androidx.core.content.ContextCompat; import androidx.core.content.FileProvider; import com.google.android.material.dialog.MaterialAlertDialogBuilder; diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt index 786662f9e9e6..7ac997e0e3a2 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt @@ -27,7 +27,6 @@ import org.wordpress.android.fluxc.store.MediaStore.FetchMediaListPayload import org.wordpress.android.ui.pages.SnackbarMessageHolder import org.wordpress.android.ui.posts.editor.media.EditorMedia.AddMediaToPostUiState import org.wordpress.android.ui.utils.UiString.UiStringRes -import org.wordpress.android.util.MediaUtilsWrapper import org.wordpress.android.util.NetworkUtilsWrapper import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper import org.wordpress.android.util.analytics.AnalyticsUtilsWrapper @@ -270,7 +269,6 @@ class EditorMediaTest : BaseUnitTest() { updateMediaModelUseCase: UpdateMediaModelUseCase = mock(), getMediaModelUseCase: GetMediaModelUseCase = createGetMediaModelUseCase(), dispatcher: Dispatcher = mock(), - mediaUtilsWrapper: MediaUtilsWrapper = createMediaUtilsWrapper(), networkUtilsWrapper: NetworkUtilsWrapper = mock(), addLocalMediaToPostUseCase: AddLocalMediaToPostUseCase = createAddLocalMediaToPostUseCase(), addExistingMediaToPostUseCase: AddExistingMediaToPostUseCase = mock(), @@ -287,7 +285,6 @@ class EditorMediaTest : BaseUnitTest() { updateMediaModelUseCase, getMediaModelUseCase, dispatcher, - mediaUtilsWrapper, networkUtilsWrapper, addLocalMediaToPostUseCase, addExistingMediaToPostUseCase, @@ -304,16 +301,6 @@ class EditorMediaTest : BaseUnitTest() { return editorMedia } - fun createMediaUtilsWrapper( - shouldAdvertiseImageOptimization: Boolean = false - ) = - mock { - on { shouldAdvertiseImageOptimization() } - .thenReturn(shouldAdvertiseImageOptimization) - on { isVideo(VIDEO_URI.toString()) }.thenReturn(true) - on { isVideo(IMAGE_URI.toString()) }.thenReturn(false) - } - fun createAddLocalMediaToPostUseCase(resultForAddNewMediaToEditorAsync: Boolean = true) = mock { onBlocking { From 371c7db62e0bfc3141176630632d4377a611a70c Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 25 Jan 2024 11:50:04 +0000 Subject: [PATCH 07/23] refactor: Delete redundant test --- .../stories/usecase/StoryEditorMediaTest.kt | 25 ------------------- 1 file changed, 25 deletions(-) diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt index a42a90bb2d11..607b1f36c518 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt @@ -85,25 +85,6 @@ class StoryEditorMediaTest : BaseUnitTest() { verify(observer, never()).onChanged(captor.capture()) } - @Test - fun `onPhotoPickerMediaChosen invokes shouldAdvertiseImageOptimization when at least 1 image file`() = - test { - // Arrange - val uris = listOf(VIDEO_URI, VIDEO_URI, IMAGE_URI, VIDEO_URI) - val editorMediaListener = mock() - - val mediaUtilsWrapper = createMediaUtilsWrapper() - - // Act - createStoryEditorMedia( - mediaUtilsWrapper = mediaUtilsWrapper, - editorMediaListener = editorMediaListener - ) - .onPhotoPickerMediaChosen(uris) - // Assert - verify(mediaUtilsWrapper).shouldAdvertiseImageOptimization() - } - private companion object Fixtures { private val VIDEO_URI = mock() private val IMAGE_URI = mock() @@ -125,12 +106,6 @@ class StoryEditorMediaTest : BaseUnitTest() { return editorMedia } - fun createMediaUtilsWrapper() = - mock { - on { isVideo(VIDEO_URI.toString()) }.thenReturn(true) - on { isVideo(IMAGE_URI.toString()) }.thenReturn(false) - } - fun createAddLocalMediaToPostUseCase(resultForAddNewMediaToEditorAsync: Boolean = true) = mock { onBlocking { From f29418c2727e2f3a6c6f17c202c63f25bf1e6a80 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 25 Jan 2024 11:58:24 +0000 Subject: [PATCH 08/23] refactor: Remove unused imports and vars --- .../wordpress/android/ui/stories/media/StoryEditorMedia.kt | 2 -- .../main/java/org/wordpress/android/util/WPMediaUtils.java | 1 - .../android/ui/posts/editor/media/EditorMediaTest.kt | 2 -- .../android/ui/stories/usecase/StoryEditorMediaTest.kt | 6 ------ 4 files changed, 11 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stories/media/StoryEditorMedia.kt b/WordPress/src/main/java/org/wordpress/android/ui/stories/media/StoryEditorMedia.kt index 78f11123c791..74df66b04211 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stories/media/StoryEditorMedia.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stories/media/StoryEditorMedia.kt @@ -22,14 +22,12 @@ import org.wordpress.android.ui.stories.media.StoryEditorMedia.AddMediaToStoryPo import org.wordpress.android.ui.stories.media.StoryEditorMedia.AddMediaToStoryPostUiState.AddingMultipleMediaToStory import org.wordpress.android.ui.stories.media.StoryEditorMedia.AddMediaToStoryPostUiState.AddingSingleMediaToStory import org.wordpress.android.ui.utils.UiString.UiStringRes -import org.wordpress.android.util.MediaUtilsWrapper import org.wordpress.android.viewmodel.Event import javax.inject.Inject import javax.inject.Named import kotlin.coroutines.CoroutineContext class StoryEditorMedia @Inject constructor( - private val mediaUtilsWrapper: MediaUtilsWrapper, private val addLocalMediaToPostUseCase: AddLocalMediaToPostUseCase, private val addExistingMediaToPostUseCase: AddExistingMediaToPostUseCase, @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher diff --git a/WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java b/WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java index 753fbcdb14ac..f8eb64f1f5d7 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java @@ -43,7 +43,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; public class WPMediaUtils { diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt index 7ac997e0e3a2..f903ad16a950 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt @@ -260,8 +260,6 @@ class EditorMediaTest : BaseUnitTest() { } private companion object Fixtures { - private val VIDEO_URI = mock() - private val IMAGE_URI = mock() private const val MEDIA_MODEL_REMOTE_ID = 123L private const val MEDIA_MODEL_LOCAL_ID = 1 diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt index 607b1f36c518..54511c11bd53 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt @@ -1,6 +1,5 @@ package org.wordpress.android.ui.stories.usecase -import android.net.Uri import androidx.lifecycle.Observer import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.UnconfinedTestDispatcher @@ -86,18 +85,13 @@ class StoryEditorMediaTest : BaseUnitTest() { } private companion object Fixtures { - private val VIDEO_URI = mock() - private val IMAGE_URI = mock() - fun createStoryEditorMedia( - mediaUtilsWrapper: MediaUtilsWrapper = createMediaUtilsWrapper(), addLocalMediaToPostUseCase: AddLocalMediaToPostUseCase = createAddLocalMediaToPostUseCase(), addExistingMediaToPostUseCase: AddExistingMediaToPostUseCase = mock(), siteModel: SiteModel = mock(), editorMediaListener: EditorMediaListener = mock() ): StoryEditorMedia { val editorMedia = StoryEditorMedia( - mediaUtilsWrapper, addLocalMediaToPostUseCase, addExistingMediaToPostUseCase, UnconfinedTestDispatcher() From ccef9166e34ab0698b1cfea7c31af28da0fd4da0 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 25 Jan 2024 12:09:06 +0000 Subject: [PATCH 09/23] refactor: Remove unused imports --- .../wordpress/android/ui/posts/editor/media/EditorMediaTest.kt | 1 - .../wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt | 1 - 2 files changed, 2 deletions(-) diff --git a/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt index f903ad16a950..ac43eaf276c9 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/posts/editor/media/EditorMediaTest.kt @@ -1,6 +1,5 @@ package org.wordpress.android.ui.posts.editor.media -import android.net.Uri import androidx.lifecycle.Observer import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.UnconfinedTestDispatcher diff --git a/WordPress/src/test/java/org/wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt index 54511c11bd53..90176998e575 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/stories/usecase/StoryEditorMediaTest.kt @@ -22,7 +22,6 @@ import org.wordpress.android.ui.posts.editor.media.EditorMediaListener import org.wordpress.android.ui.stories.media.StoryEditorMedia import org.wordpress.android.ui.stories.media.StoryEditorMedia.AddMediaToStoryPostUiState import org.wordpress.android.ui.utils.UiString.UiStringRes -import org.wordpress.android.util.MediaUtilsWrapper import org.wordpress.android.viewmodel.Event @ExperimentalCoroutinesApi From a62ee3c23848ec5fe84e825ceb1fb496886526b3 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 25 Jan 2024 13:34:17 +0000 Subject: [PATCH 10/23] refactor: Tidy up functions with little logic --- .../java/org/wordpress/android/ui/posts/EditPostActivity.java | 2 +- .../wordpress/android/ui/posts/editor/media/EditorMedia.kt | 4 ---- .../org/wordpress/android/ui/stories/StoryComposerActivity.kt | 4 ++-- .../wordpress/android/ui/stories/media/StoryEditorMedia.kt | 4 ---- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java index e072bfe9d1c4..50b27a4a7d78 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java @@ -1306,7 +1306,7 @@ public void onPhotoPickerHidden() { @Override public void onPhotoPickerMediaChosen(@NonNull final List uriList) { mEditorPhotoPicker.hidePhotoPicker(); - mEditorMedia.onPhotoPickerMediaChosen(uriList); + mEditorMedia.addNewMediaItemsToEditorAsync(uriList, false); } /* diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/EditorMedia.kt b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/EditorMedia.kt index 23a488455fdd..658ad80e7bac 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/EditorMedia.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/editor/media/EditorMedia.kt @@ -129,10 +129,6 @@ class EditorMedia @Inject constructor( ) } } - - fun onPhotoPickerMediaChosen(uriList: List) { - addNewMediaItemsToEditorAsync(uriList, false) - } // endregion // region Add existing media to a post diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerActivity.kt b/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerActivity.kt index 62450f838df8..50055bc6f87a 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerActivity.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stories/StoryComposerActivity.kt @@ -345,7 +345,7 @@ class StoryComposerActivity : ComposeLoopFrameActivity(), it.hasExtra(MediaPickerConstants.EXTRA_MEDIA_URIS) -> { data.getStringArrayExtra(MediaPickerConstants.EXTRA_MEDIA_URIS)?.let { val uriList: List = convertStringArrayIntoUrisList(it) - storyEditorMedia.onPhotoPickerMediaChosen(uriList) + storyEditorMedia.addNewMediaItemsToEditorAsync(uriList, false) } } it.hasExtra(MediaBrowserActivity.RESULT_IDS) -> { @@ -421,7 +421,7 @@ class StoryComposerActivity : ComposeLoopFrameActivity(), val uriList: List = convertStringArrayIntoUrisList(it) if (uriList.isNotEmpty()) { - storyEditorMedia.onPhotoPickerMediaChosen(uriList) + storyEditorMedia.addNewMediaItemsToEditorAsync(uriList, false) } } } diff --git a/WordPress/src/main/java/org/wordpress/android/ui/stories/media/StoryEditorMedia.kt b/WordPress/src/main/java/org/wordpress/android/ui/stories/media/StoryEditorMedia.kt index 74df66b04211..1a91710c5bc6 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/stories/media/StoryEditorMedia.kt +++ b/WordPress/src/main/java/org/wordpress/android/ui/stories/media/StoryEditorMedia.kt @@ -74,10 +74,6 @@ class StoryEditorMedia @Inject constructor( _uiState.value = AddingMediaToStoryIdle } } - - fun onPhotoPickerMediaChosen(uriList: List) { - addNewMediaItemsToEditorAsync(uriList, false) - } // endregion fun addExistingMediaToEditorAsync(source: AddExistingMediaSource, mediaIdList: List) { From 25de3fe9e250fd810930a6953f37b9557c94a78f Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 25 Jan 2024 01:21:38 +0000 Subject: [PATCH 11/23] feat: Remove pop-up for in-editor photo selection From 43f830257d1329a964223ade1546abd555402054 Mon Sep 17 00:00:00 2001 From: Siobhan Date: Thu, 25 Jan 2024 01:22:30 +0000 Subject: [PATCH 12/23] feat: Remove pop-up for Story posts From a4716de0a1cb3f7aa65b171ccdf539f8b975496e Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 26 Jan 2024 13:30:00 +0100 Subject: [PATCH 13/23] Update Gutenberg Mobile reference --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5cb7f225ec83..8ccb2fce17eb 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ ext { automatticRestVersion = '1.0.8' automatticStoriesVersion = '2.4.0' automatticTracksVersion = '3.3.0' - gutenbergMobileVersion = 'v1.111.1' + gutenbergMobileVersion = '6580-9fe963032e189dc6bb8dbbb4b9238d34759c0ed8' wordPressAztecVersion = 'v1.9.0' wordPressFluxCVersion = '2.61.0' wordPressLoginVersion = '1.10.0' From e66ac0789fe035600cf80c8162802757621bb183 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 23 Jan 2024 16:41:20 +0100 Subject: [PATCH 14/23] Disable Story block --- .../java/org/wordpress/android/ui/posts/EditPostActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java index a6884db857a2..5a4637715143 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java @@ -2513,7 +2513,7 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() { SiteUtils.supportsEmbedVariationFeature(mSite, SiteUtils.WP_INSTAGRAM_EMBED_JETPACK_VERSION), SiteUtils.supportsEmbedVariationFeature(mSite, SiteUtils.WP_LOOM_EMBED_JETPACK_VERSION), SiteUtils.supportsEmbedVariationFeature(mSite, SiteUtils.WP_SMARTFRAME_EMBED_JETPACK_VERSION), - SiteUtils.supportsStoriesFeature(mSite, mJetpackFeatureRemovalPhaseHelper), + false, mSite.isUsingWpComRestApi(), enableXPosts, isUnsupportedBlockEditorEnabled, From f2e21cb8b0a3ff2463811ba6cbc3971633df70ac Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Tue, 23 Jan 2024 18:30:39 +0100 Subject: [PATCH 15/23] Remove initial prop to control Story block --- .../java/org/wordpress/android/ui/posts/EditPostActivity.java | 2 -- .../wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt | 2 -- 2 files changed, 4 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java index 5a4637715143..b9fbbf75af0f 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java @@ -2490,7 +2490,6 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() { false, false, false, - false, true, false, !isFreeWPCom, @@ -2513,7 +2512,6 @@ private GutenbergPropsBuilder getGutenbergPropsBuilder() { SiteUtils.supportsEmbedVariationFeature(mSite, SiteUtils.WP_INSTAGRAM_EMBED_JETPACK_VERSION), SiteUtils.supportsEmbedVariationFeature(mSite, SiteUtils.WP_LOOM_EMBED_JETPACK_VERSION), SiteUtils.supportsEmbedVariationFeature(mSite, SiteUtils.WP_SMARTFRAME_EMBED_JETPACK_VERSION), - false, mSite.isUsingWpComRestApi(), enableXPosts, isUnsupportedBlockEditorEnabled, diff --git a/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt b/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt index c4117e0251f9..53ad2c0c9aae 100644 --- a/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt +++ b/libs/editor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergPropsBuilder.kt @@ -18,7 +18,6 @@ data class GutenbergPropsBuilder( private val enableInstagramEmbed: Boolean, private val enableLoomEmbed: Boolean, private val enableSmartframeEmbed: Boolean, - private val enableMediaFilesCollectionBlocks: Boolean, private val enableMentions: Boolean, private val enableXPosts: Boolean, private val enableUnsupportedBlockEditor: Boolean, @@ -43,7 +42,6 @@ data class GutenbergPropsBuilder( enableInstagramEmbed = enableInstagramEmbed, enableLoomEmbed = enableLoomEmbed, enableSmartframeEmbed = enableSmartframeEmbed, - enableMediaFilesCollectionBlocks = enableMediaFilesCollectionBlocks, enableMentions = enableMentions, enableXPosts = enableXPosts, enableUnsupportedBlockEditor = enableUnsupportedBlockEditor, From aa4f6eb8bba1967f5e133796fca809aea1401008 Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 26 Jan 2024 16:08:21 +0100 Subject: [PATCH 16/23] Update release notes --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index e835d3e7d3e2..592153fa492d 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -7,6 +7,7 @@ 24.1 ----- * [**] Disabled the ability of creating new Story posts. [#20014] +* [**] Disable Story block [https://github.com/wordpress-mobile/WordPress-Android/pull/20005] 24.0.1 ----- From 6419fcd89a7e13cceec87e818e68304272de7f9c Mon Sep 17 00:00:00 2001 From: Carlos Garcia Date: Fri, 26 Jan 2024 19:14:08 +0100 Subject: [PATCH 17/23] Update Gutenberg Mobile reference with tag --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8ccb2fce17eb..e29ad0136166 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ ext { automatticRestVersion = '1.0.8' automatticStoriesVersion = '2.4.0' automatticTracksVersion = '3.3.0' - gutenbergMobileVersion = '6580-9fe963032e189dc6bb8dbbb4b9238d34759c0ed8' + gutenbergMobileVersion = 'v1.111.2' wordPressAztecVersion = 'v1.9.0' wordPressFluxCVersion = '2.61.0' wordPressLoginVersion = '1.10.0' From b5f3cd2e1fdcaa9ac75ec1039326356bf1bb0e57 Mon Sep 17 00:00:00 2001 From: Oguz Kocer Date: Fri, 26 Jan 2024 14:27:32 -0500 Subject: [PATCH 18/23] Bump version number --- version.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.properties b/version.properties index 3920603cc85b..49023e812e58 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -versionName=24.0.1 -versionCode=1402 +versionName=24.0.2 +versionCode=1404 \ No newline at end of file From a4bfd24c959c09a033183d748e5f64928b921990 Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Fri, 26 Jan 2024 12:09:35 -0500 Subject: [PATCH 19/23] fix: Prevent Gutenberg connection logic from crashing Aztec A network connectivity subscriber was added to the post activity in: https://github.com/wordpress-mobile/WordPress-Android/pull/19692 However, it was not scoped to only run in the Gutenberg editor. Because no guard was in place, the subscriber attempted to invoke a non-existent method on the Aztec editor, resulting in a crash. --- .../java/org/wordpress/android/ui/posts/EditPostActivity.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java index 8eb3b555a0c8..f37bd022b9ce 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java @@ -71,6 +71,7 @@ import org.wordpress.android.editor.EditorMediaUtils; import org.wordpress.android.editor.EditorThemeUpdateListener; import org.wordpress.android.editor.ExceptionLogger; +import org.wordpress.android.editor.gutenberg.GutenbergNetworkConnectionListener; import org.wordpress.android.editor.savedinstance.SavedInstanceDatabase; import org.wordpress.android.editor.gutenberg.DialogVisibility; import org.wordpress.android.editor.gutenberg.GutenbergEditorFragment; @@ -3844,6 +3845,8 @@ public void onEventMainThread(UploadService.UploadMediaRetryEvent event) { @Subscribe(threadMode = ThreadMode.MAIN) public void onEventMainThread(ConnectionChangeReceiver.ConnectionChangeEvent event) { + if (!(mEditorFragment instanceof GutenbergNetworkConnectionListener)) return; + ((GutenbergEditorFragment) mEditorFragment).onConnectionStatusChange(event.isConnected()); } From a931b5db32c1f583dc9a044ff4c3c4003c4f97e0 Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Fri, 26 Jan 2024 12:20:35 -0500 Subject: [PATCH 20/23] docs: Add release note --- RELEASE-NOTES.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index bea44db9b619..a2152b86784b 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -3,6 +3,10 @@ 24.1 ----- +24.0.2 +----- +* [**] Fix Aztec editor crash when losing or gaining network connectivity [https://github.com/wordpress-mobile/WordPress-Android/pull/20053] + 24.0.1 ----- * [**] Fix crash when RichText values are not defined [https://github.com/wordpress-mobile/gutenberg-mobile/pull/6563] From 271dcea802fe85b517b761aa7ab759d0e7b0cfd7 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Fri, 26 Jan 2024 20:26:19 +0000 Subject: [PATCH 21/23] Freeze strings for translation --- fastlane/resources/values/strings.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/fastlane/resources/values/strings.xml b/fastlane/resources/values/strings.xml index f7865454b8b2..32fe5037b220 100644 --- a/fastlane/resources/values/strings.xml +++ b/fastlane/resources/values/strings.xml @@ -2983,12 +2983,6 @@ Camera Microphone - - Yes, leave on - No, turn off - Keep optimizing images? - Image optimization shrinks images for faster uploading.\n\nThis option is enabled by default, but you can change it in the app settings at any time. - From 187a58f6d965e59db0d36fa7f6b6bcdad2c88ac9 Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Fri, 26 Jan 2024 20:28:08 +0000 Subject: [PATCH 22/23] Update translations --- WordPress/src/main/res/values-ar/strings.xml | 8 ++++++-- WordPress/src/main/res/values-az/strings.xml | 2 +- WordPress/src/main/res/values-bg/strings.xml | 2 +- WordPress/src/main/res/values-cs/strings.xml | 2 +- WordPress/src/main/res/values-cy/strings.xml | 2 +- WordPress/src/main/res/values-da/strings.xml | 2 +- WordPress/src/main/res/values-de/strings.xml | 7 +++++-- WordPress/src/main/res/values-el/strings.xml | 2 +- WordPress/src/main/res/values-en-rCA/strings.xml | 2 +- WordPress/src/main/res/values-en-rGB/strings.xml | 2 +- WordPress/src/main/res/values-es-rCL/strings.xml | 2 +- WordPress/src/main/res/values-es-rCO/strings.xml | 2 +- WordPress/src/main/res/values-es-rMX/strings.xml | 2 +- WordPress/src/main/res/values-es-rVE/strings.xml | 2 +- WordPress/src/main/res/values-es/strings.xml | 2 +- WordPress/src/main/res/values-eu/strings.xml | 2 +- WordPress/src/main/res/values-fr-rCA/strings.xml | 9 ++++++--- WordPress/src/main/res/values-fr/strings.xml | 9 ++++++--- WordPress/src/main/res/values-gd/strings.xml | 2 +- WordPress/src/main/res/values-gl/strings.xml | 5 +++-- WordPress/src/main/res/values-he/strings.xml | 7 +++++-- WordPress/src/main/res/values-hi/strings.xml | 2 +- WordPress/src/main/res/values-hr/strings.xml | 2 +- WordPress/src/main/res/values-hu/strings.xml | 2 +- WordPress/src/main/res/values-id/strings.xml | 7 +++++-- WordPress/src/main/res/values-is/strings.xml | 2 +- WordPress/src/main/res/values-it/strings.xml | 7 +++++-- WordPress/src/main/res/values-ja/strings.xml | 7 +++++-- WordPress/src/main/res/values-kmr/strings.xml | 2 +- WordPress/src/main/res/values-ko/strings.xml | 7 +++++-- WordPress/src/main/res/values-lv/strings.xml | 2 +- WordPress/src/main/res/values-mk/strings.xml | 2 +- WordPress/src/main/res/values-ms/strings.xml | 2 +- WordPress/src/main/res/values-nb/strings.xml | 2 +- WordPress/src/main/res/values-nl/strings.xml | 7 +++++-- WordPress/src/main/res/values-pl/strings.xml | 2 +- WordPress/src/main/res/values-pt-rBR/strings.xml | 2 +- WordPress/src/main/res/values-ro/strings.xml | 2 +- WordPress/src/main/res/values-ru/strings.xml | 2 +- WordPress/src/main/res/values-sk/strings.xml | 2 +- WordPress/src/main/res/values-sq/strings.xml | 7 +++++-- WordPress/src/main/res/values-sr/strings.xml | 2 +- WordPress/src/main/res/values-sv/strings.xml | 2 +- WordPress/src/main/res/values-th/strings.xml | 2 +- WordPress/src/main/res/values-tr/strings.xml | 7 +++++-- WordPress/src/main/res/values-uz/strings.xml | 2 +- WordPress/src/main/res/values-vi/strings.xml | 2 +- WordPress/src/main/res/values-zh-rCN/strings.xml | 7 +++++-- WordPress/src/main/res/values-zh-rHK/strings.xml | 7 +++++-- WordPress/src/main/res/values-zh-rTW/strings.xml | 7 +++++-- 50 files changed, 115 insertions(+), 68 deletions(-) diff --git a/WordPress/src/main/res/values-ar/strings.xml b/WordPress/src/main/res/values-ar/strings.xml index 58019d934b74..bc2a65e86636 100644 --- a/WordPress/src/main/res/values-ar/strings.xml +++ b/WordPress/src/main/res/values-ar/strings.xml @@ -1,11 +1,13 @@ + انتظار الاتصال + حركة المرور العمل من دون اتصال بالإنترنت أعيد إنشاء الاتصال بالشبكة فقدان الاتصال بالشبكة، العمل من دون اتصال بالإنترنت @@ -197,6 +199,7 @@ Language: ar إغلاق المحرر إعادة آخر تغيير الاشتراك لمشاركة المزيد + التراجع عن آخر تغيير قم بزيادة حركة المرور لديك من حلال مشاركة تدويناتك تلقائيًا مع أصدقائك على شبكات التواصل الاجتماعي. المشاركة عبر شبكات التواصل الاجتماعي تم فصل %s @@ -399,6 +402,7 @@ Language: ar آخر 7 أيام %d من الأسابيع أسبوع واحد + من <b>Day One</b> ذكرني لاحقًا التبديل إلى تطبيق Jetpack معرفة المزيد على jetpack.com diff --git a/WordPress/src/main/res/values-az/strings.xml b/WordPress/src/main/res/values-az/strings.xml index 8ef3522f0308..45a82373b48d 100644 --- a/WordPress/src/main/res/values-az/strings.xml +++ b/WordPress/src/main/res/values-az/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-bg/strings.xml b/WordPress/src/main/res/values-bg/strings.xml index 6c8ba2ed0123..bfc4f3e4ef16 100644 --- a/WordPress/src/main/res/values-bg/strings.xml +++ b/WordPress/src/main/res/values-bg/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-cs/strings.xml b/WordPress/src/main/res/values-cs/strings.xml index 1f365fe039fb..f644591552d7 100644 --- a/WordPress/src/main/res/values-cs/strings.xml +++ b/WordPress/src/main/res/values-cs/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-cy/strings.xml b/WordPress/src/main/res/values-cy/strings.xml index 848c9af8016e..cf2f3993492f 100644 --- a/WordPress/src/main/res/values-cy/strings.xml +++ b/WordPress/src/main/res/values-cy/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-da/strings.xml b/WordPress/src/main/res/values-da/strings.xml index 39d3c5999818..2fa65fa5095a 100644 --- a/WordPress/src/main/res/values-da/strings.xml +++ b/WordPress/src/main/res/values-da/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-de/strings.xml b/WordPress/src/main/res/values-de/strings.xml index b344a08f4dba..a6041634c997 100644 --- a/WordPress/src/main/res/values-de/strings.xml +++ b/WordPress/src/main/res/values-de/strings.xml @@ -1,11 +1,13 @@ + Warten auf Verbindung + Traffic Offline arbeiten Die Netzwerkverbindung wurde wiederhergestellt Die Netzwerkverbindung ging verloren, offline arbeiten @@ -411,6 +413,7 @@ Language: de Letzte 7 Tage %d Wochen 1 Woche + Von <b>Day One</b> Später daran erinnern Die Statistiken, der Reader, die Benachrichtigungen und weitere Funktionen werden bald in die Jetpack-Mobil-App verschoben. Zur Jetpack-App wechseln diff --git a/WordPress/src/main/res/values-el/strings.xml b/WordPress/src/main/res/values-el/strings.xml index e53294030905..b63b80a5d756 100644 --- a/WordPress/src/main/res/values-el/strings.xml +++ b/WordPress/src/main/res/values-el/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-en-rCA/strings.xml b/WordPress/src/main/res/values-en-rCA/strings.xml index b4f0dad06a92..6e2422d699f5 100644 --- a/WordPress/src/main/res/values-en-rCA/strings.xml +++ b/WordPress/src/main/res/values-en-rCA/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-en-rGB/strings.xml b/WordPress/src/main/res/values-en-rGB/strings.xml index bf14691fa081..6ee3c41bdc2d 100644 --- a/WordPress/src/main/res/values-en-rGB/strings.xml +++ b/WordPress/src/main/res/values-en-rGB/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-es-rCL/strings.xml b/WordPress/src/main/res/values-es-rCL/strings.xml index 0cc931e5cd23..810fd0e3a9e4 100644 --- a/WordPress/src/main/res/values-es-rCL/strings.xml +++ b/WordPress/src/main/res/values-es-rCL/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-es-rCO/strings.xml b/WordPress/src/main/res/values-es-rCO/strings.xml index efe422874b90..b3c8d47f5c84 100644 --- a/WordPress/src/main/res/values-es-rCO/strings.xml +++ b/WordPress/src/main/res/values-es-rCO/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-es-rMX/strings.xml b/WordPress/src/main/res/values-es-rMX/strings.xml index 6b0bfb2edaf0..f48b7a71dbe8 100644 --- a/WordPress/src/main/res/values-es-rMX/strings.xml +++ b/WordPress/src/main/res/values-es-rMX/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-es-rVE/strings.xml b/WordPress/src/main/res/values-es-rVE/strings.xml index 6f74dca7181d..2ed81faa5a5a 100644 --- a/WordPress/src/main/res/values-es-rVE/strings.xml +++ b/WordPress/src/main/res/values-es-rVE/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-es/strings.xml b/WordPress/src/main/res/values-es/strings.xml index a455319940dd..a9730daf3cdb 100644 --- a/WordPress/src/main/res/values-es/strings.xml +++ b/WordPress/src/main/res/values-es/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-eu/strings.xml b/WordPress/src/main/res/values-eu/strings.xml index 1f9afd17fff7..0425ccbe20db 100644 --- a/WordPress/src/main/res/values-eu/strings.xml +++ b/WordPress/src/main/res/values-eu/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-fr-rCA/strings.xml b/WordPress/src/main/res/values-fr-rCA/strings.xml index af19b20f9fc9..a40cadc58586 100644 --- a/WordPress/src/main/res/values-fr-rCA/strings.xml +++ b/WordPress/src/main/res/values-fr-rCA/strings.xml @@ -1,11 +1,13 @@ + En attente de connexion + Trafic Travail hors ligne Connexion réseau rétablie Perte de la connexion réseau, travail hors ligne @@ -402,6 +404,7 @@ Language: fr 7 derniers jours %d semaines 1 semaine + De <b>Day One</b> Me rappeler ultérieurement Les statistiques, le lecteur, les notifications et d’autres fonctionnalités seront bientôt transférées vers l’application mobile Jetpack. Passer à l’application Jetpack @@ -1641,7 +1644,7 @@ Language: fr Les étiquettes indiquent aux lecteurs de quoi traite l’article. Date de publication Ajouter des étiquettes - Précédent + Retour Enregistrer maintenant Soumettre maintenant Planifier maintenant diff --git a/WordPress/src/main/res/values-fr/strings.xml b/WordPress/src/main/res/values-fr/strings.xml index af19b20f9fc9..a40cadc58586 100644 --- a/WordPress/src/main/res/values-fr/strings.xml +++ b/WordPress/src/main/res/values-fr/strings.xml @@ -1,11 +1,13 @@ + En attente de connexion + Trafic Travail hors ligne Connexion réseau rétablie Perte de la connexion réseau, travail hors ligne @@ -402,6 +404,7 @@ Language: fr 7 derniers jours %d semaines 1 semaine + De <b>Day One</b> Me rappeler ultérieurement Les statistiques, le lecteur, les notifications et d’autres fonctionnalités seront bientôt transférées vers l’application mobile Jetpack. Passer à l’application Jetpack @@ -1641,7 +1644,7 @@ Language: fr Les étiquettes indiquent aux lecteurs de quoi traite l’article. Date de publication Ajouter des étiquettes - Précédent + Retour Enregistrer maintenant Soumettre maintenant Planifier maintenant diff --git a/WordPress/src/main/res/values-gd/strings.xml b/WordPress/src/main/res/values-gd/strings.xml index 6c6648de0fd4..6a5a0d125644 100644 --- a/WordPress/src/main/res/values-gd/strings.xml +++ b/WordPress/src/main/res/values-gd/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-gl/strings.xml b/WordPress/src/main/res/values-gl/strings.xml index acc26a8e298e..277f902dbc54 100644 --- a/WordPress/src/main/res/values-gl/strings.xml +++ b/WordPress/src/main/res/values-gl/strings.xml @@ -1,8 +1,8 @@ @@ -411,6 +411,7 @@ Language: gl_ES As túas visitas nos últimos sete días son %1$s máis que nos sete días anteriores. Os teus visitantes nos últimos sete días son %1$s menos que nos sete días anteriores. Os teus visitantes nos últimos sete días son %1$s máis que nos sete días anteriores. + Desde <b>Day One</b> Recórdamo máis tarde Cambiar á aplicación de Jetpack Máis información en jetpack.com diff --git a/WordPress/src/main/res/values-he/strings.xml b/WordPress/src/main/res/values-he/strings.xml index d340794b050c..b83d4237be00 100644 --- a/WordPress/src/main/res/values-he/strings.xml +++ b/WordPress/src/main/res/values-he/strings.xml @@ -1,11 +1,13 @@ + ממתין לחיבור + תעבורה עבודה במצב לא מקוון החיבור לרשת בוצע מחדש החיבור לרשת אבד, העבודה מתבצעת במצב לא מקוון @@ -405,6 +407,7 @@ Language: he_IL שבעת הימים האחרונים %d שבועות שבוע אחד + מ-<b>Day One</b> הזכירו לי מאוחר יותר האפשרויות של נתונים סטטיסטיים, Reader, הודעות ואפשרויות אחרות יועברו בקרוב אל האפליקציה של Jetpack לנייד. החלפה לאפליקציה של Jetpack diff --git a/WordPress/src/main/res/values-hi/strings.xml b/WordPress/src/main/res/values-hi/strings.xml index 712dd2704dc1..c0606d541d14 100644 --- a/WordPress/src/main/res/values-hi/strings.xml +++ b/WordPress/src/main/res/values-hi/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-hr/strings.xml b/WordPress/src/main/res/values-hr/strings.xml index f15df2e120a1..6d57986c56a1 100644 --- a/WordPress/src/main/res/values-hr/strings.xml +++ b/WordPress/src/main/res/values-hr/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-hu/strings.xml b/WordPress/src/main/res/values-hu/strings.xml index 304c13ec9c62..01d6aeffe4e5 100644 --- a/WordPress/src/main/res/values-hu/strings.xml +++ b/WordPress/src/main/res/values-hu/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-id/strings.xml b/WordPress/src/main/res/values-id/strings.xml index 50d352f5b3c9..a66909914ce0 100644 --- a/WordPress/src/main/res/values-id/strings.xml +++ b/WordPress/src/main/res/values-id/strings.xml @@ -1,11 +1,13 @@ + Menunggu koneksi + Lalu lintas Bekerja secara Offline Koneksi internet terhubung lagi Koneksi internet terputus, bekerja secara offline @@ -404,6 +406,7 @@ Language: id 7 hari terakhir %d minggu 1 minggu + Dari <b>Day One</b> Ingatkan saya nanti Statistik, Reader, Pemberitahuan, dan berbagai fitur lain akan segera berpindah ke aplikasi ponsel Jetpack. Ganti ke aplikasi Jetpack diff --git a/WordPress/src/main/res/values-is/strings.xml b/WordPress/src/main/res/values-is/strings.xml index 4d3bd4a14929..be57d67f7a78 100644 --- a/WordPress/src/main/res/values-is/strings.xml +++ b/WordPress/src/main/res/values-is/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-it/strings.xml b/WordPress/src/main/res/values-it/strings.xml index fd8b70cce538..43d3cb8e8c78 100644 --- a/WordPress/src/main/res/values-it/strings.xml +++ b/WordPress/src/main/res/values-it/strings.xml @@ -1,11 +1,13 @@ + In attesa della connessione + Traffico Lavorare offline Connessione di rete ristabilita Connessione di rete persa, lavoro offline @@ -404,6 +406,7 @@ Language: it Ultimi 7 giorni %d settimane 1 settimana + Da <b>Day One</b> Ricordamelo più tardi Statistiche, Reader, Notifiche e altre funzionalità passeranno presto all\'app mobile Jetpack. Passa all\'app Jetpack diff --git a/WordPress/src/main/res/values-ja/strings.xml b/WordPress/src/main/res/values-ja/strings.xml index 2c537eaf6246..90195aa9846b 100644 --- a/WordPress/src/main/res/values-ja/strings.xml +++ b/WordPress/src/main/res/values-ja/strings.xml @@ -1,11 +1,13 @@ + 接続を待機中 + トラフィック オフラインで作業 ネットワーク接続が再確立されました ネットワーク接続が失われ、オフラインで作業しています @@ -404,6 +406,7 @@ Language: ja_JP 過去7日間 %d週 1週 + <b>Day One</b> から 後で再通知 統計、Reader、通知などの機能は、まもなく Jetpack モバイルアプリに移動します。 Jetpack アプリに切り替える diff --git a/WordPress/src/main/res/values-kmr/strings.xml b/WordPress/src/main/res/values-kmr/strings.xml index 39e76501d264..ed354762eb26 100644 --- a/WordPress/src/main/res/values-kmr/strings.xml +++ b/WordPress/src/main/res/values-kmr/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-ko/strings.xml b/WordPress/src/main/res/values-ko/strings.xml index b68d773d4495..b92b8c0e492e 100644 --- a/WordPress/src/main/res/values-ko/strings.xml +++ b/WordPress/src/main/res/values-ko/strings.xml @@ -1,11 +1,13 @@ + 연결 대기 중 + 트래픽 오프라인 작업 중 네트워크 연결 다시 설정됨 네트워크 연결 해제됨, 오프라인 작업 중 @@ -404,6 +406,7 @@ Language: ko_KR 최근 7일 %d주 1주 + 출처: <b>Day One</b> 나중에 다시 알림 곧 통계, 리더, 알림 및 기타 기능이 젯팩 모바일 앱으로 이동됩니다. 젯팩 앱으로 전환 diff --git a/WordPress/src/main/res/values-lv/strings.xml b/WordPress/src/main/res/values-lv/strings.xml index 4bf6bfb4b0ea..dafbd0d2af5d 100644 --- a/WordPress/src/main/res/values-lv/strings.xml +++ b/WordPress/src/main/res/values-lv/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-mk/strings.xml b/WordPress/src/main/res/values-mk/strings.xml index efc617b4d405..ecb4f36353e0 100644 --- a/WordPress/src/main/res/values-mk/strings.xml +++ b/WordPress/src/main/res/values-mk/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-ms/strings.xml b/WordPress/src/main/res/values-ms/strings.xml index be872a599ce4..e37bf5e6eb0b 100644 --- a/WordPress/src/main/res/values-ms/strings.xml +++ b/WordPress/src/main/res/values-ms/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-nb/strings.xml b/WordPress/src/main/res/values-nb/strings.xml index 013567705df3..94168831f849 100644 --- a/WordPress/src/main/res/values-nb/strings.xml +++ b/WordPress/src/main/res/values-nb/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-nl/strings.xml b/WordPress/src/main/res/values-nl/strings.xml index a0b32c67f6fe..4a2ae1469679 100644 --- a/WordPress/src/main/res/values-nl/strings.xml +++ b/WordPress/src/main/res/values-nl/strings.xml @@ -1,11 +1,12 @@ + Bezoekersaantallen Werk offline Netwerk opnieuw verbonden Netwerkverbinding verbroken, offline werken @@ -111,6 +112,7 @@ Language: nl Een ondersteuningsticket aanmaken … Hoe kan ik mijn aangepaste domein gebruiken in de app? Ik ben mijn inloggegevens vergeten + Ik kan geen foto\'s en video\'s uploaden Help, mijn site is onbereikbaar! Wat is mijn siteadres? Weet je niet wat je moet vragen? @@ -347,6 +349,7 @@ Language: nl Afgelopen 7 dagen %d weken 1 week + Van <b>Day One</b> Herinner mij hier later aan Statistieken, Lezer, Meldingen en andere functies worden binnenkort verplaatst naar de mobiele Jetpack-app. Schakel over naar de Jetpack-app diff --git a/WordPress/src/main/res/values-pl/strings.xml b/WordPress/src/main/res/values-pl/strings.xml index c4ca4fcb25c2..424a431caa58 100644 --- a/WordPress/src/main/res/values-pl/strings.xml +++ b/WordPress/src/main/res/values-pl/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-pt-rBR/strings.xml b/WordPress/src/main/res/values-pt-rBR/strings.xml index de26267f7c52..08155fb58c69 100644 --- a/WordPress/src/main/res/values-pt-rBR/strings.xml +++ b/WordPress/src/main/res/values-pt-rBR/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-ro/strings.xml b/WordPress/src/main/res/values-ro/strings.xml index cef589d6243d..7de4ae575c96 100644 --- a/WordPress/src/main/res/values-ro/strings.xml +++ b/WordPress/src/main/res/values-ro/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-ru/strings.xml b/WordPress/src/main/res/values-ru/strings.xml index bdf7541bd763..a396869a87fd 100644 --- a/WordPress/src/main/res/values-ru/strings.xml +++ b/WordPress/src/main/res/values-ru/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-sk/strings.xml b/WordPress/src/main/res/values-sk/strings.xml index 46ac29c7e93f..8ac07425a11d 100644 --- a/WordPress/src/main/res/values-sk/strings.xml +++ b/WordPress/src/main/res/values-sk/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-sq/strings.xml b/WordPress/src/main/res/values-sq/strings.xml index 8a2748e80e81..996c03a9a9d8 100644 --- a/WordPress/src/main/res/values-sq/strings.xml +++ b/WordPress/src/main/res/values-sq/strings.xml @@ -1,11 +1,13 @@ + Po pritet për lidhje + Trafik Punim i Palidhur Lidhja me rrjetin u rivendos Humbi lidhja me rrjetin, po punohet pa u lidhur @@ -410,6 +412,7 @@ Language: sq_AL 7 ditët e fundit %d javë 1 javë + Nga <b>Dita e Parë</b> Kujtoma më vonë Statistikat, Lexuesi, Njoftimet dhe të tjera veçorit të Jetpack-ut së shpejti do të kalohen te aplikacioni Jetpack për celular. Kaloni te aplikacioni Jetpack diff --git a/WordPress/src/main/res/values-sr/strings.xml b/WordPress/src/main/res/values-sr/strings.xml index 4c94593801da..a84ce6fd31f2 100644 --- a/WordPress/src/main/res/values-sr/strings.xml +++ b/WordPress/src/main/res/values-sr/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-sv/strings.xml b/WordPress/src/main/res/values-sv/strings.xml index ebfee79526c4..f5c947862364 100644 --- a/WordPress/src/main/res/values-sv/strings.xml +++ b/WordPress/src/main/res/values-sv/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-th/strings.xml b/WordPress/src/main/res/values-th/strings.xml index 2b302fdcc746..f206c5a3881b 100644 --- a/WordPress/src/main/res/values-th/strings.xml +++ b/WordPress/src/main/res/values-th/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-tr/strings.xml b/WordPress/src/main/res/values-tr/strings.xml index 4405348524d1..a212e63c54f0 100644 --- a/WordPress/src/main/res/values-tr/strings.xml +++ b/WordPress/src/main/res/values-tr/strings.xml @@ -1,11 +1,13 @@ + Bağlantı bekleniyor + Trafik Çevrimdışı Çalışıyor Ağ bağlantısı yeniden kuruldu Ağ bağlantısı kesildi, çevrimdışı çalışıyor @@ -408,6 +410,7 @@ Language: tr Son 7 gün %d hafta 1 hafta + <b>Day One</b>\'dan Daha sonra hatırlat İstatistikler, Okuyucu, Bildirimler ve diğer özellikler yakında Jetpack mobil uygulamasına taşınacak. Jetpack uygulamasına geçiş yapın diff --git a/WordPress/src/main/res/values-uz/strings.xml b/WordPress/src/main/res/values-uz/strings.xml index 5b1f9e22c192..7f93f6fed4a2 100644 --- a/WordPress/src/main/res/values-uz/strings.xml +++ b/WordPress/src/main/res/values-uz/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-vi/strings.xml b/WordPress/src/main/res/values-vi/strings.xml index 2a92fcc70b3a..343282b4c0ff 100644 --- a/WordPress/src/main/res/values-vi/strings.xml +++ b/WordPress/src/main/res/values-vi/strings.xml @@ -2,7 +2,7 @@ diff --git a/WordPress/src/main/res/values-zh-rCN/strings.xml b/WordPress/src/main/res/values-zh-rCN/strings.xml index 7cef5ff8e92b..8a15435f6ddf 100644 --- a/WordPress/src/main/res/values-zh-rCN/strings.xml +++ b/WordPress/src/main/res/values-zh-rCN/strings.xml @@ -1,11 +1,13 @@ + 正在等待连接 + 流量 离线工作 已重新建立网络连接 网络连接中断，正在离线工作 @@ -401,6 +403,7 @@ Language: zh_CN 过去 7 天 %d 周 1 周 + 来自 <b>Day One</b> 稍后提醒我 统计信息、阅读器、通知和其他功能即将移至 Jetpack 移动应用。 切换到 Jetpack 应用 diff --git a/WordPress/src/main/res/values-zh-rHK/strings.xml b/WordPress/src/main/res/values-zh-rHK/strings.xml index b15514a48548..702f478c199b 100644 --- a/WordPress/src/main/res/values-zh-rHK/strings.xml +++ b/WordPress/src/main/res/values-zh-rHK/strings.xml @@ -1,11 +1,13 @@ + 正在等待連線 + 流量 離線作業 重新建立網路連線 網路連線中斷，離線作業 @@ -405,6 +407,7 @@ Language: zh_TW 過去 7 天 %d 週 1 週 + 來自 <b>Day One</b> 稍後再提醒我 「統計資料」、「閱讀器」、「通知」及其他功能即將搬遷至 Jetpack 行動應用程式。 切換至 Jetpack 應用程式 diff --git a/WordPress/src/main/res/values-zh-rTW/strings.xml b/WordPress/src/main/res/values-zh-rTW/strings.xml index b15514a48548..702f478c199b 100644 --- a/WordPress/src/main/res/values-zh-rTW/strings.xml +++ b/WordPress/src/main/res/values-zh-rTW/strings.xml @@ -1,11 +1,13 @@ + 正在等待連線 + 流量 離線作業 重新建立網路連線 網路連線中斷，離線作業 @@ -405,6 +407,7 @@ Language: zh_TW 過去 7 天 %d 週 1 週 + 來自 <b>Day One</b> 稍後再提醒我 「統計資料」、「閱讀器」、「通知」及其他功能即將搬遷至 Jetpack 行動應用程式。 切換至 Jetpack 應用程式 From 3b84931bf634cd50d61722305707931383bf623d Mon Sep 17 00:00:00 2001 From: Automattic Release Bot Date: Fri, 26 Jan 2024 20:28:15 +0000 Subject: [PATCH 23/23] Bump version number --- version.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.properties b/version.properties index 677e9c3a4ea9..b05a338ca1af 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -versionName=24.1-rc-2 -versionCode=1404 +versionName=24.1-rc-3 +versionCode=1405 \ No newline at end of file