Skip to content

Commit 5c2fa2e

Browse files
mkevinsmkevins
authored
Merge pull request #10558 from wordpress-mobile/issue/revert-multiple-media-pr
Revert "support multiple prop in gutenberg editor"
2 parents d944b59 + 4540c6b commit 5c2fa2e

File tree

8 files changed

+39
-168
lines changed

8 files changed

+39
-168
lines changed

‎WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ public void onPhotoPickerMediaChosen(@NonNull List<Uri> uriList) {
288288
}
289289

290290
@Override
291-
public void onPhotoPickerIconClicked(@NonNull PhotoPickerFragment.PhotoPickerIcon icon, boolean multiple) {
291+
public void onPhotoPickerIconClicked(@NonNull PhotoPickerFragment.PhotoPickerIcon icon) {
292292
switch (icon) {
293293
case ANDROID_CAPTURE_PHOTO:
294294
launchCamera();

‎WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public enum PhotoPickerIcon {
6868
public interface PhotoPickerListener {
6969
void onPhotoPickerMediaChosen(@NonNull List<Uri> uriList);
7070

71-
void onPhotoPickerIconClicked(@NonNull PhotoPickerIcon icon, boolean allowMultipleSelection);
71+
void onPhotoPickerIconClicked(@NonNull PhotoPickerIcon icon);
7272
}
7373

7474
private EmptyViewRecyclerView mRecycler;
@@ -252,7 +252,7 @@ public void doIconClicked(@NonNull PhotoPickerIcon icon) {
252252
}
253253

254254
if (mListener != null) {
255-
mListener.onPhotoPickerIconClicked(icon, false);
255+
mListener.onPhotoPickerIconClicked(icon);
256256
}
257257
}
258258

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

+23-87
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import android.text.Editable;
2020
import android.text.Spanned;
2121
import android.text.TextUtils;
22-
import android.util.ArrayMap;
2322
import android.view.ContextThemeWrapper;
2423
import android.view.DragEvent;
2524
import android.view.Menu;
@@ -258,7 +257,6 @@ enum RestartEditorOptions {
258257
private boolean mShowAztecEditor;
259258
private boolean mShowGutenbergEditor;
260259
private boolean mMediaInsertedOnCreation;
261-
private boolean mAllowMultipleSelection;
262260

263261
private List<String> mPendingVideoPressInfoRequests;
264262
private List<String> mAztecBackspaceDeletedOrGbBlockDeletedMediaItemIds = new ArrayList<>();
@@ -1206,9 +1204,8 @@ public void onMediaToolbarButtonClicked(MediaToolbarAction action) {
12061204
* picker, or WP media picker
12071205
*/
12081206
@Override
1209-
public void onPhotoPickerIconClicked(@NonNull PhotoPickerIcon icon, boolean allowMultipleSelection) {
1207+
public void onPhotoPickerIconClicked(@NonNull PhotoPickerIcon icon) {
12101208
hidePhotoPicker();
1211-
mAllowMultipleSelection = allowMultipleSelection;
12121209
switch (icon) {
12131210
case ANDROID_CAPTURE_PHOTO:
12141211
launchCamera();
@@ -1790,11 +1787,13 @@ private void onUploadProgress(MediaModel media, float progress) {
17901787
}
17911788

17921789
private void launchPictureLibrary() {
1793-
WPMediaUtils.launchPictureLibrary(this, mAllowMultipleSelection);
1790+
// don't allow multiple selection for Gutenberg, as we're on a single image block for now
1791+
WPMediaUtils.launchPictureLibrary(this, !mShowGutenbergEditor);
17941792
}
17951793

17961794
private void launchVideoLibrary() {
1797-
WPMediaUtils.launchVideoLibrary(this, mAllowMultipleSelection);
1795+
// don't allow multiple selection for Gutenberg, as we're on a single image block for now
1796+
WPMediaUtils.launchVideoLibrary(this, !mShowGutenbergEditor);
17981797
}
17991798

18001799
private void launchVideoCamera() {
@@ -2523,24 +2522,6 @@ private boolean addExistingMediaToEditor(@NonNull AddExistingdMediaSource source
25232522
return true;
25242523
}
25252524

2526-
private void addExistingMediaToEditor(@NonNull AddExistingdMediaSource source, List<Long> mediaIdList) {
2527-
ArrayMap<String, MediaFile> mediaMap = new ArrayMap<>();
2528-
for (Long mediaId : mediaIdList) {
2529-
MediaModel media = mMediaStore.getSiteMediaWithId(mSite, mediaId);
2530-
if (media == null) {
2531-
AppLog.w(T.MEDIA, "Cannot add null media to post");
2532-
} else {
2533-
trackAddMediaEvent(source, media);
2534-
2535-
MediaFile mediaFile = FluxCUtils.mediaFileFromMediaModel(media);
2536-
String urlToUse = TextUtils.isEmpty(media.getUrl()) ? media.getFilePath() : media.getUrl();
2537-
2538-
mediaMap.put(urlToUse, mediaFile);
2539-
}
2540-
}
2541-
mEditorFragment.appendMediaFiles(mediaMap);
2542-
}
2543-
25442525
private class LoadPostContentTask extends AsyncTask<String, Spanned, Spanned> {
25452526
@Override
25462527
protected Spanned doInBackground(String... params) {
@@ -2845,7 +2826,7 @@ private boolean addMedia(Uri mediaUri, boolean isNew) {
28452826
private void addMediaList(@NonNull List<Uri> uriList, boolean isNew) {
28462827
// fetch any shared media first - must be done on the main thread
28472828
List<Uri> fetchedUriList = fetchMediaList(uriList);
2848-
mAddMediaListThread = new AddMediaListThread(fetchedUriList, isNew, mAllowMultipleSelection);
2829+
mAddMediaListThread = new AddMediaListThread(fetchedUriList, isNew);
28492830
mAddMediaListThread.start();
28502831
}
28512832

@@ -2868,23 +2849,13 @@ private class AddMediaListThread extends Thread {
28682849
private final boolean mIsNew;
28692850
private ProgressDialog mProgressDialog;
28702851
private boolean mDidAnyFail;
2871-
private int mFinishedUploads = 0;
2872-
private boolean mAllowMultipleSelection = false;
2873-
private Map<String, MediaFile> mediaMap = new ArrayMap<>();
28742852

28752853
AddMediaListThread(@NonNull List<Uri> uriList, boolean isNew) {
28762854
this.mUriList.addAll(uriList);
28772855
this.mIsNew = isNew;
28782856
showOverlay(false);
28792857
}
28802858

2881-
AddMediaListThread(@NonNull List<Uri> uriList, boolean isNew, boolean allowMultipleSelection) {
2882-
this.mUriList.addAll(uriList);
2883-
this.mIsNew = isNew;
2884-
this.mAllowMultipleSelection = allowMultipleSelection;
2885-
showOverlay(false);
2886-
}
2887-
28882859
private void showProgressDialog(final boolean show) {
28892860
runOnUiThread(new Runnable() {
28902861
@Override
@@ -2984,45 +2955,20 @@ private boolean processMedia(Uri mediaUri) {
29842955
}
29852956

29862957
private void postProcessMedia(final Uri mediaUri, final String path, final boolean isVideo) {
2987-
if (mAllowMultipleSelection) {
2988-
MediaFile mediaFile = getMediaFile(mediaUri);
2989-
if (mediaFile != null) {
2990-
mediaMap.put(path, mediaFile);
2991-
}
2992-
mFinishedUploads++;
2993-
if (mUriList.size() == mFinishedUploads) {
2994-
runOnUiThread(new Runnable() {
2995-
@Override
2996-
public void run() {
2997-
mEditorFragment.appendMediaFiles(mediaMap);
2998-
}
2999-
});
2958+
runOnUiThread(new Runnable() {
2959+
@Override
2960+
public void run() {
2961+
addMediaVisualEditor(mediaUri, path);
30002962
}
3001-
} else {
3002-
runOnUiThread(new Runnable() {
3003-
@Override
3004-
public void run() {
3005-
addMediaVisualEditor(mediaUri, path);
3006-
}
3007-
});
3008-
}
2963+
});
30092964
}
30102965
}
30112966

30122967
private void addMediaVisualEditor(Uri uri, String path) {
3013-
MediaFile mediaFile = getMediaFile(uri);
3014-
if (mediaFile != null) {
3015-
mEditorFragment.appendMediaFile(mediaFile, path, mImageLoader);
3016-
}
3017-
}
3018-
3019-
private MediaFile getMediaFile(Uri uri) {
30202968
MediaModel media = queueFileForUpload(uri, getContentResolver().getType(uri));
30212969
MediaFile mediaFile = FluxCUtils.mediaFileFromMediaModel(media);
30222970
if (media != null) {
3023-
return mediaFile;
3024-
} else {
3025-
return null;
2971+
mEditorFragment.appendMediaFile(mediaFile, path, mImageLoader);
30262972
}
30272973
}
30282974

@@ -3050,12 +2996,10 @@ private void addMediaLegacyEditor(Uri mediaUri, boolean isVideo) {
30502996
private void addMediaItemGroupOrSingleItem(Intent data) {
30512997
ClipData clipData = data.getClipData();
30522998
if (clipData != null) {
3053-
ArrayList<Uri> uriList = new ArrayList<>();
30542999
for (int i = 0; i < clipData.getItemCount(); i++) {
30553000
ClipData.Item item = clipData.getItemAt(i);
3056-
uriList.add(item.getUri());
3001+
addMedia(item.getUri(), false);
30573002
}
3058-
addMediaList(uriList, false);
30593003
} else {
30603004
addMedia(data.getData(), false);
30613005
}
@@ -3285,14 +3229,8 @@ private void handleMediaPickerResult(Intent data) {
32853229
if (ids.size() > 1 && allAreImages && !mShowGutenbergEditor) {
32863230
showInsertMediaDialog(ids);
32873231
} else {
3288-
// if mAllowMultipleSelection and gutenberg editor, pass all ids to addExistingMediaToEditor at once
3289-
if (mShowGutenbergEditor && mAllowMultipleSelection) {
3290-
addExistingMediaToEditor(AddExistingdMediaSource.WP_MEDIA_LIBRARY, ids);
3291-
mAllowMultipleSelection = false;
3292-
} else {
3293-
for (Long id : ids) {
3294-
addExistingMediaToEditor(AddExistingdMediaSource.WP_MEDIA_LIBRARY, id);
3295-
}
3232+
for (Long id : ids) {
3233+
addExistingMediaToEditor(AddExistingdMediaSource.WP_MEDIA_LIBRARY, id);
32963234
}
32973235
savePostAsync(null);
32983236
}
@@ -3524,35 +3462,33 @@ public void onAddMediaClicked() {
35243462
}
35253463

35263464
@Override
3527-
public void onAddMediaImageClicked(boolean allowMultipleSelection) {
3528-
mAllowMultipleSelection = allowMultipleSelection;
3465+
public void onAddMediaImageClicked() {
35293466
ActivityLauncher.viewMediaPickerForResult(this, mSite, MediaBrowserType.GUTENBERG_IMAGE_PICKER);
35303467
}
35313468

35323469
@Override
3533-
public void onAddMediaVideoClicked(boolean allowMultipleSelection) {
3534-
mAllowMultipleSelection = allowMultipleSelection;
3470+
public void onAddMediaVideoClicked() {
35353471
ActivityLauncher.viewMediaPickerForResult(this, mSite, MediaBrowserType.GUTENBERG_VIDEO_PICKER);
35363472
}
35373473

35383474
@Override
3539-
public void onAddPhotoClicked(boolean allowMultipleSelection) {
3540-
onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CHOOSE_PHOTO, allowMultipleSelection);
3475+
public void onAddPhotoClicked() {
3476+
onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CHOOSE_PHOTO);
35413477
}
35423478

35433479
@Override
35443480
public void onCapturePhotoClicked() {
3545-
onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CAPTURE_PHOTO, false);
3481+
onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CAPTURE_PHOTO);
35463482
}
35473483

35483484
@Override
3549-
public void onAddVideoClicked(boolean allowMultipleSelectio) {
3550-
onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CHOOSE_VIDEO, allowMultipleSelectio);
3485+
public void onAddVideoClicked() {
3486+
onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CHOOSE_VIDEO);
35513487
}
35523488

35533489
@Override
35543490
public void onCaptureVideoClicked() {
3555-
onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CAPTURE_VIDEO, false);
3491+
onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CAPTURE_VIDEO);
35563492
}
35573493

35583494
@Override

‎libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/AztecEditorFragment.java

-3
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@
105105
import java.util.HashMap;
106106
import java.util.HashSet;
107107
import java.util.List;
108-
import java.util.Map;
109108
import java.util.Set;
110109
import java.util.UUID;
111110

@@ -1099,8 +1098,6 @@ private void replaceDrawable(Drawable newDrawable) {
10991098
}
11001099
}
11011100

1102-
@Override public void appendMediaFiles(Map<String, MediaFile> mediaList) { }
1103-
11041101
private Drawable getLoadingMediaErrorPlaceholder(String msg) {
11051102
if (TextUtils.isEmpty(msg)) {
11061103
ToastUtils.showToast(getActivity(), R.string.error_media_load);

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
import java.util.ArrayList;
1818
import java.util.HashMap;
19-
import java.util.Map;
2019
import java.util.Set;
2120

2221
public abstract class EditorFragmentAbstract extends Fragment {
@@ -29,7 +28,6 @@ public class EditorFragmentNotAddedException extends Exception {
2928
public abstract CharSequence getContent(CharSequence originalContent) throws EditorFragmentNotAddedException;
3029
public abstract LiveData<Editable> getTitleOrContentChanged();
3130
public abstract void appendMediaFile(MediaFile mediaFile, String imageUrl, ImageLoader imageLoader);
32-
public abstract void appendMediaFiles(Map<String, MediaFile> mediaList);
3331
public abstract void appendGallery(MediaGallery mediaGallery);
3432
public abstract void setUrlForVideoPressId(String videoPressId, String url, String posterUrl);
3533
public abstract boolean isUploadingMedia();
@@ -173,11 +171,11 @@ public interface EditorFragmentListener {
173171
void onEditorFragmentInitialized();
174172
void onEditorFragmentContentReady(ArrayList<Object> unsupportedBlocks);
175173
void onAddMediaClicked();
176-
void onAddMediaImageClicked(boolean allowMultipleSelection);
177-
void onAddMediaVideoClicked(boolean allowMultipleSelection);
178-
void onAddPhotoClicked(boolean allowMultipleSelection);
174+
void onAddMediaImageClicked();
175+
void onAddMediaVideoClicked();
176+
void onAddPhotoClicked();
179177
void onCapturePhotoClicked();
180-
void onAddVideoClicked(boolean allowMultipleSelection);
178+
void onAddVideoClicked();
181179
void onCaptureVideoClicked();
182180
boolean onMediaRetryClicked(String mediaId);
183181
void onMediaRetryAllClicked(Set<String> mediaIdSet);

‎libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergContainerFragment.java

-11
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import androidx.fragment.app.Fragment;
77

8-
import org.wordpress.mobile.WPAndroidGlue.Media;
98
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode;
109
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnAuthHeaderRequestedListener;
1110
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnEditorAutosaveListener;
@@ -14,8 +13,6 @@
1413
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaLibraryButtonListener;
1514
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachQueryListener;
1615

17-
import java.util.ArrayList;
18-
1916
public class GutenbergContainerFragment extends Fragment {
2017
public static final String TAG = "gutenberg_container_fragment_tag";
2118

@@ -128,10 +125,6 @@ public void appendMediaFile(int mediaId, final String mediaUrl, final boolean is
128125
mWPAndroidGlueCode.appendMediaFile(mediaId, mediaUrl, isVideo);
129126
}
130127

131-
public void appendMediaFiles(ArrayList<Media> mediaList) {
132-
mWPAndroidGlueCode.appendMediaFiles(mediaList);
133-
}
134-
135128
public void showDevOptionsDialog() {
136129
mWPAndroidGlueCode.showDevOptionsDialog();
137130
}
@@ -140,10 +133,6 @@ public void appendUploadMediaFile(final int mediaId, final String mediaUri, fina
140133
mWPAndroidGlueCode.appendUploadMediaFile(mediaId, mediaUri, isVideo);
141134
}
142135

143-
public void appendUploadMediaFiles(ArrayList<Media> mediaList) {
144-
mWPAndroidGlueCode.appendUploadMediaFiles(mediaList);
145-
}
146-
147136
public void mediaFileUploadProgress(final int mediaId, final float progress) {
148137
mWPAndroidGlueCode.mediaFileUploadProgress(mediaId, progress);
149138
}

0 commit comments

Comments
 (0)