From 38cdf79bbb2eb8e551ec4166fbb0cd15cea5a807 Mon Sep 17 00:00:00 2001 From: misaochan Date: Fri, 1 Jan 2016 19:07:44 +1300 Subject: [PATCH 1/7] Minor fixes --- .../fr/free/nrw/commons/category/CategorizationFragment.java | 3 ++- .../src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java | 3 ++- 2 files changed, 4 insertions(+), 2 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 8cedc9aa3..a76fe8d15 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 @@ -26,6 +26,7 @@ import java.util.ArrayList; import java.util.Date; import java.util.HashMap; import java.util.HashSet; +import java.util.List; import java.util.concurrent.ScheduledThreadPoolExecutor; public class CategorizationFragment extends SherlockFragment{ @@ -152,7 +153,7 @@ public class CategorizationFragment extends SherlockFragment{ if (MwVolleyApi.gpsCatExists){ Log.d("Cat", "GPS cats found in CategorizationFragment.java" + MwVolleyApi.getGpsCat().toString()); - ArrayList gpsItems = new ArrayList(MwVolleyApi.getGpsCat()); + List gpsItems = new ArrayList(MwVolleyApi.getGpsCat()); Log.d("Cat", "GPS items: " + gpsItems.toString()); mergedItems.addAll(gpsItems); 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 2c23cf5b5..b3d21ac76 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 @@ -22,6 +22,7 @@ import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.HashSet; import java.util.List; +import java.util.Set; public class MwVolleyApi { @@ -30,7 +31,7 @@ public class MwVolleyApi { private Context context; private static String coordsLog; - protected static HashSet categorySet; + protected static Set categorySet; //To check later on whether any nearby categories were found public static boolean gpsCatExists; From 7e6b13b1028dacf86017012ad062aad0b80d12c0 Mon Sep 17 00:00:00 2001 From: misaochan Date: Fri, 1 Jan 2016 19:11:41 +1300 Subject: [PATCH 2/7] Minor fixes 2 --- .../main/java/fr/free/nrw/commons/upload/MwVolleyApi.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) 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 b3d21ac76..84a57ddf8 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 @@ -42,8 +42,8 @@ public class MwVolleyApi { } //To get the list of categories for display - public static ArrayList getGpsCat() { - ArrayList list = new ArrayList(categorySet); + public static List getGpsCat() { + List list = new ArrayList(categorySet); return list; } @@ -163,9 +163,10 @@ public class MwVolleyApi { return "CATEGORIES FOUND" + categorySet.toString(); } } + @Override public String toString() { - if (query!=null) { + if (query != null) { return "query=" + query.toString() + "\n" + printSet(); } else { From 512ddfdd7df95f71aab4cbd3b0d1c64b02dadae0 Mon Sep 17 00:00:00 2001 From: misaochan Date: Fri, 1 Jan 2016 19:15:40 +1300 Subject: [PATCH 3/7] Minor fixes 3 --- .../fr/free/nrw/commons/upload/FilePathConverter.java | 4 +--- .../java/fr/free/nrw/commons/upload/GPSExtractor.java | 1 - .../java/fr/free/nrw/commons/upload/MwVolleyApi.java | 11 +++-------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/commons/src/main/java/fr/free/nrw/commons/upload/FilePathConverter.java b/commons/src/main/java/fr/free/nrw/commons/upload/FilePathConverter.java index 8d1711f47..9267bf9f8 100644 --- a/commons/src/main/java/fr/free/nrw/commons/upload/FilePathConverter.java +++ b/commons/src/main/java/fr/free/nrw/commons/upload/FilePathConverter.java @@ -48,9 +48,7 @@ public class FilePathConverter { Log.d("Image", "File path: " + filePath); return filePath; - } - - catch (IllegalArgumentException e) { + } catch (IllegalArgumentException e) { Log.w("Image", e); return null; } 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 9b3ce8516..88191b894 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 @@ -26,7 +26,6 @@ public class GPSExtractor { try { exif = new ExifInterface(filePath); - } catch (IOException e) { Log.w("Image", e); return null; 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 84a57ddf8..7a79062d7 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 @@ -156,8 +156,7 @@ public class MwVolleyApi { gpsCatExists = false; Log.d("Cat", "gpsCatExists=" + gpsCatExists); return "No collection of categories"; - } - else { + } else { gpsCatExists = true; Log.d("Cat", "gpsCatExists=" + gpsCatExists); return "CATEGORIES FOUND" + categorySet.toString(); @@ -168,8 +167,7 @@ public class MwVolleyApi { public String toString() { if (query != null) { return "query=" + query.toString() + "\n" + printSet(); - } - else { + } else { return "No pages found near " + coordsLog; } } @@ -206,16 +204,13 @@ public class MwVolleyApi { if (categories == null || categories.length == 0) { builder.append("no categories exist\n"); - } - else { + } else { for (Category category : categories) { builder.append(category.toString()); builder.append("\n"); if (category != null) { String categoryString = category.toString().replace("Category:", ""); categorySet.add(categoryString); - //Log.d("Set", "category added: " + category.toString()); - //Log.d("Set", "Current category Set" + categorySet.toString()); } } } From c385b54d448963e554bea15dad1c63665a0e7df9 Mon Sep 17 00:00:00 2001 From: misaochan Date: Fri, 1 Jan 2016 19:33:43 +1300 Subject: [PATCH 4/7] Fixed unnecessary use of static variable --- .../src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 7a79062d7..094d1a08b 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 @@ -29,7 +29,7 @@ public class MwVolleyApi { private static RequestQueue REQUEST_QUEUE; private static final Gson GSON = new GsonBuilder().create(); private Context context; - private static String coordsLog; + private String coordsLog; protected static Set categorySet; @@ -168,7 +168,7 @@ public class MwVolleyApi { if (query != null) { return "query=" + query.toString() + "\n" + printSet(); } else { - return "No pages found near " + coordsLog; + return "No pages found"; } } } From b3de1951760e2ddba29f4d5eeedd3aa8398b790c Mon Sep 17 00:00:00 2001 From: misaochan Date: Fri, 1 Jan 2016 19:37:31 +1300 Subject: [PATCH 5/7] Added API url as string constant --- .../src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 094d1a08b..62c62a0a7 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 @@ -35,6 +35,7 @@ public class MwVolleyApi { //To check later on whether any nearby categories were found public static boolean gpsCatExists; + public static final String MWURL = "https://commons.wikimedia.org/"; public MwVolleyApi(Context context) { this.context = context; @@ -66,7 +67,7 @@ public class MwVolleyApi { */ private String buildUrl (String coords){ - Uri.Builder builder = Uri.parse("https://commons.wikimedia.org/").buildUpon(); + Uri.Builder builder = Uri.parse(MWURL).buildUpon(); builder.appendPath("w") .appendPath("api.php") From 681cde18e89f34a3d3942bc95626b7759a9050bd Mon Sep 17 00:00:00 2001 From: misaochan Date: Fri, 1 Jan 2016 20:07:23 +1300 Subject: [PATCH 6/7] Added getters/setters for GpsCatExists --- .../category/CategorizationFragment.java | 2 +- .../free/nrw/commons/upload/MwVolleyApi.java | 23 +++++++++++++------ 2 files changed, 17 insertions(+), 8 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 a76fe8d15..e5491c27f 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 @@ -151,7 +151,7 @@ public class CategorizationFragment extends SherlockFragment{ items.add(cat.getName()); } - if (MwVolleyApi.gpsCatExists){ + if (MwVolleyApi.GpsCatExists.getGpsCatExists() == true){ Log.d("Cat", "GPS cats found in CategorizationFragment.java" + MwVolleyApi.getGpsCat().toString()); List gpsItems = new ArrayList(MwVolleyApi.getGpsCat()); Log.d("Cat", "GPS items: " + gpsItems.toString()); 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 62c62a0a7..db4090d33 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 @@ -33,8 +33,6 @@ public class MwVolleyApi { protected static Set categorySet; - //To check later on whether any nearby categories were found - public static boolean gpsCatExists; public static final String MWURL = "https://commons.wikimedia.org/"; public MwVolleyApi(Context context) { @@ -147,19 +145,30 @@ public class MwVolleyApi { } } } + + public static class GpsCatExists { + private static boolean gpsCatExists; + + public static void setGpsCatExists(boolean gpsCat) { + gpsCatExists = gpsCat; + } + + public static boolean getGpsCatExists() { + return gpsCatExists; + } + } private static class QueryResponse { private Query query = new Query(); - private Page page; private String printSet() { if (categorySet == null || categorySet.isEmpty()) { - gpsCatExists = false; - Log.d("Cat", "gpsCatExists=" + gpsCatExists); + GpsCatExists.setGpsCatExists(false); + Log.d("Cat", "gpsCatExists=" + GpsCatExists.getGpsCatExists()); return "No collection of categories"; } else { - gpsCatExists = true; - Log.d("Cat", "gpsCatExists=" + gpsCatExists); + GpsCatExists.setGpsCatExists(true); + Log.d("Cat", "gpsCatExists=" + GpsCatExists.getGpsCatExists()); return "CATEGORIES FOUND" + categorySet.toString(); } } From 4758d65c4c2f06f0ef148f443dd2e7ac87bc051a Mon Sep 17 00:00:00 2001 From: misaochan Date: Fri, 1 Jan 2016 23:05:20 +1300 Subject: [PATCH 7/7] Made URL constant private --- .../src/main/java/fr/free/nrw/commons/upload/MwVolleyApi.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 db4090d33..e3c69d2b4 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 @@ -33,7 +33,7 @@ public class MwVolleyApi { protected static Set categorySet; - public static final String MWURL = "https://commons.wikimedia.org/"; + private static final String MWURL = "https://commons.wikimedia.org/"; public MwVolleyApi(Context context) { this.context = context; @@ -145,7 +145,7 @@ public class MwVolleyApi { } } } - + public static class GpsCatExists { private static boolean gpsCatExists;