wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Save and restore activeMessages in savedInstanceState to avoid NullPointerException when rotating

Browse source
This commit is contained in:
r.zarchi 2022-04-10 11:48:41 +04:30
parent d9153f4c20
commit 85a19ccb2b
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListFragment.kt
View file

@ -159,6 +159,7 @@ class MessageListFragment :
private fun restoreInstanceState(savedInstanceState: Bundle?) {
if (savedInstanceState == null) return
activeMessages = savedInstanceState.getStringArray(STATE_ACTIVE_MESSAGES)?.map { MessageReference.parse(it)!! }
restoreSelectedMessages(savedInstanceState)
isRemoteSearch = savedInstanceState.getBoolean(STATE_REMOTE_SEARCH_PERFORMED)
savedListState = savedInstanceState.getParcelable(STATE_MESSAGE_LIST)
@ -438,6 +439,10 @@ class MessageListFragment :
saveListState(outState)
outState.putLongArray(STATE_SELECTED_MESSAGES, selected.toLongArray())
outState.putBoolean(STATE_REMOTE_SEARCH_PERFORMED, isRemoteSearch)
outState.putStringArray(
STATE_ACTIVE_MESSAGES,
activeMessages?.map(MessageReference::toIdentityString)?.toTypedArray()
)
if (activeMessage != null) {
outState.putString(STATE_ACTIVE_MESSAGE, activeMessage!!.toIdentityString())
}
@ -1945,6 +1950,7 @@ class MessageListFragment :
private const val ARG_IS_THREAD_DISPLAY = "isThreadedDisplay"
private const val STATE_SELECTED_MESSAGES = "selectedMessages"
private const val STATE_ACTIVE_MESSAGES = "activeMessages"
private const val STATE_ACTIVE_MESSAGE = "activeMessage"
private const val STATE_REMOTE_SEARCH_PERFORMED = "remoteSearchPerformed"
private const val STATE_MESSAGE_LIST = "listState"