From 65b0b52b0155945d9ec7a3c09fe6df6ea805e7cf Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Tue, 6 Feb 2018 19:58:35 +1000
Subject: [PATCH] Finish tidying up setOnClickListeners

---
 .../main/java/fr/free/nrw/commons/nearby/DirectUpload.java   | 5 +++++
 .../main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java  | 4 ++--
 2 files changed, 7 insertions(+), 2 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 09db14aca..ba969f100 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
@@ -29,6 +29,11 @@ public class DirectUpload {
         this.prefs = prefs;
     }
 
+    DirectUpload(Fragment fragment, ContributionController controller) {
+        this.fragment = fragment;
+        this.controller = controller;
+    }
+
     void initiateCameraUpload() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
             if (ContextCompat.checkSelfPermission(fragment.getActivity(), WRITE_EXTERNAL_STORAGE) != PERMISSION_GRANTED) {
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
index 3b1b4755d..d1a343bfe 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/PlaceRenderer.java
@@ -102,7 +102,7 @@ class PlaceRenderer extends Renderer<Place> {
         cameraButton.setOnClickListener(view2 -> {
             Timber.d("Camera button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription());
             controller = new ContributionController(fragment);
-            DirectUpload directUpload = new DirectUpload(this, controller, prefs);
+            DirectUpload directUpload = new DirectUpload(fragment, controller);
             storeSharedPrefs();
             directUpload.initiateCameraUpload();
         });
@@ -110,7 +110,7 @@ class PlaceRenderer extends Renderer<Place> {
         galleryButton.setOnClickListener(view3 -> {
             Timber.d("Gallery button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription());
             controller = new ContributionController(fragment);
-            DirectUpload directUpload = new DirectUpload(this, controller, prefs);
+            DirectUpload directUpload = new DirectUpload(fragment, controller);
             storeSharedPrefs();
             directUpload.initiateGalleryUpload();
         });