chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases Activity

Make sure the active account is always correctly saved to database (#3720)

Browse source 
Fixes #3702
This commit is contained in:
Konrad Pozniak 2023-06-11 20:24:26 +02:00 committed by GitHub
parent 3698c72109
commit 6e06e656b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/com/keylesspalace/tusky/BaseActivity.java
View file

@ -212,15 +212,8 @@ public abstract class BaseActivity extends AppCompatActivity implements Injectab
} }
} }
// TODO: This changes the accountManager's activeAccount property, but does not do any
// of the work that AccountManager.setActiveAccount() does. In particular:
//
// - The current active account is not saved
// - The account passed as parameter here goes not have its `isActive` property set
//
// Is that deliberate? Or is this a bug?
public void openAsAccount(@NonNull String url, @NonNull AccountEntity account) { public void openAsAccount(@NonNull String url, @NonNull AccountEntity account) {
accountManager.setActiveAccount(account); accountManager.setActiveAccount(account.getId());
Intent intent = new Intent(this, MainActivity.class); Intent intent = new Intent(this, MainActivity.class);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
intent.putExtra(MainActivity.REDIRECT_URL, url); intent.putExtra(MainActivity.REDIRECT_URL, url);

5
app/src/main/java/com/keylesspalace/tusky/components/search/SearchViewModel.kt
View file

@ -46,11 +46,8 @@ class SearchViewModel @Inject constructor(
var currentQuery: String = "" var currentQuery: String = ""
var activeAccount: AccountEntity? val activeAccount: AccountEntity?
get() = accountManager.activeAccount get() = accountManager.activeAccount
set(value) {
accountManager.activeAccount = value
}
val mediaPreviewEnabled = activeAccount?.mediaPreviewEnabled ?: false val mediaPreviewEnabled = activeAccount?.mediaPreviewEnabled ?: false
val alwaysShowSensitiveMedia = activeAccount?.alwaysShowSensitiveMedia ?: false val alwaysShowSensitiveMedia = activeAccount?.alwaysShowSensitiveMedia ?: false

2
app/src/main/java/com/keylesspalace/tusky/db/AccountManager.kt
View file

@ -37,9 +37,11 @@ class AccountManager @Inject constructor(db: AppDatabase) {
@Volatile @Volatile
var activeAccount: AccountEntity? = null var activeAccount: AccountEntity? = null
private set
var accounts: MutableList<AccountEntity> = mutableListOf() var accounts: MutableList<AccountEntity> = mutableListOf()
private set private set
private val accountDao: AccountDao = db.accountDao() private val accountDao: AccountDao = db.accountDao()
init { init {