From a026a49017194976226f6569e620356d02870f8d Mon Sep 17 00:00:00 2001 From: misaochan Date: Tue, 26 Jul 2016 15:54:09 +1200 Subject: [PATCH 1/3] Add null check --- .../java/fr/free/nrw/commons/upload/UploadController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java index 09acdd6f5..00baab992 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java @@ -135,14 +135,17 @@ public class UploadController { } String mimeType = (String)contribution.getTag("mimeType"); + Boolean imagePrefix = false; + if(mimeType == null || TextUtils.isEmpty(mimeType) || mimeType.endsWith("*")) { mimeType = activity.getContentResolver().getType(contribution.getLocalUri()); if(mimeType != null) { contribution.setTag("mimeType", mimeType); + imagePrefix = mimeType.startsWith("image/"); } } - if(mimeType.startsWith("image/") && contribution.getDateCreated() == null) { + if(imagePrefix && contribution.getDateCreated() == null) { Cursor cursor = activity.getContentResolver().query(contribution.getLocalUri(), new String[]{MediaStore.Images.ImageColumns.DATE_TAKEN}, null, null, null); if(cursor != null && cursor.getCount() != 0) { @@ -159,7 +162,6 @@ public class UploadController { contribution.setDateCreated(new Date()); } } - return contribution; } From cbb3fc0f93f389e52885a89650ac7a1398187360 Mon Sep 17 00:00:00 2001 From: misaochan Date: Tue, 26 Jul 2016 15:59:24 +1200 Subject: [PATCH 2/3] Removing unnecessary nesting --- .../fr/free/nrw/commons/upload/UploadController.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java index 00baab992..eaf9acd15 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java @@ -139,10 +139,11 @@ public class UploadController { if(mimeType == null || TextUtils.isEmpty(mimeType) || mimeType.endsWith("*")) { mimeType = activity.getContentResolver().getType(contribution.getLocalUri()); - if(mimeType != null) { - contribution.setTag("mimeType", mimeType); - imagePrefix = mimeType.startsWith("image/"); - } + } + + if(mimeType != null) { + contribution.setTag("mimeType", mimeType); + imagePrefix = mimeType.startsWith("image/"); } if(imagePrefix && contribution.getDateCreated() == null) { From 1489cd419b27746af3e1c5a070766d8fb70dfc25 Mon Sep 17 00:00:00 2001 From: misaochan Date: Tue, 26 Jul 2016 16:03:01 +1200 Subject: [PATCH 3/3] Add logs --- .../main/java/fr/free/nrw/commons/upload/UploadController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java index eaf9acd15..ee6be3007 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java @@ -144,6 +144,7 @@ public class UploadController { if(mimeType != null) { contribution.setTag("mimeType", mimeType); imagePrefix = mimeType.startsWith("image/"); + Log.d("UploadController", "MimeType is: " + mimeType); } if(imagePrefix && contribution.getDateCreated() == null) {