@@ -1217,10 +1217,10 @@ public void onPhotoPickerIconClicked(@NonNull PhotoPickerIcon icon, boolean allo
1217
1217
launchVideoCamera ();
1218
1218
break ;
1219
1219
case ANDROID_CHOOSE_PHOTO :
1220
- launchPictureLibrary (allowMultipleSelection );
1220
+ launchPictureLibrary ();
1221
1221
break ;
1222
1222
case ANDROID_CHOOSE_VIDEO :
1223
- launchVideoLibrary (allowMultipleSelection );
1223
+ launchVideoLibrary ();
1224
1224
break ;
1225
1225
case WP_MEDIA :
1226
1226
ActivityLauncher .viewMediaPickerForResult (this , mSite , MediaBrowserType .EDITOR_PICKER );
@@ -1789,12 +1789,12 @@ private void onUploadProgress(MediaModel media, float progress) {
1789
1789
}
1790
1790
}
1791
1791
1792
- private void launchPictureLibrary (boolean allowMultipleSelection ) {
1793
- WPMediaUtils .launchPictureLibrary (this , allowMultipleSelection );
1792
+ private void launchPictureLibrary () {
1793
+ WPMediaUtils .launchPictureLibrary (this , mAllowMultipleSelection );
1794
1794
}
1795
1795
1796
- private void launchVideoLibrary (boolean allowMultipleSelection ) {
1797
- WPMediaUtils .launchVideoLibrary (this , allowMultipleSelection );
1796
+ private void launchVideoLibrary () {
1797
+ WPMediaUtils .launchVideoLibrary (this , mAllowMultipleSelection );
1798
1798
}
1799
1799
1800
1800
private void launchVideoCamera () {
@@ -2523,23 +2523,22 @@ private boolean addExistingMediaToEditor(@NonNull AddExistingdMediaSource source
2523
2523
return true ;
2524
2524
}
2525
2525
2526
- private boolean addExistingMediaToEditor (@ NonNull AddExistingdMediaSource source , List <Long > mediaIdList ) {
2526
+ private void addExistingMediaToEditor (@ NonNull AddExistingdMediaSource source , List <Long > mediaIdList ) {
2527
2527
ArrayMap <String , MediaFile > mediaMap = new ArrayMap <>();
2528
2528
for (Long mediaId : mediaIdList ) {
2529
2529
MediaModel media = mMediaStore .getSiteMediaWithId (mSite , mediaId );
2530
2530
if (media == null ) {
2531
2531
AppLog .w (T .MEDIA , "Cannot add null media to post" );
2532
- return false ;
2533
- }
2534
- trackAddMediaEvent (source , media );
2532
+ } else {
2533
+ trackAddMediaEvent (source , media );
2535
2534
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 ();
2538
2537
2539
- mediaMap .put (urlToUse , mediaFile );
2538
+ mediaMap .put (urlToUse , mediaFile );
2539
+ }
2540
2540
}
2541
2541
mEditorFragment .appendMediaFiles (mediaMap );
2542
- return true ;
2543
2542
}
2544
2543
2545
2544
private class LoadPostContentTask extends AsyncTask <String , Spanned , Spanned > {
0 commit comments