Niedzielski has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/345859 )
Change subject: Fix: add workaround for numeric userjs options
......................................................................
Fix: add workaround for numeric userjs options
The userjs options API appears to now return both strings and numbers.
Update the client to handle numbers.
Bug: T161866
Change-Id: Icdbfad3a6ecc6d93b9bf8df7ffb1a0d8a2970a0b
---
M app/src/main/java/org/wikipedia/useroption/dataclient/UserInfo.java
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/59/345859/1
diff --git
a/app/src/main/java/org/wikipedia/useroption/dataclient/UserInfo.java
b/app/src/main/java/org/wikipedia/useroption/dataclient/UserInfo.java
index 8fd8b45..ded44de 100644
--- a/app/src/main/java/org/wikipedia/useroption/dataclient/UserInfo.java
+++ b/app/src/main/java/org/wikipedia/useroption/dataclient/UserInfo.java
@@ -27,7 +27,9 @@
if (options != null) {
for (Map.Entry<String, ?> entry : options.entrySet()) {
if (entry.getKey().startsWith("userjs-")) {
- ret.add(new UserOption(entry.getKey(), (String)
entry.getValue()));
+ // T161866 entry.valueOf() should always return a String
but doesn't
+ ret.add(new UserOption(entry.getKey(),
+ entry.getValue() == null ? null :
String.valueOf(entry.getValue())));
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/345859
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icdbfad3a6ecc6d93b9bf8df7ffb1a0d8a2970a0b
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <sniedziel...@wikimedia.org>
Gerrit-Reviewer: Sniedzielski <sniedziel...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
