From 38cf720b4b19f71f28cfa8ea91f1be11bca1ce6f Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 24 Dec 2015 14:31:35 +1300 Subject: [PATCH] Minor refactoring Make buildURL private --- .../free/nrw/commons/upload/MwVolleyApi.java | 20 +++++++++++-------- .../nrw/commons/upload/ShareActivity.java | 6 +----- 2 files changed, 13 insertions(+), 13 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 59d3bb153..53806ae02 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 @@ -30,12 +30,23 @@ public class MwVolleyApi { this.context = context; } + + public void request(String coords) { + + String apiUrl = buildUrl(coords); + Log.d("Image", "URL: " + apiUrl); + + JsonRequest request = new QueryRequest(apiUrl, + new LogResponseListener(), new LogResponseErrorListener()); + getQueue().add(request); + } + /** * Builds URL with image coords for MediaWiki API calls * Example URL: https://commons.wikimedia.org/w/api.php?action=query&prop=categories|coordinates|pageprops&format=json&clshow=!hidden&coprop=type|name|dim|country|region|globe&codistancefrompoint=38.11386944444445|13.356263888888888& * generator=geosearch&redirects=&ggscoord=38.11386944444445|13.356263888888888&ggsradius=100&ggslimit=10&ggsnamespace=6&ggsprop=type|name|dim|country|region|globe&ggsprimary=all&formatversion=2 */ - public String buildUrl (String coords){ + private String buildUrl (String coords){ Uri.Builder builder = Uri.parse("https://commons.wikimedia.org/").buildUpon(); @@ -60,13 +71,6 @@ public class MwVolleyApi { } - public void request(String apiUrl) { - - JsonRequest request = new QueryRequest(apiUrl, - new LogResponseListener(), new LogResponseErrorListener()); - getQueue().add(request); - } - private synchronized RequestQueue getQueue() { return getQueue(context); } 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 8186481c2..2bf8a0fc9 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 @@ -188,12 +188,8 @@ public class ShareActivity Log.d("Image", "Coords of image: " + coords); MwVolleyApi apiCall = new MwVolleyApi(this); - //build URL with image coords for MediaWiki API calls - String apiUrl = apiCall.buildUrl(coords); - Log.d("Image", "URL: " + apiUrl); - //asynchronous calls to MediaWiki Commons API to match image coords with nearby Commons categories - apiCall.request(apiUrl); + apiCall.request(coords); } }