From 083564c906b3a776e57903aaf3307117f1129b64 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Wed, 24 Jan 2018 22:05:35 +1000
Subject: [PATCH] Move storeSharedPrefs to fragment that is already injected

---
 .../nrw/commons/di/CommonsApplicationComponent.java |  2 +-
 .../fr/free/nrw/commons/nearby/DirectUpload.java    |  8 +-------
 .../free/nrw/commons/nearby/NearbyMapFragment.java  | 13 +++++++++++--
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java
index a8f2cf883..4e4c7a1ba 100644
--- a/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java
+++ b/app/src/main/java/fr/free/nrw/commons/di/CommonsApplicationComponent.java
@@ -31,7 +31,7 @@ public interface CommonsApplicationComponent extends AndroidInjector<CommonsAppl
 
     void inject(MediaWikiImageView mediaWikiImageView);
 
-    void inject(DirectUpload directUpload);
+    //void inject(DirectUpload directUpload);
 
     @Component.Builder
     @SuppressWarnings({"WeakerAccess", "unused"})
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 1f7d67e03..ff4c09e86 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
@@ -25,7 +25,7 @@ public class DirectUpload {
     private Fragment fragment;
     private SharedPreferences prefs;
 
-    @Inject @Named("direct_nearby_upload_prefs") SharedPreferences directPrefs;
+
 
     DirectUpload(String title, String desc, Fragment fragment, ContributionController controller, SharedPreferences prefs) {
         this.title = title;
@@ -35,13 +35,7 @@ public class DirectUpload {
         this.prefs = prefs;
     }
 
-    void storeSharedPrefs() {
-        SharedPreferences.Editor editor = directPrefs.edit();
 
-        editor.putString("Title", title);
-        editor.putString("Desc", desc);
-        editor.apply();
-    }
 
     void initiateCameraUpload() {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
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 80cf64b72..a56f8d4f2 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
@@ -91,6 +91,7 @@ public class NearbyMapFragment extends DaggerFragment {
     private Marker selected;
 
     @Inject @Named("prefs") SharedPreferences prefs;
+    @Inject @Named("direct_nearby_upload_prefs") SharedPreferences directPrefs;
 
     public NearbyMapFragment() {
     }
@@ -407,7 +408,7 @@ public class NearbyMapFragment extends DaggerFragment {
             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, prefs);
-            directUpload.storeSharedPrefs();
+            storeSharedPrefs();
             directUpload.initiateCameraUpload();
         });
 
@@ -415,11 +416,19 @@ public class NearbyMapFragment extends DaggerFragment {
             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, prefs);
-            directUpload.storeSharedPrefs();
+            storeSharedPrefs();
             directUpload.initiateGalleryUpload();
         });
     }
 
+    void storeSharedPrefs() {
+        SharedPreferences.Editor editor = directPrefs.edit();
+
+        editor.putString("Title", title);
+        editor.putString("Desc", desc);
+        editor.apply();
+    }
+
     @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         Timber.d("onRequestPermissionsResult: req code = " + " perm = " + permissions + " grant =" + grantResults);