From 7273958b8ee91d49f7eb11921c2fc8938eb3e520 Mon Sep 17 00:00:00 2001
From: misaochan <josephinelim86@gmail.com>
Date: Sun, 27 Dec 2015 14:13:39 +1300
Subject: [PATCH] Implemented check for null query, other minor changes

---
 .../nrw/commons/category/CategorizationFragment.java     | 2 +-
 .../java/fr/free/nrw/commons/upload/GPSExtractor.java    | 2 +-
 .../java/fr/free/nrw/commons/upload/MwVolleyApi.java     | 9 ++++++++-
 .../java/fr/free/nrw/commons/upload/ShareActivity.java   | 1 +
 .../fr/free/nrw/commons/upload/UploadController.java     | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java b/commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
index b6c844783..8e85f64a4 100644
--- a/commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
+++ b/commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
@@ -114,7 +114,7 @@ public class CategorizationFragment extends SherlockFragment{
                     items.add(new CategoryItem(category, false));
                 }
             }
-            
+
             categoriesAdapter.setItems(items);
             categoriesAdapter.notifyDataSetInvalidated();
             categoriesSearchInProgress.setVisibility(View.GONE);
diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java b/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java
index a72ae4f4e..9b3ce8516 100644
--- a/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java
+++ b/commons/src/main/java/fr/free/nrw/commons/upload/GPSExtractor.java
@@ -33,7 +33,7 @@ public class GPSExtractor {
         }
 
         if (exif.getAttribute(ExifInterface.TAG_GPS_LATITUDE) == null) {
-            Log.w("Image", "Picture has no GPS info");
+            Log.d("Image", "Picture has no GPS info");
             return null;
         }
         else {
diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java b/commons/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java
index f91d55f93..2c23cf5b5 100644
--- a/commons/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java
+++ b/commons/src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java
@@ -28,6 +28,7 @@ public class MwVolleyApi {
     private static RequestQueue REQUEST_QUEUE;
     private static final Gson GSON = new GsonBuilder().create();
     private Context context;
+    private static String coordsLog;
 
     protected static HashSet<String> categorySet;
 
@@ -48,6 +49,7 @@ public class MwVolleyApi {
 
     public void request(String coords) {
 
+        coordsLog = coords;
         String apiUrl = buildUrl(coords);
         Log.d("Image", "URL: " + apiUrl);
 
@@ -162,7 +164,12 @@ public class MwVolleyApi {
         }
         @Override
         public String toString() {
-            return "query=" + query.toString() + "\n" + printSet();
+            if (query!=null) {
+                return "query=" + query.toString() + "\n" + printSet();
+            }
+            else {
+                return "No pages found near " + coordsLog;
+            }
         }
     }
 
diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java b/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
index 2bf8a0fc9..369d9b990 100644
--- a/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
+++ b/commons/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
@@ -181,6 +181,7 @@ public  class       ShareActivity
 
         if (filePath != null) {
             //extract the coordinates of image in decimal degrees
+            Log.d("Image", "Calling GPSExtractor");
             GPSExtractor imageObj = new GPSExtractor(filePath);
             String coords = imageObj.getCoords();
 
diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/UploadController.java b/commons/src/main/java/fr/free/nrw/commons/upload/UploadController.java
index 58665dae2..0826aef5f 100644
--- a/commons/src/main/java/fr/free/nrw/commons/upload/UploadController.java
+++ b/commons/src/main/java/fr/free/nrw/commons/upload/UploadController.java
@@ -140,7 +140,7 @@ public class UploadController {
             @Override
             protected void onPostExecute(Contribution contribution) {
                 super.onPostExecute(contribution);
-                //uploadService.queue(UploadService.ACTION_UPLOAD_FILE, contribution);
+                uploadService.queue(UploadService.ACTION_UPLOAD_FILE, contribution);
                 onComplete.onUploadStarted(contribution);
             }
         });