TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 05:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle Attachment Keyboard selection of a too large item.

Browse Source
This commit is contained in:
Alan Evans 2020-06-18 15:55:26 -03:00 committed by GitHub
parent bc5be10a0e
commit c4dc9064e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
View File

@ -718,6 +718,10 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
case ITEM_TOO_LARGE: case ITEM_TOO_LARGE:
Toast.makeText(this, R.string.MediaSendActivity_an_item_was_removed_because_it_exceeded_the_size_limit, Toast.LENGTH_LONG).show(); Toast.makeText(this, R.string.MediaSendActivity_an_item_was_removed_because_it_exceeded_the_size_limit, Toast.LENGTH_LONG).show();
break; break;
case ONLY_ITEM_TOO_LARGE:
Toast.makeText(this, R.string.MediaSendActivity_an_item_was_removed_because_it_exceeded_the_size_limit, Toast.LENGTH_LONG).show();
onNoMediaAvailable();
break;
case TOO_MANY_ITEMS: case TOO_MANY_ITEMS:
int maxSelection = viewModel.getMaxSelection(); int maxSelection = viewModel.getMaxSelection();
Toast.makeText(this, getResources().getQuantityString(R.plurals.MediaSendActivity_cant_share_more_than_n_items, maxSelection, maxSelection), Toast.LENGTH_SHORT).show(); Toast.makeText(this, getResources().getQuantityString(R.plurals.MediaSendActivity_cant_share_more_than_n_items, maxSelection, maxSelection), Toast.LENGTH_SHORT).show();

6
app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
View File

@ -147,8 +147,12 @@ class MediaSendViewModel extends ViewModel {
List<Media> filteredMedia = getFilteredMedia(context, populatedMedia, mediaConstraints); List<Media> filteredMedia = getFilteredMedia(context, populatedMedia, mediaConstraints);
if (filteredMedia.size() != newMedia.size()) { if (filteredMedia.size() != newMedia.size()) {
if (filteredMedia.isEmpty() && newMedia.size() == 1 && page == Page.UNKNOWN) {
error.setValue(Error.ONLY_ITEM_TOO_LARGE);
} else {
error.setValue(Error.ITEM_TOO_LARGE); error.setValue(Error.ITEM_TOO_LARGE);
} }
}
if (filteredMedia.size() > maxSelection) { if (filteredMedia.size() > maxSelection) {
filteredMedia = filteredMedia.subList(0, maxSelection); filteredMedia = filteredMedia.subList(0, maxSelection);
@ -670,7 +674,7 @@ class MediaSendViewModel extends ViewModel {
} }
enum Error { enum Error {
ITEM_TOO_LARGE, TOO_MANY_ITEMS, NO_ITEMS ITEM_TOO_LARGE, TOO_MANY_ITEMS, NO_ITEMS, ONLY_ITEM_TOO_LARGE
} }
enum Event { enum Event {