From 946c6c740d440fda9ab1e4d2bbb3e3d72256cd06 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Mon, 1 Jan 2018 20:23:51 +1000
Subject: [PATCH] Complete initiateDirectUpload()

---
 .../free/nrw/commons/nearby/DirectUpload.java   | 17 +++++++----------
 .../nrw/commons/nearby/NearbyMapFragment.java   |  3 ++-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/DirectUpload.java b/app/src/main/java/fr/free/nrw/commons/nearby/DirectUpload.java
index b232a7492..a6357436a 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/DirectUpload.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/DirectUpload.java
@@ -49,8 +49,7 @@ class DirectUpload {
         Activity activity = (Activity) context;
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (ContextCompat.checkSelfPermission(activity, READ_EXTERNAL_STORAGE)
-                    != PERMISSION_GRANTED) {
+            if (ContextCompat.checkSelfPermission(activity, READ_EXTERNAL_STORAGE) != PERMISSION_GRANTED) {
                 if (activity.shouldShowRequestPermissionRationale(READ_EXTERNAL_STORAGE)) {
                     new AlertDialog.Builder(activity)
                             .setMessage(activity.getString(R.string.read_storage_permission_rationale))
@@ -64,15 +63,13 @@ class DirectUpload {
                 } else {
                     activity.requestPermissions(new String[]{READ_EXTERNAL_STORAGE},
                             1);
-
-                    // MY_PERMISSIONS_REQUEST_READ_CONTACTS is an
-                    // app-defined int constant. The callback method gets the
-                    // result of the request.
                 }
+            } else {
+                controller.startGalleryPick();
             }
-                else {
-                    controller.startGalleryPick();
-                    return true;
-                }
+        }
+        else {
+            controller.startGalleryPick();
+        }
     }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
index a430f8d4f..bb63cfc78 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
@@ -386,8 +386,9 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
             //TODO: Change this to activate camera upload (see ContributionsListFragment). Insert shared preference.
             Timber.d("Image title: " + place.getName() + "Image desc: " + place.getLongDescription());
 
-            DirectUpload directUpload = new DirectUpload(place.getName(), place.getLongDescription());
+            DirectUpload directUpload = new DirectUpload(place.getName(), place.getLongDescription(), this);
             directUpload.storeSharedPrefs(getActivity());
+            directUpload.initiateUpload(getActivity());
 
         });