From 066260e40b185b90a50b3c9f97b8c46d84a722b1 Mon Sep 17 00:00:00 2001 From: misaochan Date: Sat, 17 Sep 2016 17:07:31 +1200 Subject: [PATCH 1/2] Change requestPermissions --- .../main/java/fr/free/nrw/commons/upload/ShareActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java index 3a8771fbf..c5b16fefc 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java @@ -92,7 +92,8 @@ public class ShareActivity if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { //Check for Storage permission that is required for upload. Do not allow user to proceed without permission, otherwise will crash if (ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) { - ActivityCompat.requestPermissions(this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, 4); + //See http://stackoverflow.com/questions/33169455/onrequestpermissionsresult-not-being-called-in-dialog-fragment + requestPermissions(new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, 4); } else { uploadBegins(); } @@ -295,6 +296,7 @@ public class ShareActivity getFileMetadata(); getLocationData(); } + } @Override From 56dc2cb31e15e8dd909cfbba5c1ddcde0e4edba3 Mon Sep 17 00:00:00 2001 From: misaochan Date: Sat, 17 Sep 2016 17:14:10 +1200 Subject: [PATCH 2/2] Add getFileMetadata() to uploadBegins() --- app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java index c5b16fefc..a631e8e26 100644 --- a/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java +++ b/app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java @@ -104,6 +104,7 @@ public class ShareActivity private void uploadBegins() { + getFileMetadata(); Toast startingToast = Toast.makeText(getApplicationContext(), R.string.uploading_started, Toast.LENGTH_LONG); startingToast.show();