jenkins-bot has submitted this change and it was merged. Change subject: Prevent crash in Wiktionary dialog. ......................................................................
Prevent crash in Wiktionary dialog. https://rink.hockeyapp.net/manage/apps/226650/app_versions/11/crash_reasons/110284431 Change-Id: I005f8d52517787d4155188aeef01ec3b026dddcb --- M app/src/main/java/org/wikipedia/server/restbase/RbDefinition.java M app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java 2 files changed, 5 insertions(+), 4 deletions(-) Approvals: Sniedzielski: Looks good to me, approved jenkins-bot: Verified 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 9a5d9ba..f58422f 100644 --- a/app/src/main/java/org/wikipedia/server/restbase/RbDefinition.java +++ b/app/src/main/java/org/wikipedia/server/restbase/RbDefinition.java @@ -24,7 +24,7 @@ return usagesByLang; } - public Usage[] getUsagesForLang(String langCode) { + @Nullable public Usage[] getUsagesForLang(String langCode) { return usagesByLang.get(langCode); } diff --git a/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java b/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java index 92ddab1..2eca049 100644 --- a/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java +++ b/app/src/main/java/org/wikipedia/wiktionary/WiktionaryDialog.java @@ -153,12 +153,13 @@ LinearLayout fullDefinitionsList = (LinearLayout) rootView.findViewById(R.id.wiktionary_definitions_by_part_of_speech); RbDefinition.Usage[] usageList = currentDefinition.getUsagesForLang("en"); - if (usageList.length == 0) { + if (usageList == null || usageList.length == 0) { displayNoDefinitionsFound(); + return; } - for (int i = 0; i < usageList.length; i++) { + for (RbDefinition.Usage usage : usageList) { View usageView = inflater.inflate(R.layout.item_wiktionary_definitions_list, (ViewGroup) rootView, false); - layOutUsage(usageList[i], usageView, inflater); + layOutUsage(usage, usageView, inflater); fullDefinitionsList.addView(usageView); } } -- To view, visit https://gerrit.wikimedia.org/r/268686 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I005f8d52517787d4155188aeef01ec3b026dddcb Gerrit-PatchSet: 2 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Dbrant <dbr...@wikimedia.org> Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org> Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org> Gerrit-Reviewer: Mholloway <mhollo...@wikimedia.org> Gerrit-Reviewer: Niedzielski <sniedziel...@wikimedia.org> Gerrit-Reviewer: Sniedzielski <sniedziel...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
