mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2025-02-22 17:09:44 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix issue #130 - Fix a crash when the instance does not provide allowed mimetypes.

Browse source
This commit is contained in:
Thomas 2022-06-06 15:59:08 +02:00
parent 4e52fa0c70
commit caab12d081
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
View file

@ -281,25 +281,25 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true); intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
String[] mimetypes = new String[0]; String[] mimetypes = new String[0];
if (type == ComposeActivity.mediaType.PHOTO) { if (type == ComposeActivity.mediaType.PHOTO) {
if (instanceInfo.getMimeTypeImage().size() > 0) { if (instanceInfo.getMimeTypeImage() != null && instanceInfo.getMimeTypeImage().size() > 0) {
mimetypes = instanceInfo.getMimeTypeImage().toArray(new String[0]); mimetypes = instanceInfo.getMimeTypeImage().toArray(new String[0]);
} else { } else {
mimetypes = new String[]{"image/*"}; mimetypes = new String[]{"image/*"};
} }
} else if (type == ComposeActivity.mediaType.VIDEO) { } else if (type == ComposeActivity.mediaType.VIDEO) {
if (instanceInfo.getMimeTypeVideo().size() > 0) { if (instanceInfo.getMimeTypeVideo() != null && instanceInfo.getMimeTypeVideo().size() > 0) {
mimetypes = instanceInfo.getMimeTypeVideo().toArray(new String[0]); mimetypes = instanceInfo.getMimeTypeVideo().toArray(new String[0]);
} else { } else {
mimetypes = new String[]{"video/*"}; mimetypes = new String[]{"video/*"};
} }
} else if (type == ComposeActivity.mediaType.AUDIO) { } else if (type == ComposeActivity.mediaType.AUDIO) {
if (instanceInfo.getMimeTypeAudio().size() > 0) { if (instanceInfo.getMimeTypeAudio() != null && instanceInfo.getMimeTypeAudio().size() > 0) {
mimetypes = instanceInfo.getMimeTypeAudio().toArray(new String[0]); mimetypes = instanceInfo.getMimeTypeAudio().toArray(new String[0]);
} else { } else {
mimetypes = new String[]{"audio/mpeg", "audio/opus", "audio/flac", "audio/wav", "audio/ogg"}; mimetypes = new String[]{"audio/mpeg", "audio/opus", "audio/flac", "audio/wav", "audio/ogg"};
} }
} else if (type == ComposeActivity.mediaType.ALL) { } else if (type == ComposeActivity.mediaType.ALL) {
if (instanceInfo.getMimeTypeOther().size() > 0) { if (instanceInfo.getMimeTypeOther() != null && instanceInfo.getMimeTypeOther().size() > 0) {
mimetypes = instanceInfo.getMimeTypeOther().toArray(new String[0]); mimetypes = instanceInfo.getMimeTypeOther().toArray(new String[0]);
} else { } else {
mimetypes = new String[]{"*/*"}; mimetypes = new String[]{"*/*"};