From c3e911f13501cef079e01c0c69eb5be82128b95d Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Tue, 29 May 2018 19:12:45 +1000
Subject: [PATCH] Inject prefs into FileProcessor instead of passing it from
 ShareActivity

---
 .../java/fr/free/nrw/commons/upload/FileProcessor.java    | 8 +++++---
 .../java/fr/free/nrw/commons/upload/ShareActivity.java    | 7 +++----
 app/src/main/java/fr/free/nrw/commons/upload/Zoom.java    | 1 -
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/FileProcessor.java b/app/src/main/java/fr/free/nrw/commons/upload/FileProcessor.java
index ece18f130..71f5e07b2 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/FileProcessor.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/FileProcessor.java
@@ -20,6 +20,7 @@ import java.util.Date;
 import java.util.List;
 
 import javax.inject.Inject;
+import javax.inject.Named;
 
 import fr.free.nrw.commons.caching.CacheController;
 import fr.free.nrw.commons.di.ApplicationlessInjection;
@@ -34,7 +35,6 @@ public class FileProcessor implements SimilarImageDialogFragment.onResponse{
     private Uri mediaUri;
     private ContentResolver contentResolver;
     private GPSExtractor imageObj;
-    private SharedPreferences prefs;
     private Context context;
     private String decimalCoords;
     private boolean haveCheckedForOtherImages = false;
@@ -49,11 +49,13 @@ public class FileProcessor implements SimilarImageDialogFragment.onResponse{
     GpsCategoryModel gpsCategoryModel;
     @Inject
     CategoryApi apiCall;
+    @Inject
+    @Named("default_preferences")
+    SharedPreferences prefs;
 
-    FileProcessor(Uri mediaUri, ContentResolver contentResolver, SharedPreferences prefs, Context context) {
+    FileProcessor(Uri mediaUri, ContentResolver contentResolver, Context context) {
         this.mediaUri = mediaUri;
         this.contentResolver = contentResolver;
-        this.prefs = prefs;
         this.context = context;
         useExtStorage = prefs.getBoolean("useExternalStorage", true);
         ApplicationlessInjection.getInstance(context.getApplicationContext()).getCommonsApplicationComponent().inject(this);
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 6fec6c3d0..9b54daa68 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
@@ -1,12 +1,11 @@
 package fr.free.nrw.commons.upload;
 
 import android.Manifest;
-
-import android.app.Activity;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
+import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
@@ -305,7 +304,7 @@ public class ShareActivity
         uploadController.prepareService();
 
         ContentResolver contentResolver = this.getContentResolver();
-        fileObj = new FileProcessor(mediaUri, contentResolver, prefs, this);
+        fileObj = new FileProcessor(mediaUri, contentResolver, this);
         checkIfFileExists();
         fileObj.getFileCoordinates(locationPermitted);
     }
@@ -342,7 +341,7 @@ public class ShareActivity
         isFABOpen=true;
 
         if( imageObj != null && imageObj.imageCoordsExists)
-        mapButton.setVisibility(View.VISIBLE);
+            mapButton.setVisibility(View.VISIBLE);
         zoomInButton.setVisibility(View.VISIBLE);
 
         mainFab.animate().rotationBy(180);
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/Zoom.java b/app/src/main/java/fr/free/nrw/commons/upload/Zoom.java
index 44eba9f2b..438c7f77b 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/Zoom.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/Zoom.java
@@ -11,7 +11,6 @@ import android.support.v4.graphics.BitmapCompat;
 import android.view.View;
 import android.widget.FrameLayout;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;