oxen-io/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2023-12-14 02:53:01 +01:00
Code Issues 1 Projects Releases Wiki Activity

Filter out non-media from media send screen.

Browse source
This commit is contained in:
Greyson Parrelli 2019-01-16 13:32:39 -08:00
parent f70bf9c5bd
commit 4643dea2ad
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
View file

@ -11,6 +11,7 @@ import android.text.TextUtils;
import com.annimon.stream.Stream;
import org.thoughtcrime.securesms.util.MediaUtil;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.libsignal.util.guava.Optional;
@ -45,15 +46,18 @@ class MediaSendViewModel extends ViewModel {
}
void setInitialSelectedMedia(@NonNull List<Media> newMedia) {
boolean allBucketsPopulated = Stream.of(newMedia).reduce(true, (populated, m) -> populated && m.getBucketId().isPresent());
List<Media> filteredMedia = getFilteredMedia(newMedia);
boolean allBucketsPopulated = Stream.of(filteredMedia).reduce(true, (populated, m) -> populated && m.getBucketId().isPresent());
selectedMedia.setValue(newMedia);
bucketId.setValue(allBucketsPopulated ? computeBucketId(newMedia) : Optional.absent());
selectedMedia.setValue(filteredMedia);
bucketId.setValue(allBucketsPopulated ? computeBucketId(filteredMedia) : Optional.absent());
}
void onSelectedMediaChanged(@NonNull List<Media> newMedia) {
selectedMedia.setValue(newMedia);
position.setValue(newMedia.isEmpty() ? -1 : 0);
List<Media> filteredMedia = getFilteredMedia(newMedia);
selectedMedia.setValue(filteredMedia);
position.setValue(filteredMedia.isEmpty() ? -1 : 0);
}
void onFolderSelected(@NonNull String bucketId) {
@ -120,6 +124,13 @@ class MediaSendViewModel extends ViewModel {
return Optional.of(candidate);
}
private @NonNull List<Media> getFilteredMedia(@NonNull List<Media> media) {
return Stream.of(media).filter(m -> MediaUtil.isGif(m.getMimeType()) ||
MediaUtil.isImageType(m.getMimeType()) ||
MediaUtil.isVideoType(m.getMimeType())).toList();
}
static class Factory extends ViewModelProvider.NewInstanceFactory {
private final MediaRepository repository;