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

Merge pull request #5979 from k9mail/GH-5978_fix_folder_not_found_crash

Browse source 
Avoid crash when trying to open non-existent folder
This commit is contained in:
cketti 2022-03-24 17:19:16 +01:00 committed by GitHub
commit d53dc73e07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt
View file

@ -1639,6 +1639,11 @@ open class MessageList :
permissionUiHelper.requestPermission(permission)
}
override fun onFolderNotFoundError() {
val defaultFolderId = defaultFolderProvider.getDefaultFolder(account!!)
openFolderImmediately(defaultFolderId)
}
private enum class DisplayMode {
MESSAGE_LIST, MESSAGE_VIEW, SPLIT_VIEW
}

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

@ -147,7 +147,7 @@ class MessageListFragment :
super.onCreate(savedInstanceState)
restoreInstanceState(savedInstanceState)
decodeArguments()
decodeArguments() ?: return
viewModel.getMessageListLiveData().observe(this) { messageListInfo: MessageListInfo ->
setMessageList(messageListInfo)
@ -177,7 +177,7 @@ class MessageListFragment :
listView.onRestoreInstanceState(savedListState)
}
private fun decodeArguments() {
private fun decodeArguments(): MessageListFragment? {
val arguments = requireArguments()
showingThreadedList = arguments.getBoolean(ARG_THREADED_LIST, false)
isThreadDisplay = arguments.getBoolean(ARG_IS_THREAD_DISPLAY, false)
@ -198,10 +198,17 @@ class MessageListFragment :
isSingleFolderMode = false
if (isSingleAccountMode && localSearch.folderIds.size == 1) {
isSingleFolderMode = true
val folderId = localSearch.folderIds[0]
currentFolder = getFolderInfoHolder(folderId, account!!)
try {
val folderId = localSearch.folderIds[0]
currentFolder = getFolderInfoHolder(folderId, account!!)
isSingleFolderMode = true
} catch (e: MessagingException) {
fragmentListener.onFolderNotFoundError()
return null
}
}
return this
}
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
@ -458,12 +465,8 @@ class MessageListFragment :
)
private fun getFolderInfoHolder(folderId: Long, account: Account): FolderInfoHolder {
return try {
val localFolder = MlfUtils.getOpenFolder(folderId, account)
FolderInfoHolder(folderNameFormatter, localFolder, account)
} catch (e: MessagingException) {
throw RuntimeException(e)
}
val localFolder = MlfUtils.getOpenFolder(folderId, account)
return FolderInfoHolder(folderNameFormatter, localFolder, account)
}
override fun onResume() {
@ -1926,6 +1929,7 @@ class MessageListFragment :
fun remoteSearchStarted()
fun goBack()
fun updateMenu()
fun onFolderNotFoundError()
companion object {
const val MAX_PROGRESS = 10000