Gutenberg related changes to land after 16.3 App cut

WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserActivity.java

@@ -709,7 +709,8 @@ public void onMediaItemSelected(int localMediaId, boolean isLongClick) {
         if (mBrowserType.isBrowser() && !isLongClick
                 || mBrowserType.isPicker() && isLongClick) {
             showMediaSettings(media);
-        } else if ((mBrowserType.isSingleImagePicker() || mBrowserType.isSingleMediaPicker()) && !isLongClick) {
+        } else if ((mBrowserType.isSingleImagePicker() || mBrowserType.isSingleMediaPicker() || mBrowserType
+                .isSingleFilePicker()) && !isLongClick) {
             // if we're picking a single image, we're done
             Intent intent = new Intent();
             ArrayList<Long> remoteMediaIds = new ArrayList<>();
@@ -1010,7 +1011,7 @@ private void doAddMediaItemClicked(@NonNull AddMenuItem item) {
                 WPMediaUtils.launchVideoLibrary(this, true);
                 break;
             case ITEM_CHOOSE_FILE:
-                mMediaPickerLauncher.showFilePicker(this);
+                mMediaPickerLauncher.showFilePicker(this, true);
                 break;
             case ITEM_CHOOSE_STOCK_MEDIA:
                 mMediaPickerLauncher.showStockMediaPickerForResult(this,

WordPress/src/main/java/org/wordpress/android/ui/media/MediaBrowserType.java

@@ -13,6 +13,7 @@ public enum MediaBrowserType {
     GUTENBERG_SINGLE_VIDEO_PICKER, // select video from Gutenberg editor
     GUTENBERG_SINGLE_MEDIA_PICKER, // select a single image or video to insert into a post
     GUTENBERG_MEDIA_PICKER, // select multiple images or videos to insert into a post
+    GUTENBERG_SINGLE_FILE_PICKER, // select a file to insert into a post
     WP_STORIES_MEDIA_PICKER; // select multiple images or videos to insert as Story frames in a Story
 
     public boolean isPicker() {
@@ -40,7 +41,8 @@ public boolean isImagePicker() {
                || this == GUTENBERG_SINGLE_IMAGE_PICKER
                || this == GUTENBERG_SINGLE_MEDIA_PICKER
                || this == GUTENBERG_MEDIA_PICKER
-               || this == WP_STORIES_MEDIA_PICKER;
+               || this == WP_STORIES_MEDIA_PICKER
+               || this == GUTENBERG_SINGLE_FILE_PICKER;
     }
 
     public boolean isVideoPicker() {
@@ -50,7 +52,16 @@ public boolean isVideoPicker() {
                || this == GUTENBERG_SINGLE_VIDEO_PICKER
                || this == GUTENBERG_SINGLE_MEDIA_PICKER
                || this == GUTENBERG_MEDIA_PICKER
-               || this == WP_STORIES_MEDIA_PICKER;
+               || this == WP_STORIES_MEDIA_PICKER
+               || this == GUTENBERG_SINGLE_FILE_PICKER;
+    }
+
+    public boolean isAudioPicker() {
+        return this == GUTENBERG_SINGLE_FILE_PICKER;
+    }
+
+    public boolean isDocumentPicker() {
+        return this == GUTENBERG_SINGLE_FILE_PICKER;
     }
 
     public boolean isGutenbergPicker() {
@@ -59,23 +70,28 @@ public boolean isGutenbergPicker() {
                || this == GUTENBERG_VIDEO_PICKER
                || this == GUTENBERG_SINGLE_VIDEO_PICKER
                || this == GUTENBERG_SINGLE_MEDIA_PICKER
-               || this == GUTENBERG_MEDIA_PICKER;
+               || this == GUTENBERG_MEDIA_PICKER
+               || this == GUTENBERG_SINGLE_FILE_PICKER;
     }
 
     public boolean isWPStoriesPicker() {
         return this == WP_STORIES_MEDIA_PICKER;
     }
 
+    public boolean isSingleFilePicker() {
+        return this == GUTENBERG_SINGLE_FILE_PICKER;
+    }
+
     public boolean isSingleMediaPicker() {
         return this == GUTENBERG_SINGLE_MEDIA_PICKER;
     }
 
     public boolean canMultiselect() {
         return this == EDITOR_PICKER
-                || this == AZTEC_EDITOR_PICKER
-                || this == GUTENBERG_IMAGE_PICKER
-                || this == GUTENBERG_VIDEO_PICKER
-                || this == WP_STORIES_MEDIA_PICKER;
+               || this == AZTEC_EDITOR_PICKER
+               || this == GUTENBERG_IMAGE_PICKER
+               || this == GUTENBERG_VIDEO_PICKER
+               || this == WP_STORIES_MEDIA_PICKER;
     }
 
     public boolean canFilter() {

WordPress/src/main/java/org/wordpress/android/ui/media/MediaGridFragment.java

@@ -383,7 +383,8 @@ List<MediaModel> getFilteredMedia() {
             }
         } else if (mBrowserType.isSingleImagePicker()) {
             mediaList = mMediaStore.getSiteImages(mSite);
-        } else if (mBrowserType.canFilter() || mBrowserType.canOnlyDoInitialFilter()) {
+        } else if (mBrowserType.canFilter() || mBrowserType.canOnlyDoInitialFilter() || mBrowserType
+                .isSingleFilePicker()) {
             mediaList = getMediaList();
         } else {
             List<MediaModel> allMedia = mMediaStore.getAllSiteMedia(mSite);

WordPress/src/main/java/org/wordpress/android/ui/photopicker/MediaPickerLauncher.kt

@@ -162,13 +162,13 @@ class MediaPickerLauncher @Inject constructor(
         fragment.startActivityForResult(intent, RequestCodes.PHOTO_PICKER)
     }
 
-    fun showFilePicker(activity: Activity) {
+    fun showFilePicker(activity: Activity, canMultiselect: Boolean = true) {
         if (consolidatedMediaPickerFeatureConfig.isEnabled()) {
             val allowedTypes = mutableSetOf(IMAGE, VIDEO, AUDIO, DOCUMENT)
             val mediaPickerSetup = MediaPickerSetup(
                     primaryDataSource = DEVICE,
                     availableDataSources = setOf(),
-                    canMultiselect = true,
+                    canMultiselect = canMultiselect,
                     requiresStoragePermissions = true,
                     allowedTypes = allowedTypes,
                     cameraSetup = HIDDEN,
@@ -187,7 +187,7 @@ class MediaPickerLauncher @Inject constructor(
                     RequestCodes.FILE_LIBRARY
             )
         } else {
-            WPMediaUtils.launchFileLibrary(activity, true)
+            WPMediaUtils.launchFileLibrary(activity, canMultiselect)
         }
     }
 
@@ -313,6 +313,15 @@ class MediaPickerLauncher @Inject constructor(
         if (browserType.isVideoPicker) {
             allowedTypes.add(VIDEO)
         }
+
+        if (browserType.isAudioPicker) {
+            allowedTypes.add(AUDIO)
+        }
+
+        if (browserType.isDocumentPicker) {
+            allowedTypes.add(DOCUMENT)
+        }
+
         return MediaPickerSetup(
                 primaryDataSource = WP_LIBRARY,
                 availableDataSources = setOf(),

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

@@ -2721,10 +2721,21 @@ postId, getSite(), mediaUri,
                     }
                     break;
                 case RequestCodes.FILE_LIBRARY:
-                    uris = WPMediaUtils.retrieveMediaUris(data);
-                    mAnalyticsTrackerWrapper.track(Stat.EDITOR_ADDED_FILE_VIA_LIBRARY);
-                    for (Uri item : uris) {
-                        mEditorMedia.addNewMediaToEditorAsync(item, false);
+                    if (mConsolidatedMediaPickerFeatureConfig.isEnabled()) {
+                        if (data.hasExtra(MediaPickerConstants.EXTRA_MEDIA_URIS)) {
+                            List<Uri> uriResults = convertStringArrayIntoUrisList(
+                                    Objects.requireNonNull(
+                                            data.getStringArrayExtra(MediaPickerConstants.EXTRA_MEDIA_URIS)));
+                            for (Uri uri : uriResults) {
+                                mEditorMedia.addNewMediaToEditorAsync(uri, false);
+                            }
+                        }
+                    } else {
+                        uris = WPMediaUtils.retrieveMediaUris(data);
+                        mAnalyticsTrackerWrapper.track(Stat.EDITOR_ADDED_FILE_VIA_LIBRARY);
+                        for (Uri item : uris) {
+                            mEditorMedia.addNewMediaToEditorAsync(item, false);
+                        }
                     }
                     break;
             }
@@ -2926,6 +2937,12 @@ public void onAddLibraryMediaClicked(boolean allowMultipleSelection) {
         }
     }
 
+    @Override public void onAddLibraryFileClicked(boolean allowMultipleSelection) {
+        mEditorPhotoPicker.setAllowMultipleSelection(allowMultipleSelection);
+        mMediaPickerLauncher
+                .viewWPMediaLibraryPickerForResult(this, mSite, MediaBrowserType.GUTENBERG_SINGLE_FILE_PICKER);
+    }
+
     @Override
     public void onAddPhotoClicked(boolean allowMultipleSelection) {
         if (allowMultipleSelection) {
@@ -2976,7 +2993,7 @@ public void onAddGifClicked(boolean allowMultipleSelection) {
 
     @Override
     public void onAddFileClicked(boolean allowMultipleSelection) {
-        WPMediaUtils.launchFileLibrary(this, allowMultipleSelection);
+        mMediaPickerLauncher.showFilePicker(this, allowMultipleSelection);
     }
 
     @Override

libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java

@@ -182,6 +182,7 @@ public interface EditorFragmentListener extends DialogVisibilityProvider {
         void onAddMediaImageClicked(boolean allowMultipleSelection);
         void onAddMediaVideoClicked(boolean allowMultipleSelection);
         void onAddLibraryMediaClicked(boolean allowMultipleSelection);
+        void onAddLibraryFileClicked(boolean allowMultipleSelection);
         void onAddPhotoClicked(boolean allowMultipleSelection);
         void onCapturePhotoClicked();
         void onAddVideoClicked(boolean allowMultipleSelection);

libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/gutenberg/GutenbergEditorFragment.java

@@ -218,6 +218,11 @@ public void onMediaLibraryMediaButtonClicked(boolean allowMultipleSelection) {
                         mEditorFragmentListener.onAddLibraryMediaClicked(allowMultipleSelection);
                     }
 
+                    @Override public void onMediaLibraryFileButtonClicked(boolean allowMultipleSelection) {
+                        mEditorFragmentListener.onTrackableEvent(TrackableEvent.MEDIA_BUTTON_TAPPED);
+                        mEditorFragmentListener.onAddLibraryFileClicked(allowMultipleSelection);
+                    }
+
                     @Override
                     public void onUploadPhotoButtonClicked(boolean allowMultipleSelection) {
                         mEditorFragmentListener.onAddPhotoClicked(allowMultipleSelection);