jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/405345 )
Change subject: Actually fix UI quirk that leads to Default list being
deletable.
......................................................................
Actually fix UI quirk that leads to Default list being deletable.
Some way or another, the anonymous class that was handling the PopupMenu
listener for Reading List actions was holding on to an incorrect reference
of the ReadingList object. This patch explicitly passes the current
instance of the ReadingList object into the anonymous class, so that the
reference it holds is never ambiguous.
Bug: T185330
Change-Id: I35f420de812f19c1713688178de66deea53b33f4
---
M app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java
1 file changed, 17 insertions(+), 11 deletions(-)
Approvals:
jenkins-bot: Verified
Cooltey: Looks good to me, approved
diff --git
a/app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java
b/app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java
index 0103494..acdf7c7 100644
--- a/app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java
+++ b/app/src/main/java/org/wikipedia/readinglist/ReadingListItemView.java
@@ -135,7 +135,7 @@
menu.getMenu().findItem(R.id.menu_reading_list_edit_description).setVisible(false);
menu.getMenu().findItem(R.id.menu_reading_list_delete).setVisible(false);
}
- menu.setOnMenuItemClickListener(new OverflowMenuClickListener());
+ menu.setOnMenuItemClickListener(new
OverflowMenuClickListener(readingList));
menu.show();
}
@@ -233,35 +233,41 @@
}
private class OverflowMenuClickListener implements
PopupMenu.OnMenuItemClickListener {
+ @Nullable private ReadingList list;
+
+ OverflowMenuClickListener(@Nullable ReadingList list) {
+ this.list = list;
+ }
+
@Override public boolean onMenuItemClick(MenuItem item) {
switch (item.getItemId()) {
case R.id.menu_reading_list_rename:
- if (callback != null && readingList != null) {
- callback.onRename(readingList);
+ if (callback != null && list != null) {
+ callback.onRename(list);
return true;
}
break;
case R.id.menu_reading_list_edit_description:
- if (callback != null && readingList != null) {
- callback.onEditDescription(readingList);
+ if (callback != null && list != null) {
+ callback.onEditDescription(list);
return true;
}
break;
case R.id.menu_reading_list_delete:
- if (callback != null && readingList != null) {
- callback.onDelete(readingList);
+ if (callback != null && list != null) {
+ callback.onDelete(list);
return true;
}
break;
case R.id.menu_reading_list_save_all_offline:
- if (callback != null && readingList != null) {
- callback.onSaveAllOffline(readingList);
+ if (callback != null && list != null) {
+ callback.onSaveAllOffline(list);
return true;
}
break;
case R.id.menu_reading_list_remove_all_offline:
- if (callback != null && readingList != null) {
- callback.onRemoveAllOffline(readingList);
+ if (callback != null && list != null) {
+ callback.onRemoveAllOffline(list);
return true;
}
break;
--
To view, visit https://gerrit.wikimedia.org/r/405345
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I35f420de812f19c1713688178de66deea53b33f4
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <dbr...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Cooltey <cf...@wikimedia.org>
Gerrit-Reviewer: Sharvaniharan <sha...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
