Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/96699
Change subject: Do not reinvent TextUtils
......................................................................
Do not reinvent TextUtils
Change-Id: I86aff88714c49bafc5e5191b33a965d2a3cc2fa7
---
M wikipedia/src/main/java/org/wikimedia/wikipedia/PageQueryTask.java
M wikipedia/src/main/java/org/wikimedia/wikipedia/PageTitle.java
2 files changed, 7 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/99/96699/1
diff --git a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageQueryTask.java
b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageQueryTask.java
index 8e6d981..5129a59 100644
--- a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageQueryTask.java
+++ b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageQueryTask.java
@@ -1,6 +1,7 @@
package org.wikimedia.wikipedia;
import android.content.Context;
+import android.text.TextUtils;
import android.util.Log;
import org.json.JSONObject;
import org.mediawiki.api.json.Api;
@@ -22,24 +23,9 @@
@Override
public ApiResult buildRequest(Api api) {
- RequestBuilder builder = api.action("query").param("titles",
joinTitles());
+ RequestBuilder builder = api.action("query").param("titles",
TextUtils.join("|", titles));
buildQueryParams(builder);
return builder.get();
- }
-
- public String joinTitles() {
- StringBuilder str = new StringBuilder();
- boolean first = true;
- for (PageTitle title : titles) {
- if (first) {
- first = false;
- } else {
- str.append('|');
- }
- str.append(title.getPrefixedText());
- }
- Log.d("Wikipedia", "thumb list: " + str.toString());
- return str.toString();
}
@Override
diff --git a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageTitle.java
b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageTitle.java
index a78e5e7..e223f84 100644
--- a/wikipedia/src/main/java/org/wikimedia/wikipedia/PageTitle.java
+++ b/wikipedia/src/main/java/org/wikimedia/wikipedia/PageTitle.java
@@ -75,4 +75,9 @@
// Not using namespace directly since that can be null
return other.getPrefixedText().equals(getPrefixedText()) &&
other.getSite().equals(getSite());
}
+
+ @Override
+ public String toString() {
+ return getPrefixedText();
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/96699
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I86aff88714c49bafc5e5191b33a965d2a3cc2fa7
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
