mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-28 21:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix #1131: Update min sdk version and remove redundant checks (#2608)

Browse source
This commit is contained in:
Vivek Maskara 2019-03-16 17:51:51 +05:30 • committed by Adam Jones
parent 900bd4ff2f
commit 6cbce9d283
8 changed files with 15 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/fr/free/nrw/commons/filepicker/FilePicker.java
View file

@ -353,11 +353,7 @@ public class FilePicker implements Constants {
}
private static boolean isPhoto(Intent data) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
return data == null || (data.getData() == null && data.getClipData() == null);
} else {
return data == null || (data.getData() == null);
}
return data == null || (data.getData() == null && data.getClipData() == null);
}
public static boolean willHandleActivityResult(int requestCode, int resultCode, Intent data) {
@ -430,10 +426,7 @@ public class FilePicker implements Constants {
private static List<UploadableFile> getFilesFromGalleryPictures(Intent data, Activity activity) throws IOException {
List<UploadableFile> files = new ArrayList<>();
ClipData clipData = null;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
clipData = data.getClipData();
}
ClipData clipData = data.getClipData();
if (clipData == null) {
Uri uri = data.getData();
UploadableFile file = PickedFiles.pickedExistingPicture(activity, uri);