Dbrant has submitted this change and it was merged.
Change subject: Bring empty screen in nearby back
......................................................................
Bring empty screen in nearby back
Instead of throwing an exception just return the empty list,
so the empty layout will be shown when there is no
query object in the JSON response.
Also removed unused variable.
Change-Id: I8ea09f3b51dd543f96d5f0b128465dd11600b790
---
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyResult.java
2 files changed, 2 insertions(+), 4 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
index 742e48d..c931614 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFetchTask.java
@@ -25,7 +25,6 @@
private static final String LIMIT = "50";
/** requested thumbnail size in pixel */
private static final String THUMBNAIL_WIDTH = "144";
- private final WikipediaApp app;
private final Location location;
public NearbyFetchTask(Context context, Site site, Location location) {
@@ -33,7 +32,6 @@
SINGLE_THREAD,
((WikipediaApp)
context.getApplicationContext()).getAPIForSite(site)
);
- this.app = (WikipediaApp) context.getApplicationContext();
this.location = location;
}
diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyResult.java
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyResult.java
index b3b5483..718a39f 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyResult.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyResult.java
@@ -27,11 +27,11 @@
list = new ArrayList<NearbyPage>();
JSONObject query = jsonObject.optJSONObject("query");
if (query == null) {
- throw new JSONException("Received malformed response with no
error.");
+ return;
}
+
JSONObject pagesMap = query.optJSONObject("pages");
Iterator iterator = pagesMap.keys();
-
while (iterator.hasNext()) {
NearbyPage newPage = new
NearbyPage(pagesMap.getJSONObject((String) iterator.next()));
list.add(newPage);
--
To view, visit https://gerrit.wikimedia.org/r/174026
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8ea09f3b51dd543f96d5f0b128465dd11600b790
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
