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

Merge pull request #6415 from thundernest/fix_accounts_shortcut

Browse source 
Fix "K-9 Accounts" shortcuts
This commit is contained in:
cketti 2022-10-22 18:34:45 +02:00 committed by GitHub
commit 34676f0991
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/k9mail/src/main/AndroidManifest.xml
View file

@ -59,13 +59,6 @@
<meta-data android:name="android.webkit.WebView.MetricsOptOut"
android:value="true" />
<!-- activity-alias so old launcher shortcuts work -->
<!-- TODO: Remove after 2020-12-31 -->
<activity-alias
android:name=".activity.Accounts"
android:targetActivity=".activity.MessageList"
android:exported="true" />
<activity
android:name=".ui.onboarding.OnboardingActivity"
android:label="@string/welcome_message_title" />
@ -158,13 +151,6 @@
android:label="@string/ac_transfer_title"
/>
<!-- activity-alias so old launcher shortcuts work -->
<!-- TODO: Remove after 2020-12-31 -->
<activity-alias
android:name=".activity.FolderList"
android:targetActivity=".activity.MessageList"
android:exported="true" />
<activity
android:name=".activity.MessageList"
android:launchMode="singleTop"

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

@ -426,9 +426,26 @@ open class MessageList :
if (action == ACTION_SHORTCUT) {
// Handle shortcut intents
val specialFolder = intent.getStringExtra(EXTRA_SPECIAL_FOLDER)
if (SearchAccount.UNIFIED_INBOX == specialFolder) {
if (specialFolder == SearchAccount.UNIFIED_INBOX) {
return LaunchData(search = SearchAccount.createUnifiedInboxAccount().relatedSearch)
}
val accountUuid = intent.getStringExtra(EXTRA_ACCOUNT)
if (accountUuid != null) {
val account = preferences.getAccount(accountUuid)
if (account == null) {
Timber.d("Account %s not found.", accountUuid)
return LaunchData(createDefaultLocalSearch())
}
val folderId = defaultFolderProvider.getDefaultFolder(account)
val search = LocalSearch().apply {
addAccountUuid(accountUuid)
addAllowedFolder(folderId)
}
return LaunchData(search = search)
}
} else if (action == Intent.ACTION_SEARCH && queryString != null) {
// Query was received from Search Dialog
val query = queryString.trim()
@ -485,24 +502,6 @@ open class MessageList :
}
return LaunchData(search = search, account = account, noThreading = noThreading)
} else if (intent.hasExtra("account")) {
val accountUuid = intent.getStringExtra("account")
if (accountUuid != null) {
// We've most likely been started by an old unread widget or accounts shortcut
val account = preferences.getAccount(accountUuid)
if (account == null) {
Timber.d("Account %s not found.", accountUuid)
return LaunchData(createDefaultLocalSearch())
}
val folderId = defaultFolderProvider.getDefaultFolder(account)
val search = LocalSearch().apply {
addAccountUuid(accountUuid)
addAllowedFolder(folderId)
}
return LaunchData(search = search)
}
}
// Default action
@ -1493,14 +1492,14 @@ open class MessageList :
@JvmStatic
fun shortcutIntentForAccount(context: Context?, account: Account): Intent {
val folderId = defaultFolderProvider.getDefaultFolder(account)
return Intent(context, MessageList::class.java).apply {
action = ACTION_SHORTCUT
putExtra(EXTRA_ACCOUNT, account.uuid)
val search = LocalSearch().apply {
addAccountUuid(account.uuid)
addAllowedFolder(folderId)
addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP)
addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
}
return intentDisplaySearch(context, search, noThreading = false, newTask = true, clearTop = true)
}
fun actionDisplayMessageIntent(