Skip to content

Commit b5b9494

Browse files
committed
review related changes
1 parent d6d8e7a commit b5b9494

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

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

+13-14
Original file line numberDiff line numberDiff line change
@@ -1217,10 +1217,10 @@ public void onPhotoPickerIconClicked(@NonNull PhotoPickerIcon icon, boolean allo
12171217
launchVideoCamera();
12181218
break;
12191219
case ANDROID_CHOOSE_PHOTO:
1220-
launchPictureLibrary(allowMultipleSelection);
1220+
launchPictureLibrary();
12211221
break;
12221222
case ANDROID_CHOOSE_VIDEO:
1223-
launchVideoLibrary(allowMultipleSelection);
1223+
launchVideoLibrary();
12241224
break;
12251225
case WP_MEDIA:
12261226
ActivityLauncher.viewMediaPickerForResult(this, mSite, MediaBrowserType.EDITOR_PICKER);
@@ -1789,12 +1789,12 @@ private void onUploadProgress(MediaModel media, float progress) {
17891789
}
17901790
}
17911791

1792-
private void launchPictureLibrary(boolean allowMultipleSelection) {
1793-
WPMediaUtils.launchPictureLibrary(this, allowMultipleSelection);
1792+
private void launchPictureLibrary() {
1793+
WPMediaUtils.launchPictureLibrary(this, mAllowMultipleSelection);
17941794
}
17951795

1796-
private void launchVideoLibrary(boolean allowMultipleSelection) {
1797-
WPMediaUtils.launchVideoLibrary(this, allowMultipleSelection);
1796+
private void launchVideoLibrary() {
1797+
WPMediaUtils.launchVideoLibrary(this, mAllowMultipleSelection);
17981798
}
17991799

18001800
private void launchVideoCamera() {
@@ -2523,23 +2523,22 @@ private boolean addExistingMediaToEditor(@NonNull AddExistingdMediaSource source
25232523
return true;
25242524
}
25252525

2526-
private boolean addExistingMediaToEditor(@NonNull AddExistingdMediaSource source, List<Long> mediaIdList) {
2526+
private void addExistingMediaToEditor(@NonNull AddExistingdMediaSource source, List<Long> mediaIdList) {
25272527
ArrayMap<String, MediaFile> mediaMap = new ArrayMap<>();
25282528
for (Long mediaId : mediaIdList) {
25292529
MediaModel media = mMediaStore.getSiteMediaWithId(mSite, mediaId);
25302530
if (media == null) {
25312531
AppLog.w(T.MEDIA, "Cannot add null media to post");
2532-
return false;
2533-
}
2534-
trackAddMediaEvent(source, media);
2532+
} else {
2533+
trackAddMediaEvent(source, media);
25352534

2536-
MediaFile mediaFile = FluxCUtils.mediaFileFromMediaModel(media);
2537-
String urlToUse = TextUtils.isEmpty(media.getUrl()) ? media.getFilePath() : media.getUrl();
2535+
MediaFile mediaFile = FluxCUtils.mediaFileFromMediaModel(media);
2536+
String urlToUse = TextUtils.isEmpty(media.getUrl()) ? media.getFilePath() : media.getUrl();
25382537

2539-
mediaMap.put(urlToUse, mediaFile);
2538+
mediaMap.put(urlToUse, mediaFile);
2539+
}
25402540
}
25412541
mEditorFragment.appendMediaFiles(mediaMap);
2542-
return true;
25432542
}
25442543

25452544
private class LoadPostContentTask extends AsyncTask<String, Spanned, Spanned> {

0 commit comments

Comments
 (0)