Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "support multiple prop in gutenberg editor" #10558

Merged
merged 1 commit into from
Oct 3, 2019
Merged

Revert "support multiple prop in gutenberg editor" #10558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ public void onPhotoPickerMediaChosen(@NonNull List<Uri> uriList) {
}

@Override
public void onPhotoPickerIconClicked(@NonNull PhotoPickerFragment.PhotoPickerIcon icon, boolean multiple) {
public void onPhotoPickerIconClicked(@NonNull PhotoPickerFragment.PhotoPickerIcon icon) {
switch (icon) {
case ANDROID_CAPTURE_PHOTO:
launchCamera();
Expand Down
4 changes: 2 additions & 2 deletions WordPress/src/main/java/org/wordpress/android/ui/photopicker/PhotoPickerFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public enum PhotoPickerIcon {
public interface PhotoPickerListener {
void onPhotoPickerMediaChosen(@NonNull List<Uri> uriList);

void onPhotoPickerIconClicked(@NonNull PhotoPickerIcon icon, boolean allowMultipleSelection);
void onPhotoPickerIconClicked(@NonNull PhotoPickerIcon icon);
}

private EmptyViewRecyclerView mRecycler;
Expand Down Expand Up @@ -252,7 +252,7 @@ public void doIconClicked(@NonNull PhotoPickerIcon icon) {
}

if (mListener != null) {
mListener.onPhotoPickerIconClicked(icon, false);
mListener.onPhotoPickerIconClicked(icon);
}
}

Expand Down
110 changes: 23 additions & 87 deletions WordPress/src/main/java/org/wordpress/android/ui/posts/EditPostActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import android.text.Editable;
import android.text.Spanned;
import android.text.TextUtils;
import android.util.ArrayMap;
import android.view.ContextThemeWrapper;
import android.view.DragEvent;
import android.view.Menu;
Expand Down Expand Up @@ -258,7 +257,6 @@ enum RestartEditorOptions {
private boolean mShowAztecEditor;
private boolean mShowGutenbergEditor;
private boolean mMediaInsertedOnCreation;
private boolean mAllowMultipleSelection;

private List<String> mPendingVideoPressInfoRequests;
private List<String> mAztecBackspaceDeletedOrGbBlockDeletedMediaItemIds = new ArrayList<>();
Expand Down Expand Up @@ -1206,9 +1204,8 @@ public void onMediaToolbarButtonClicked(MediaToolbarAction action) {
* picker, or WP media picker
*/
@Override
public void onPhotoPickerIconClicked(@NonNull PhotoPickerIcon icon, boolean allowMultipleSelection) {
public void onPhotoPickerIconClicked(@NonNull PhotoPickerIcon icon) {
hidePhotoPicker();
mAllowMultipleSelection = allowMultipleSelection;
switch (icon) {
case ANDROID_CAPTURE_PHOTO:
launchCamera();
Expand Down Expand Up @@ -1790,11 +1787,13 @@ private void onUploadProgress(MediaModel media, float progress) {
}

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

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

private void launchVideoCamera() {
Expand Down Expand Up @@ -2523,24 +2522,6 @@ private boolean addExistingMediaToEditor(@NonNull AddExistingdMediaSource source
return true;
}

private void addExistingMediaToEditor(@NonNull AddExistingdMediaSource source, List<Long> mediaIdList) {
ArrayMap<String, MediaFile> mediaMap = new ArrayMap<>();
for (Long mediaId : mediaIdList) {
MediaModel media = mMediaStore.getSiteMediaWithId(mSite, mediaId);
if (media == null) {
AppLog.w(T.MEDIA, "Cannot add null media to post");
} else {
trackAddMediaEvent(source, media);

MediaFile mediaFile = FluxCUtils.mediaFileFromMediaModel(media);
String urlToUse = TextUtils.isEmpty(media.getUrl()) ? media.getFilePath() : media.getUrl();

mediaMap.put(urlToUse, mediaFile);
}
}
mEditorFragment.appendMediaFiles(mediaMap);
}

private class LoadPostContentTask extends AsyncTask<String, Spanned, Spanned> {
@Override
protected Spanned doInBackground(String... params) {
Expand Down Expand Up @@ -2845,7 +2826,7 @@ private boolean addMedia(Uri mediaUri, boolean isNew) {
private void addMediaList(@NonNull List<Uri> uriList, boolean isNew) {
// fetch any shared media first - must be done on the main thread
List<Uri> fetchedUriList = fetchMediaList(uriList);
mAddMediaListThread = new AddMediaListThread(fetchedUriList, isNew, mAllowMultipleSelection);
mAddMediaListThread = new AddMediaListThread(fetchedUriList, isNew);
mAddMediaListThread.start();
}

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

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

AddMediaListThread(@NonNull List<Uri> uriList, boolean isNew, boolean allowMultipleSelection) {
this.mUriList.addAll(uriList);
this.mIsNew = isNew;
this.mAllowMultipleSelection = allowMultipleSelection;
showOverlay(false);
}

private void showProgressDialog(final boolean show) {
runOnUiThread(new Runnable() {
@Override
Expand Down Expand Up @@ -2984,45 +2955,20 @@ private boolean processMedia(Uri mediaUri) {
}

private void postProcessMedia(final Uri mediaUri, final String path, final boolean isVideo) {
if (mAllowMultipleSelection) {
MediaFile mediaFile = getMediaFile(mediaUri);
if (mediaFile != null) {
mediaMap.put(path, mediaFile);
}
mFinishedUploads++;
if (mUriList.size() == mFinishedUploads) {
runOnUiThread(new Runnable() {
@Override
public void run() {
mEditorFragment.appendMediaFiles(mediaMap);
}
});
runOnUiThread(new Runnable() {
@Override
public void run() {
addMediaVisualEditor(mediaUri, path);
}
} else {
runOnUiThread(new Runnable() {
@Override
public void run() {
addMediaVisualEditor(mediaUri, path);
}
});
}
});
}
}

private void addMediaVisualEditor(Uri uri, String path) {
MediaFile mediaFile = getMediaFile(uri);
if (mediaFile != null) {
mEditorFragment.appendMediaFile(mediaFile, path, mImageLoader);
}
}

private MediaFile getMediaFile(Uri uri) {
MediaModel media = queueFileForUpload(uri, getContentResolver().getType(uri));
MediaFile mediaFile = FluxCUtils.mediaFileFromMediaModel(media);
if (media != null) {
return mediaFile;
} else {
return null;
mEditorFragment.appendMediaFile(mediaFile, path, mImageLoader);
}
}

Expand Down Expand Up @@ -3050,12 +2996,10 @@ private void addMediaLegacyEditor(Uri mediaUri, boolean isVideo) {
private void addMediaItemGroupOrSingleItem(Intent data) {
ClipData clipData = data.getClipData();
if (clipData != null) {
ArrayList<Uri> uriList = new ArrayList<>();
for (int i = 0; i < clipData.getItemCount(); i++) {
ClipData.Item item = clipData.getItemAt(i);
uriList.add(item.getUri());
addMedia(item.getUri(), false);
}
addMediaList(uriList, false);
} else {
addMedia(data.getData(), false);
}
Expand Down Expand Up @@ -3285,14 +3229,8 @@ private void handleMediaPickerResult(Intent data) {
if (ids.size() > 1 && allAreImages && !mShowGutenbergEditor) {
showInsertMediaDialog(ids);
} else {
// if mAllowMultipleSelection and gutenberg editor, pass all ids to addExistingMediaToEditor at once
if (mShowGutenbergEditor && mAllowMultipleSelection) {
addExistingMediaToEditor(AddExistingdMediaSource.WP_MEDIA_LIBRARY, ids);
mAllowMultipleSelection = false;
} else {
for (Long id : ids) {
addExistingMediaToEditor(AddExistingdMediaSource.WP_MEDIA_LIBRARY, id);
}
for (Long id : ids) {
addExistingMediaToEditor(AddExistingdMediaSource.WP_MEDIA_LIBRARY, id);
}
savePostAsync(null);
}
Expand Down Expand Up @@ -3524,35 +3462,33 @@ public void onAddMediaClicked() {
}

@Override
public void onAddMediaImageClicked(boolean allowMultipleSelection) {
mAllowMultipleSelection = allowMultipleSelection;
public void onAddMediaImageClicked() {
ActivityLauncher.viewMediaPickerForResult(this, mSite, MediaBrowserType.GUTENBERG_IMAGE_PICKER);
}

@Override
public void onAddMediaVideoClicked(boolean allowMultipleSelection) {
mAllowMultipleSelection = allowMultipleSelection;
public void onAddMediaVideoClicked() {
ActivityLauncher.viewMediaPickerForResult(this, mSite, MediaBrowserType.GUTENBERG_VIDEO_PICKER);
}

@Override
public void onAddPhotoClicked(boolean allowMultipleSelection) {
onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CHOOSE_PHOTO, allowMultipleSelection);
public void onAddPhotoClicked() {
onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CHOOSE_PHOTO);
}

@Override
public void onCapturePhotoClicked() {
onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CAPTURE_PHOTO, false);
onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CAPTURE_PHOTO);
}

@Override
public void onAddVideoClicked(boolean allowMultipleSelectio) {
onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CHOOSE_VIDEO, allowMultipleSelectio);
public void onAddVideoClicked() {
onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CHOOSE_VIDEO);
}

@Override
public void onCaptureVideoClicked() {
onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CAPTURE_VIDEO, false);
onPhotoPickerIconClicked(PhotoPickerIcon.ANDROID_CAPTURE_VIDEO);
}

@Override
Expand Down
3 changes: 0 additions & 3 deletions ...ditor/WordPressEditor/src/main/java/org/wordpress/android/editor/AztecEditorFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;

Expand Down Expand Up @@ -1099,8 +1098,6 @@ private void replaceDrawable(Drawable newDrawable) {
}
}

@Override public void appendMediaFiles(Map<String, MediaFile> mediaList) { }

private Drawable getLoadingMediaErrorPlaceholder(String msg) {
if (TextUtils.isEmpty(msg)) {
ToastUtils.showToast(getActivity(), R.string.error_media_load);
Expand Down
10 changes: 4 additions & 6 deletions ...or/WordPressEditor/src/main/java/org/wordpress/android/editor/EditorFragmentAbstract.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;

public abstract class EditorFragmentAbstract extends Fragment {
Expand All @@ -29,7 +28,6 @@ public class EditorFragmentNotAddedException extends Exception {
public abstract CharSequence getContent(CharSequence originalContent) throws EditorFragmentNotAddedException;
public abstract LiveData<Editable> getTitleOrContentChanged();
public abstract void appendMediaFile(MediaFile mediaFile, String imageUrl, ImageLoader imageLoader);
public abstract void appendMediaFiles(Map<String, MediaFile> mediaList);
public abstract void appendGallery(MediaGallery mediaGallery);
public abstract void setUrlForVideoPressId(String videoPressId, String url, String posterUrl);
public abstract boolean isUploadingMedia();
Expand Down Expand Up @@ -173,11 +171,11 @@ public interface EditorFragmentListener {
void onEditorFragmentInitialized();
void onEditorFragmentContentReady(ArrayList<Object> unsupportedBlocks);
void onAddMediaClicked();
void onAddMediaImageClicked(boolean allowMultipleSelection);
void onAddMediaVideoClicked(boolean allowMultipleSelection);
void onAddPhotoClicked(boolean allowMultipleSelection);
void onAddMediaImageClicked();
void onAddMediaVideoClicked();
void onAddPhotoClicked();
void onCapturePhotoClicked();
void onAddVideoClicked(boolean allowMultipleSelection);
void onAddVideoClicked();
void onCaptureVideoClicked();
boolean onMediaRetryClicked(String mediaId);
void onMediaRetryAllClicked(Set<String> mediaIdSet);
Expand Down
11 changes: 0 additions & 11 deletions ...ordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergContainerFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import androidx.fragment.app.Fragment;

import org.wordpress.mobile.WPAndroidGlue.Media;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnAuthHeaderRequestedListener;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnEditorAutosaveListener;
Expand All @@ -14,8 +13,6 @@
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnMediaLibraryButtonListener;
import org.wordpress.mobile.WPAndroidGlue.WPAndroidGlueCode.OnReattachQueryListener;

import java.util.ArrayList;

public class GutenbergContainerFragment extends Fragment {
public static final String TAG = "gutenberg_container_fragment_tag";

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

public void appendMediaFiles(ArrayList<Media> mediaList) {
mWPAndroidGlueCode.appendMediaFiles(mediaList);
}

public void showDevOptionsDialog() {
mWPAndroidGlueCode.showDevOptionsDialog();
}
Expand All @@ -140,10 +133,6 @@ public void appendUploadMediaFile(final int mediaId, final String mediaUri, fina
mWPAndroidGlueCode.appendUploadMediaFile(mediaId, mediaUri, isVideo);
}

public void appendUploadMediaFiles(ArrayList<Media> mediaList) {
mWPAndroidGlueCode.appendUploadMediaFiles(mediaList);
}

public void mediaFileUploadProgress(final int mediaId, final float progress) {
mWPAndroidGlueCode.mediaFileUploadProgress(mediaId, progress);
}
Expand Down
Loading