From 9a1a004a25e4391b7431d2d5a63d0bd46d583571 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Wed, 24 Jan 2018 21:13:33 +1000
Subject: [PATCH] Move SharedPreferences injection into NearbyMapFragment

---
 .../java/fr/free/nrw/commons/nearby/DirectUpload.java  |  7 ++++---
 .../fr/free/nrw/commons/nearby/NearbyMapFragment.java  | 10 ++++++++--
 2 files changed, 12 insertions(+), 5 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 7bcd1e9d3..a16d96e32 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
@@ -23,15 +23,16 @@ class DirectUpload {
     private String desc;
     private ContributionController controller;
     private Fragment fragment;
+    private SharedPreferences prefs;
 
-    @Inject @Named("prefs") SharedPreferences prefs;
-    @Inject @Named("default_preferences") SharedPreferences defaultPrefs;
 
-    DirectUpload(String title, String desc, Fragment fragment, ContributionController controller) {
+
+    DirectUpload(String title, String desc, Fragment fragment, ContributionController controller, SharedPreferences prefs) {
         this.title = title;
         this.desc = desc;
         this.fragment = fragment;
         this.controller = controller;
+        this.prefs = prefs;
     }
 
     void storeSharedPrefs() {
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 cf504d694..4d2be43c0 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
@@ -1,6 +1,7 @@
 package fr.free.nrw.commons.nearby;
 
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
 import android.net.Uri;
@@ -39,6 +40,9 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+import javax.inject.Named;
+
 import dagger.android.support.DaggerFragment;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.contributions.ContributionController;
@@ -86,6 +90,8 @@ public class NearbyMapFragment extends DaggerFragment {
     private Place place;
     private Marker selected;
 
+    @Inject @Named("prefs") SharedPreferences prefs;
+
     public NearbyMapFragment() {
     }
 
@@ -403,7 +409,7 @@ public class NearbyMapFragment extends DaggerFragment {
         fabCamera.setOnClickListener(view -> {
             Timber.d("Camera button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription());
             controller = new ContributionController(this);
-            DirectUpload directUpload = new DirectUpload(place.getName(), place.getLongDescription(), this, controller);
+            DirectUpload directUpload = new DirectUpload(place.getName(), place.getLongDescription(), this, controller, prefs);
             directUpload.storeSharedPrefs();
             directUpload.initiateCameraUpload();
         });
@@ -411,7 +417,7 @@ public class NearbyMapFragment extends DaggerFragment {
         fabGallery.setOnClickListener(view -> {
             Timber.d("Gallery button tapped. Image title: " + place.getName() + "Image desc: " + place.getLongDescription());
             controller = new ContributionController(this);
-            DirectUpload directUpload = new DirectUpload(place.getName(), place.getLongDescription(), this, controller);
+            DirectUpload directUpload = new DirectUpload(place.getName(), place.getLongDescription(), this, controller, prefs);
             directUpload.storeSharedPrefs();
             directUpload.initiateGalleryUpload();