moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-27 11:42:16 -05:00
Code Issues Releases Wiki Activity

Fix crashes when selecting messages in the message list

Browse Source 
Throughout the code we make the assumption that onPrepareActionMode() is
called right after starting the action mode. However, this is not the case on
Android 5.1.
With this change we call ActionMode.invalidate() right after starting the
action mode which causes onPrepareActionMode() to be invoked.
This commit is contained in:
cketti 2015-03-13 21:12:21 +01:00
parent 42419fc4e5
commit 08beb212c2
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java
View File

@ -2217,7 +2217,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
} }
if (mActionMode == null) { if (mActionMode == null) {
mActionMode = getActivity().startActionMode(mActionModeCallback); startAndPrepareActionMode();
} }
computeBatchDirection(); computeBatchDirection();
updateActionModeTitle(); updateActionModeTitle();
@ -2276,7 +2276,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
return; return;
} }
} else { } else {
mActionMode = getActivity().startActionMode(mActionModeCallback); startAndPrepareActionMode();
} }
if (selected) { if (selected) {
@ -2285,9 +2285,6 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
mSelectedCount += selectedCountDelta; mSelectedCount += selectedCountDelta;
} }
// make sure the onPrepareActionMode is called
mActionMode.invalidate();
computeBatchDirection(); computeBatchDirection();
updateActionModeTitle(); updateActionModeTitle();
@ -3536,13 +3533,18 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
} }
if (mActionMode == null) { if (mActionMode == null) {
mActionMode = getActivity().startActionMode(mActionModeCallback); startAndPrepareActionMode();
} }
recalculateSelectionCount(); recalculateSelectionCount();
updateActionModeTitle(); updateActionModeTitle();
} }
private void startAndPrepareActionMode() {
mActionMode = getActivity().startActionMode(mActionModeCallback);
mActionMode.invalidate();
}
/** /**
* Recalculates the selection count. * Recalculates the selection count.
* *