From 1809475feae13bfd4795c14877d919b87f1ba4cf Mon Sep 17 00:00:00 2001
From: Dmitry Brant <dbrant@wikimedia.org>
Date: Fri, 26 May 2017 15:34:10 -0400
Subject: [PATCH] Don't require Activity to be passed into UploadController.

---
 .../commons/upload/MultipleShareActivity.java |  2 +-
 .../nrw/commons/upload/ShareActivity.java     |  2 +-
 .../nrw/commons/upload/UploadController.java  | 26 ++++++++-----------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java
index 12b38a6ab..944c86edc 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/MultipleShareActivity.java
@@ -203,7 +203,7 @@ public  class       MultipleShareActivity
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        uploadController = new UploadController(this);
+        uploadController = new UploadController();
 
         setContentView(R.layout.activity_multiple_uploads);
         app = CommonsApplication.getInstance();
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 5aca73a04..924557905 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
@@ -214,7 +214,7 @@ public  class       ShareActivity
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        uploadController = new UploadController(this);
+        uploadController = new UploadController();
         setContentView(R.layout.activity_share);
         ButterKnife.bind(this);
         initBack();
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java
index 4266384c1..cc3263460 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/UploadController.java
@@ -1,6 +1,5 @@
 package fr.free.nrw.commons.upload;
 
-import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -26,16 +25,13 @@ import timber.log.Timber;
 
 public class UploadController {
     private UploadService uploadService;
-
-    private final Activity activity;
-    final CommonsApplication app;
+    private final CommonsApplication app;
 
     public interface ContributionUploadProgress {
         void onUploadStarted(Contribution contribution);
     }
 
-    public UploadController(Activity activity) {
-        this.activity = activity;
+    public UploadController() {
         app = CommonsApplication.getInstance();
     }
 
@@ -55,15 +51,15 @@ public class UploadController {
     };
 
     public void prepareService() {
-        Intent uploadServiceIntent = new Intent(activity, UploadService.class);
+        Intent uploadServiceIntent = new Intent(app, UploadService.class);
         uploadServiceIntent.setAction(UploadService.ACTION_START_SERVICE);
-        activity.startService(uploadServiceIntent);
-        activity.bindService(uploadServiceIntent, uploadServiceConnection, Context.BIND_AUTO_CREATE);
+        app.startService(uploadServiceIntent);
+        app.bindService(uploadServiceIntent, uploadServiceConnection, Context.BIND_AUTO_CREATE);
     }
 
     public void cleanup() {
         if(isUploadServiceConnected) {
-            activity.unbindService(uploadServiceConnection);
+            app.unbindService(uploadServiceConnection);
         }
     }
 
@@ -82,7 +78,7 @@ public class UploadController {
 
     public void startUpload(final Contribution contribution, final ContributionUploadProgress onComplete) {
 
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(activity);
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(app);
 
         //Set creator, desc, and license
         if(TextUtils.isEmpty(contribution.getCreator())) {
@@ -107,10 +103,10 @@ public class UploadController {
                 long length;
                 try {
                     if(contribution.getDataLength() <= 0) {
-                        length = activity.getContentResolver().openAssetFileDescriptor(contribution.getLocalUri(), "r").getLength();
+                        length = app.getContentResolver().openAssetFileDescriptor(contribution.getLocalUri(), "r").getLength();
                         if(length == -1) {
                             // Let us find out the long way!
-                            length = Utils.countBytes(activity.getContentResolver().openInputStream(contribution.getLocalUri()));
+                            length = Utils.countBytes(app.getContentResolver().openInputStream(contribution.getLocalUri()));
                         }
                         contribution.setDataLength(length);
                     }
@@ -126,7 +122,7 @@ public class UploadController {
                 Boolean imagePrefix = false;
 
                 if(mimeType == null || TextUtils.isEmpty(mimeType) || mimeType.endsWith("*")) {
-                    mimeType = activity.getContentResolver().getType(contribution.getLocalUri());
+                    mimeType = app.getContentResolver().getType(contribution.getLocalUri());
                 }
 
                 if(mimeType != null) {
@@ -136,7 +132,7 @@ public class UploadController {
                 }
 
                 if(imagePrefix && contribution.getDateCreated() == null) {
-                    Cursor cursor = activity.getContentResolver().query(contribution.getLocalUri(),
+                    Cursor cursor = app.getContentResolver().query(contribution.getLocalUri(),
                             new String[]{MediaStore.Images.ImageColumns.DATE_TAKEN}, null, null, null);
                     if(cursor != null && cursor.getCount() != 0) {
                         cursor.moveToFirst();