From e33601875b6e45b3b7c69087401ce8552ebefe0e Mon Sep 17 00:00:00 2001 From: misaochan Date: Mon, 4 Jul 2016 17:37:15 +1200 Subject: [PATCH 1/3] Comment out debug messages that spam logcat --- app/src/main/java/fr/free/nrw/commons/LicenseList.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/LicenseList.java b/app/src/main/java/fr/free/nrw/commons/LicenseList.java index 2e3e51b78..f3c6e7c6a 100644 --- a/app/src/main/java/fr/free/nrw/commons/LicenseList.java +++ b/app/src/main/java/fr/free/nrw/commons/LicenseList.java @@ -64,14 +64,14 @@ public class LicenseList { } public String nameForTemplate(String template) { - Log.d("Commons", "LicenseList.nameForTemplate: template: " + template); + //Log.d("Commons", "LicenseList.nameForTemplate: template: " + template); String stringId = nameIdForTemplate(template); - Log.d("Commons", "LicenseList.nameForTemplate: stringId: " + stringId); + //Log.d("Commons", "LicenseList.nameForTemplate: stringId: " + stringId); int nameId = stringIdByName(stringId); - Log.d("Commons", "LicenseList.nameForTemplate: nameId: " + nameId); + //Log.d("Commons", "LicenseList.nameForTemplate: nameId: " + nameId); if(nameId != 0) { String name = res.getString(nameId); - Log.d("Commons", "LicenseList.nameForTemplate: name: " + name); + //Log.d("Commons", "LicenseList.nameForTemplate: name: " + name); return name; } return template; From d2347d00b153b8e3252e05b7ec72753156a1bb6d Mon Sep 17 00:00:00 2001 From: misaochan Date: Wed, 6 Jul 2016 17:49:19 +1200 Subject: [PATCH 2/3] Return empty list if SSLException (under IOException) --- .../java/fr/free/nrw/commons/category/MethodAUpdater.java | 3 ++- .../java/fr/free/nrw/commons/category/PrefixUpdater.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java b/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java index 816f0c34e..f8fb45b51 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java +++ b/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java @@ -67,7 +67,8 @@ public class MethodAUpdater extends AsyncTask> { .get(); Log.d(TAG, "Method A URL filter" + result.toString()); } catch (IOException e) { - throw new RuntimeException(e); + //Return empty arraylist + return categories; } ArrayList categoryNodes = result.getNodes("/api/query/search/p/@title"); diff --git a/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java b/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java index a984f1a72..4e7db8833 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java +++ b/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java @@ -11,6 +11,8 @@ import org.mediawiki.api.MWApi; import java.io.IOException; import java.util.ArrayList; +import javax.net.ssl.SSLPeerUnverifiedException; + import fr.free.nrw.commons.CommonsApplication; /** @@ -63,7 +65,8 @@ public class PrefixUpdater extends AsyncTask> { .get(); Log.d(TAG, "Prefix URL filter" + result.toString()); } catch (IOException e) { - throw new RuntimeException(e); + //Return empty arraylist + return categories; } ArrayList categoryNodes = result.getNodes("/api/query/allcategories/c"); From 23e7e75a412231b1814daec56acde6e3d816ca45 Mon Sep 17 00:00:00 2001 From: misaochan Date: Wed, 6 Jul 2016 18:05:13 +1200 Subject: [PATCH 3/3] Add error logging --- .../main/java/fr/free/nrw/commons/category/MethodAUpdater.java | 1 + .../main/java/fr/free/nrw/commons/category/PrefixUpdater.java | 1 + 2 files changed, 2 insertions(+) diff --git a/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java b/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java index f8fb45b51..54f6771fb 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java +++ b/app/src/main/java/fr/free/nrw/commons/category/MethodAUpdater.java @@ -67,6 +67,7 @@ public class MethodAUpdater extends AsyncTask> { .get(); Log.d(TAG, "Method A URL filter" + result.toString()); } catch (IOException e) { + Log.e(TAG, "IO Exception: ", e); //Return empty arraylist return categories; } diff --git a/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java b/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java index 4e7db8833..71d739e63 100644 --- a/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java +++ b/app/src/main/java/fr/free/nrw/commons/category/PrefixUpdater.java @@ -65,6 +65,7 @@ public class PrefixUpdater extends AsyncTask> { .get(); Log.d(TAG, "Prefix URL filter" + result.toString()); } catch (IOException e) { + Log.e(TAG, "IO Exception: ", e); //Return empty arraylist return categories; }