Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

cleanup accountManager.activeAccount usages in MainActivity (#2021)

This commit is contained in:
Konrad Pozniak 2020-12-13 16:32:04 +01:00 committed by GitHub
parent 7888408941
commit a19411c947
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/keylesspalace/tusky/MainActivity.kt
View File

@ -139,11 +139,8 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
} }
} }
val accountRequested = accountId != -1L val accountRequested = accountId != -1L
if (accountRequested) { if (accountRequested && accountId != activeAccount.id) {
val account = accountManager.activeAccount accountManager.setActiveAccount(accountId)
if (account == null || accountId != account.id) {
accountManager.setActiveAccount(accountId)
}
} }
if (canHandleMimeType(intent.type)) { if (canHandleMimeType(intent.type)) {
// Sharing to Tusky from an external app // Sharing to Tusky from an external app
@ -155,8 +152,7 @@ class MainActivity : BottomSheetActivity(), ActionButtonActivity, HasAndroidInje
showAccountChooserDialog(getString(R.string.action_share_as), true, object : AccountSelectionListener { showAccountChooserDialog(getString(R.string.action_share_as), true, object : AccountSelectionListener {
override fun onAccountSelected(account: AccountEntity) { override fun onAccountSelected(account: AccountEntity) {
val requestedId = account.id val requestedId = account.id
val activeAccount = accountManager.activeAccount if (requestedId == activeAccount.id) {
if (activeAccount != null && requestedId == activeAccount.id) {
// The correct account is already active // The correct account is already active
forwardShare(intent) forwardShare(intent)
} else { } else {