From ffdb7b2feab8a2c1262fa7cf4531f6a33c196583 Mon Sep 17 00:00:00 2001 From: Matthew Kevins Date: Mon, 7 Oct 2019 15:24:16 +1000 Subject: [PATCH 01/16] Add addMediaClicked method to editor fragment listener interface --- .../org/wordpress/android/editor/EditorFragmentAbstract.java | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java index ff0248a1786a..9df88f633f59 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java @@ -178,6 +178,7 @@ public interface EditorFragmentListener { void onAddPhotoClicked(boolean allowMultipleSelection); void onCapturePhotoClicked(); void onAddVideoClicked(boolean allowMultipleSelection); + void onAddMediaClicked(boolean allowMultipleSelection); void onCaptureVideoClicked(); boolean onMediaRetryClicked(String mediaId); void onMediaRetryAllClicked(Set mediaIdSet); From 7e5be37582efc4e60e50b1133dddf0adc8a1a8ac Mon Sep 17 00:00:00 2001 From: Matthew Kevins Date: Mon, 7 Oct 2019 15:27:36 +1000 Subject: [PATCH 02/16] Implement addMediaClicked methods --- .../org/wordpress/android/ui/posts/EditPostActivity.java | 4 ++++ .../wordpress/android/editor/GutenbergEditorFragment.java | 5 +++++ 2 files changed, 9 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 32bb24c5140a..989eceaf706a 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 @@ -3548,6 +3548,10 @@ public void onCapturePhotoClicked() { @Override public void onAddVideoClicked(boolean allowMultipleSelectio) { onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CHOOSE_VIDEO, allowMultipleSelectio); + @Override + public void onAddMediaClicked(boolean allowMultipleSelection) { + mAllowMultipleSelection = allowMultipleSelection; + WPMediaUtils.launchMediaLibrary(this, mAllowMultipleSelection); } @Override diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java index c260adde74aa..d20e21915936 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java @@ -242,6 +242,11 @@ public void onUploadVideoButtonClicked(boolean allowMultipleSelection) { mEditorFragmentListener.onAddVideoClicked(allowMultipleSelection); } + @Override + public void onUploadMediaButtonClicked(boolean allowMultipleSelection) { + mEditorFragmentListener.onAddMediaClicked(allowMultipleSelection); + } + @Override public void onCaptureVideoButtonClicked() { checkAndRequestCameraAndStoragePermissions(CAPTURE_VIDEO_PERMISSION_REQUEST_CODE); From 91b564a93ad99ec2e8af9697a695f840169d2df2 Mon Sep 17 00:00:00 2001 From: Matthew Kevins Date: Mon, 7 Oct 2019 15:28:40 +1000 Subject: [PATCH 03/16] Implement prepareMediaLibrary intent for image/video picker --- .../java/org/wordpress/android/util/WPMediaUtils.java | 10 ++++++++++ WordPress/src/main/res/values/strings.xml | 1 + 2 files changed, 11 insertions(+) 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 72c5e4dd9b82..47e6b1543792 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java @@ -229,6 +229,16 @@ private static Intent prepareVideoLibraryIntent(Context context, boolean multiSe return Intent.createChooser(intent, context.getString(R.string.pick_video)); } + private static Intent prepareMediaLibraryIntent(Context context, boolean multiSelect) { + Intent intent = new Intent(Intent.ACTION_GET_CONTENT); + intent.setType("*/*"); + intent.putExtra(Intent.EXTRA_MIME_TYPES, new String[] {"image/*", "video/*"}); + if (multiSelect) { + intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true); + } + return Intent.createChooser(intent, context.getString(R.string.pick_media)); + } + public static void launchVideoCamera(Activity activity) { activity.startActivityForResult(prepareVideoCameraIntent(), RequestCodes.TAKE_VIDEO); } diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index 74d528cf8150..8e703a5a1e3e 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -140,6 +140,7 @@ WordPress media Select photo Select video + Select media Capture or select photo Unable to retrieve this post You don\'t have permission to view the media library From 537354c9f22b858a293ec707fcc54a3bc5430395 Mon Sep 17 00:00:00 2001 From: Matthew Kevins Date: Mon, 7 Oct 2019 15:30:17 +1000 Subject: [PATCH 04/16] Implement launchMediaLibrary for device media picker --- .../src/main/java/org/wordpress/android/ui/RequestCodes.java | 1 + .../org/wordpress/android/ui/posts/EditPostActivity.java | 1 + .../main/java/org/wordpress/android/util/WPMediaUtils.java | 5 +++++ 3 files changed, 7 insertions(+) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/RequestCodes.java b/WordPress/src/main/java/org/wordpress/android/ui/RequestCodes.java index db803c5f5929..357f0d70ecb3 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/RequestCodes.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/RequestCodes.java @@ -31,6 +31,7 @@ public class RequestCodes { public static final int PICTURE_LIBRARY = 2000; public static final int TAKE_PHOTO = 2100; public static final int VIDEO_LIBRARY = 2200; + public static final int MEDIA_LIBRARY = 2210; public static final int TAKE_VIDEO = 2300; public static final int CROP_PHOTO = 2400; public static final int PICTURE_LIBRARY_OR_CAPTURE = 2500; 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 989eceaf706a..15dda97d3738 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 @@ -3128,6 +3128,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) { } } break; + case RequestCodes.MEDIA_LIBRARY: case RequestCodes.PICTURE_LIBRARY: advertiseImageOptimisationAndAddMedia(data); break; 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 47e6b1543792..85f6586bf3cf 100644 --- a/WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java +++ b/WordPress/src/main/java/org/wordpress/android/util/WPMediaUtils.java @@ -220,6 +220,11 @@ public static void launchVideoLibrary(Activity activity, boolean multiSelect) { RequestCodes.VIDEO_LIBRARY); } + public static void launchMediaLibrary(Activity activity, boolean multiSelect) { + activity.startActivityForResult(prepareMediaLibraryIntent(activity, multiSelect), + RequestCodes.MEDIA_LIBRARY); + } + private static Intent prepareVideoLibraryIntent(Context context, boolean multiSelect) { Intent intent = new Intent(Intent.ACTION_GET_CONTENT); intent.setType("video/*"); From 1b023163c984f617e998f035a078a630f1770250 Mon Sep 17 00:00:00 2001 From: Matthew Kevins Date: Mon, 7 Oct 2019 15:31:25 +1000 Subject: [PATCH 05/16] Fix typo --- .../org/wordpress/android/ui/posts/EditPostActivity.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 15dda97d3738..3282baa34290 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 @@ -3547,8 +3547,10 @@ public void onCapturePhotoClicked() { } @Override - public void onAddVideoClicked(boolean allowMultipleSelectio) { - onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CHOOSE_VIDEO, allowMultipleSelectio); + public void onAddVideoClicked(boolean allowMultipleSelection) { + onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CHOOSE_VIDEO, allowMultipleSelection); + } + @Override public void onAddMediaClicked(boolean allowMultipleSelection) { mAllowMultipleSelection = allowMultipleSelection; From aaab02f00ff53a2f77e15229d40d7191ec84849f Mon Sep 17 00:00:00 2001 From: Matthew Kevins Date: Mon, 7 Oct 2019 15:31:36 +1000 Subject: [PATCH 06/16] Update gutenberg-mobile reference --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 9e7b2e84469f..4097c575f8eb 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 9e7b2e84469fa29386ddc62f04334cbbc19b7a9c +Subproject commit 4097c575f8eb2f9b810cd47288d7b6294c6ca855 From e59409e7d13c58fe8b82d7a2cdd1e0241dce75c2 Mon Sep 17 00:00:00 2001 From: Matthew Kevins Date: Thu, 10 Oct 2019 22:32:59 +1000 Subject: [PATCH 07/16] Update gutenberg-mobile reference --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 4097c575f8eb..2fb8c33e905c 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 4097c575f8eb2f9b810cd47288d7b6294c6ca855 +Subproject commit 2fb8c33e905c3d637421db5125e8888615f2262a From 3c47b615b4c416ed796cca4060d7fb5396785035 Mon Sep 17 00:00:00 2001 From: Matthew Kevins Date: Thu, 10 Oct 2019 23:09:31 +1000 Subject: [PATCH 08/16] Rename device media method --- .../java/org/wordpress/android/ui/posts/EditPostActivity.java | 2 +- .../org/wordpress/android/editor/EditorFragmentAbstract.java | 2 +- .../org/wordpress/android/editor/GutenbergEditorFragment.java | 2 +- 3 files changed, 3 insertions(+), 3 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 3282baa34290..f9614e299394 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 @@ -3552,7 +3552,7 @@ public void onAddVideoClicked(boolean allowMultipleSelection) { } @Override - public void onAddMediaClicked(boolean allowMultipleSelection) { + public void onAddDeviceMediaClicked(boolean allowMultipleSelection) { mAllowMultipleSelection = allowMultipleSelection; WPMediaUtils.launchMediaLibrary(this, mAllowMultipleSelection); } diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java index 9df88f633f59..c66abf2eb6dd 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java @@ -178,7 +178,7 @@ public interface EditorFragmentListener { void onAddPhotoClicked(boolean allowMultipleSelection); void onCapturePhotoClicked(); void onAddVideoClicked(boolean allowMultipleSelection); - void onAddMediaClicked(boolean allowMultipleSelection); + void onAddDeviceMediaClicked(boolean allowMultipleSelection); void onCaptureVideoClicked(); boolean onMediaRetryClicked(String mediaId); void onMediaRetryAllClicked(Set mediaIdSet); diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java index d20e21915936..143b3d43d97d 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java @@ -244,7 +244,7 @@ public void onUploadVideoButtonClicked(boolean allowMultipleSelection) { @Override public void onUploadMediaButtonClicked(boolean allowMultipleSelection) { - mEditorFragmentListener.onAddMediaClicked(allowMultipleSelection); + mEditorFragmentListener.onAddDeviceMediaClicked(allowMultipleSelection); } @Override From d34e129acbf8c944e7353e28b2b7ace46babfe0d Mon Sep 17 00:00:00 2001 From: Matthew Kevins Date: Thu, 10 Oct 2019 23:10:20 +1000 Subject: [PATCH 09/16] Add library media interface method --- .../org/wordpress/android/editor/EditorFragmentAbstract.java | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java index c66abf2eb6dd..8ba7097b3f31 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java @@ -175,6 +175,7 @@ public interface EditorFragmentListener { void onAddMediaClicked(); void onAddMediaImageClicked(boolean allowMultipleSelection); void onAddMediaVideoClicked(boolean allowMultipleSelection); + void onAddLibraryMediaClicked(boolean allowMultipleSelection); void onAddPhotoClicked(boolean allowMultipleSelection); void onCapturePhotoClicked(); void onAddVideoClicked(boolean allowMultipleSelection); From 151f5537e0bcd6d0d8afe0483f1f826919fcada8 Mon Sep 17 00:00:00 2001 From: Matthew Kevins Date: Thu, 10 Oct 2019 23:12:10 +1000 Subject: [PATCH 10/16] Use EDITOR_PICKER for media library button --- .../org/wordpress/android/ui/posts/EditPostActivity.java | 6 ++++++ .../wordpress/android/editor/GutenbergEditorFragment.java | 6 ++++++ 2 files changed, 12 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 f9614e299394..cafdf711addc 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 @@ -3536,6 +3536,12 @@ public void onAddMediaVideoClicked(boolean allowMultipleSelection) { ActivityLauncher.viewMediaPickerForResult(this, mSite, MediaBrowserType.GUTENBERG_VIDEO_PICKER); } + @Override + public void onAddLibraryMediaClicked(boolean allowMultipleSelection) { + mAllowMultipleSelection = allowMultipleSelection; + ActivityLauncher.viewMediaPickerForResult(this, mSite, MediaBrowserType.EDITOR_PICKER); + } + @Override public void onAddPhotoClicked(boolean allowMultipleSelection) { onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CHOOSE_PHOTO, allowMultipleSelection); diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java index 143b3d43d97d..0e2d3408c4ac 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java +++ b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java @@ -232,6 +232,12 @@ public void onMediaLibraryVideoButtonClicked(boolean allowMultipleSelection) { mEditorFragmentListener.onAddMediaVideoClicked(allowMultipleSelection); } + @Override + public void onMediaLibraryMediaButtonClicked(boolean allowMultipleSelection) { + mEditorFragmentListener.onTrackableEvent(TrackableEvent.MEDIA_BUTTON_TAPPED); + mEditorFragmentListener.onAddLibraryMediaClicked(allowMultipleSelection); + } + @Override public void onUploadPhotoButtonClicked(boolean allowMultipleSelection) { mEditorFragmentListener.onAddPhotoClicked(allowMultipleSelection); From 8c9681519ede7e477e954cb666446c5e1d9cc40e Mon Sep 17 00:00:00 2001 From: Matthew Kevins Date: Thu, 10 Oct 2019 23:18:36 +1000 Subject: [PATCH 11/16] Update gutenberg-mobile reference --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 2fb8c33e905c..3bfb7aabfbb4 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 2fb8c33e905c3d637421db5125e8888615f2262a +Subproject commit 3bfb7aabfbb4856b7548bd0624e0d1e2e5ac0225 From 7536e7e22057a5149bb6de3422d8a15adfc35502 Mon Sep 17 00:00:00 2001 From: Matthew Kevins Date: Fri, 11 Oct 2019 13:06:28 +1000 Subject: [PATCH 12/16] Add media browser type for single media picker --- .../org/wordpress/android/ui/media/MediaBrowserType.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserType.java b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserType.java index 40f160a1ad65..70308edf237b 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserType.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserType.java @@ -8,7 +8,8 @@ public enum MediaBrowserType { GRAVATAR_IMAGE_PICKER, // select a single image as a gravatar SITE_ICON_PICKER, // select a single image as a site icon GUTENBERG_IMAGE_PICKER, // select image from Gutenberg editor - GUTENBERG_VIDEO_PICKER; // select video from Gutenberg editor + GUTENBERG_VIDEO_PICKER, // select video from Gutenberg editor + GUTENBERG_SINGLE_MEDIA_PICKER; // select multiple images or videos to insert into a post public boolean isPicker() { return this != BROWSER; @@ -22,6 +23,10 @@ public boolean isSingleImagePicker() { return this == FEATURED_IMAGE_PICKER || this == GRAVATAR_IMAGE_PICKER || this == SITE_ICON_PICKER; } + public boolean isSingleMediaPicker() { + return this == GUTENBERG_SINGLE_MEDIA_PICKER; + } + public boolean canMultiselect() { return this == EDITOR_PICKER || this == AZTEC_EDITOR_PICKER From e70b1355f1b88a2958aa3c1d92aa88ab3d086c9a Mon Sep 17 00:00:00 2001 From: Matthew Kevins Date: Fri, 11 Oct 2019 13:10:27 +1000 Subject: [PATCH 13/16] Use single picker when multiple is false --- .../org/wordpress/android/ui/posts/EditPostActivity.java | 6 +++++- 1 file changed, 5 insertions(+), 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 cafdf711addc..88cc5d9019a8 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 @@ -3539,7 +3539,11 @@ public void onAddMediaVideoClicked(boolean allowMultipleSelection) { @Override public void onAddLibraryMediaClicked(boolean allowMultipleSelection) { mAllowMultipleSelection = allowMultipleSelection; - ActivityLauncher.viewMediaPickerForResult(this, mSite, MediaBrowserType.EDITOR_PICKER); + if (mAllowMultipleSelection) { + ActivityLauncher.viewMediaPickerForResult(this, mSite, MediaBrowserType.EDITOR_PICKER); + } else { + ActivityLauncher.viewMediaPickerForResult(this, mSite, MediaBrowserType.GUTENBERG_SINGLE_MEDIA_PICKER); + } } @Override From c5b70dfdc7e6e8b13e612e66731a376a045c1a99 Mon Sep 17 00:00:00 2001 From: Matthew Kevins Date: Fri, 11 Oct 2019 13:12:07 +1000 Subject: [PATCH 14/16] Return media id on short tap --- .../org/wordpress/android/ui/media/MediaBrowserActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 0d6fe25717e2..68eb7ccd7f19 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 @@ -657,7 +657,7 @@ public void onMediaItemSelected(int localMediaId, boolean isLongClick) { if (mBrowserType.isBrowser() && !isLongClick || mBrowserType.isPicker() && isLongClick) { showMediaSettings(media); - } else if (mBrowserType.isSingleImagePicker() && !isLongClick) { + } else if ((mBrowserType.isSingleImagePicker() || mBrowserType.isSingleMediaPicker()) && !isLongClick) { // if we're picking a single image, we're done Intent intent = new Intent(); ArrayList remoteMediaIds = new ArrayList<>(); From f2c86e48d48f389289c82662615a54f18d8b8bf5 Mon Sep 17 00:00:00 2001 From: Matthew Kevins Date: Mon, 14 Oct 2019 12:21:24 +1000 Subject: [PATCH 15/16] Update gutenberg-mobile reference --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 3bfb7aabfbb4..50ed3387f737 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 3bfb7aabfbb4856b7548bd0624e0d1e2e5ac0225 +Subproject commit 50ed3387f737924296bda539085b68feee7c9990 From 1e38e0e308854ad0769d4ac3067f40e4404a7cf0 Mon Sep 17 00:00:00 2001 From: Matthew Kevins Date: Mon, 14 Oct 2019 12:23:51 +1000 Subject: [PATCH 16/16] Update string value for adding media --- WordPress/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/res/values/strings.xml b/WordPress/src/main/res/values/strings.xml index 8e703a5a1e3e..6b6f075454f9 100644 --- a/WordPress/src/main/res/values/strings.xml +++ b/WordPress/src/main/res/values/strings.xml @@ -140,7 +140,7 @@ WordPress media Select photo Select video - Select media + Add image or video Capture or select photo Unable to retrieve this post You don\'t have permission to view the media library