From bb5a6691f170183c63e9b3fd88d5b79216bb9759 Mon Sep 17 00:00:00 2001
From: Dmitry Brant <dbrant@wikimedia.org>
Date: Fri, 26 May 2017 16:20:55 -0400
Subject: [PATCH] Don't pass Activity into MwVolleyApi.

---
 .../java/fr/free/nrw/commons/upload/MwVolleyApi.java | 12 +++---------
 .../fr/free/nrw/commons/upload/ShareActivity.java    |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java b/app/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java
index 1f538d201..666b8cb31 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java
@@ -1,6 +1,5 @@
 package fr.free.nrw.commons.upload;
 
-import android.content.Context;
 import android.net.Uri;
 
 import com.android.volley.Cache;
@@ -21,6 +20,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import fr.free.nrw.commons.CommonsApplication;
 import timber.log.Timber;
 
 /**
@@ -32,15 +32,13 @@ public class MwVolleyApi {
 
     private static RequestQueue REQUEST_QUEUE;
     private static final Gson GSON = new GsonBuilder().create();
-    private Context context;
 
     protected static Set<String> categorySet;
     private static List<String> categoryList;
 
     private static final String MWURL = "https://commons.wikimedia.org/";
 
-    public MwVolleyApi(Context context) {
-        this.context = context;
+    public MwVolleyApi() {
         categorySet = new HashSet<>();
     }
 
@@ -94,12 +92,8 @@ public class MwVolleyApi {
     }
 
     private synchronized RequestQueue getQueue() {
-        return getQueue(context);
-    }
-
-    private static RequestQueue getQueue(Context context) {
         if (REQUEST_QUEUE == null) {
-            REQUEST_QUEUE = Volley.newRequestQueue(context);
+            REQUEST_QUEUE = Volley.newRequestQueue(CommonsApplication.getInstance());
         }
         return REQUEST_QUEUE;
     }
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 9372c78c0..c600ed263 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
@@ -402,7 +402,7 @@ public  class       ShareActivity
                 app.getCacheData().setQtPoint(decLongitude, decLatitude);
             }
 
-            MwVolleyApi apiCall = new MwVolleyApi(this);
+            MwVolleyApi apiCall = new MwVolleyApi();
 
             List<String> displayCatList = app.getCacheData().findCategory();
             boolean catListEmpty = displayCatList.isEmpty();