Mholloway has uploaded a new change for review.
https://gerrit.wikimedia.org/r/265768
Change subject: WIP: Update RbDefinition to reflect Wiktionary endpoint
response changes
......................................................................
WIP: Update RbDefinition to reflect Wiktionary endpoint response changes
Change-Id: Ib75d28585e1b520840eaf44d6e2a7e89b8b2d189
---
M app/src/main/java/org/wikipedia/server/restbase/RbDefinition.java
M app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
2 files changed, 11 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/68/265768/1
diff --git a/app/src/main/java/org/wikipedia/server/restbase/RbDefinition.java
b/app/src/main/java/org/wikipedia/server/restbase/RbDefinition.java
index 9e6d456..d7922c0 100644
--- a/app/src/main/java/org/wikipedia/server/restbase/RbDefinition.java
+++ b/app/src/main/java/org/wikipedia/server/restbase/RbDefinition.java
@@ -7,16 +7,23 @@
import org.wikipedia.util.log.L;
+import java.util.Map;
+
import retrofit.RetrofitError;
import retrofit.client.Response;
public class RbDefinition {
+
+ @Expose @NonNull private Map<String, Usage[]> usagesByLang;
+
@Expose @Nullable private RbServiceError error;
- @Expose @NonNull private Usage[] usages;
+ public Map<String, Usage[]> getUsagesByLang() {
+ return usagesByLang;
+ }
- @NonNull public Usage[] getUsages() {
- return usages;
+ public Usage[] getUsagesForLang(String langCode) {
+ return usagesByLang.get(langCode);
}
public boolean hasError() {
diff --git a/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
b/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
index 657a635..92ddab1 100644
--- a/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
+++ b/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java
@@ -152,7 +152,7 @@
LayoutInflater inflater = LayoutInflater.from(getContext());
LinearLayout fullDefinitionsList = (LinearLayout)
rootView.findViewById(R.id.wiktionary_definitions_by_part_of_speech);
- RbDefinition.Usage[] usageList = currentDefinition.getUsages();
+ RbDefinition.Usage[] usageList =
currentDefinition.getUsagesForLang("en");
if (usageList.length == 0) {
displayNoDefinitionsFound();
}
--
To view, visit https://gerrit.wikimedia.org/r/265768
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib75d28585e1b520840eaf44d6e2a7e89b8b2d189
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
