Brion VIBBER has submitted this change and it was merged.

Change subject: Fixes for missing entries
......................................................................


Fixes for missing entries

Change-Id: I69243428b1803044553dfba7c19cb146a9e9675a
---
M wikipedia/src/main/java/org/wikimedia/wikipedia/PageImagesTask.java
M wikipedia/src/main/java/org/wikimedia/wikipedia/PageQueryTask.java
2 files changed, 7 insertions(+), 2 deletions(-)

Approvals:
  Brion VIBBER: Verified; Looks good to me, approved



diff --git 
a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageImagesTask.java 
b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageImagesTask.java
index d4e6caa..6243345 100644
--- a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageImagesTask.java
+++ b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageImagesTask.java
@@ -1,6 +1,7 @@
 package org.wikimedia.wikipedia;
 
 import android.content.Context;
+import android.util.Log;
 import org.json.JSONObject;
 import org.mediawiki.api.json.RequestBuilder;
 
@@ -26,6 +27,7 @@
 
     @Override
     public String processPage(int pageId, PageTitle pageTitle, JSONObject 
pageData) throws Throwable {
+        Log.d("Wikipedia", "thumb info: " + pageData.toString());
         JSONObject thumbnail = pageData.optJSONObject("thumbnail");
         if (thumbnail == null) {
             return null;
diff --git a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageQueryTask.java 
b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageQueryTask.java
index c0f35e6..8e6d981 100644
--- a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageQueryTask.java
+++ b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageQueryTask.java
@@ -31,13 +31,14 @@
         StringBuilder str = new StringBuilder();
         boolean first = true;
         for (PageTitle title : titles) {
-            str.append(title.getPrefixedText());
             if (first) {
                 first = false;
             } else {
                 str.append('|');
             }
+            str.append(title.getPrefixedText());
         }
+        Log.d("Wikipedia", "thumb list: " + str.toString());
         return str.toString();
     }
 
@@ -47,10 +48,12 @@
         JSONObject data = result.asObject();
         JSONObject query = data.getJSONObject("query");
         JSONObject pages = query.getJSONObject("pages");
+        Log.d("Wikipedia", "thumbs pages are: " + pages.toString());
 
         // You would think you could use foreach on an Iterator, but you can't.
         Iterator<String> keys = pages.keys();
-        for (String key = keys.next(); keys.hasNext(); key = keys.next()) {
+        while (keys.hasNext()) {
+            String key = keys.next();
             int pageId = Integer.parseInt(key);
             JSONObject pageData = pages.getJSONObject(key);
             PageTitle pageTitle = processPageTitle(pageData);

-- 
To view, visit https://gerrit.wikimedia.org/r/96587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I69243428b1803044553dfba7c19cb146a9e9675a
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to