improve logout (#2579)

* improve logout

* fix tests

* add db migration

* delete wrongly committed file again

* improve LogoutUsecase

app/src/main/java/com/keylesspalace/tusky/db/AccountEntity.kt

@@ -37,6 +37,8 @@ data class AccountEntity(
     @field:PrimaryKey(autoGenerate = true) var id: Long,
     val domain: String,
     var accessToken: String,
+    var clientId: String?, // nullable for backward compatibility
+    var clientSecret: String?, // nullable for backward compatibility
     var isActive: Boolean,
     var accountId: String = "",
     var username: String = "",
@@ -81,6 +83,15 @@ data class AccountEntity(
     val fullName: String
         get() = "@$username@$domain"
 
+    fun logout() {
+        // deleting credentials so they cannot be used again
+        accessToken = ""
+        clientId = null
+        clientSecret = null
+    }
+
+    fun isLoggedIn() = accessToken.isNotEmpty()
+
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
         if (javaClass != other?.javaClass) return false

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

@@ -54,7 +54,13 @@ class AccountManager @Inject constructor(db: AppDatabase) {
      * @param accessToken the access token for the new account
      * @param domain the domain of the accounts Mastodon instance
      */
-    fun addAccount(accessToken: String, domain: String, oauthScopes: String) {
+    fun addAccount(
+        accessToken: String,
+        domain: String,
+        clientId: String,
+        clientSecret: String,
+        oauthScopes: String
+    ) {
 
         activeAccount?.let {
             it.isActive = false
@@ -66,8 +72,13 @@ class AccountManager @Inject constructor(db: AppDatabase) {
         val maxAccountId = accounts.maxByOrNull { it.id }?.id ?: 0
         val newAccountId = maxAccountId + 1
         activeAccount = AccountEntity(
-            id = newAccountId, domain = domain.lowercase(Locale.ROOT),
-            accessToken = accessToken, oauthScopes = oauthScopes, isActive = true
+            id = newAccountId,
+            domain = domain.lowercase(Locale.ROOT),
+            accessToken = accessToken,
+            clientId = clientId,
+            clientSecret = clientSecret,
+            oauthScopes = oauthScopes,
+            isActive = true
         )
     }
 
@@ -89,11 +100,12 @@ class AccountManager @Inject constructor(db: AppDatabase) {
      */
     fun logActiveAccountOut(): AccountEntity? {
 
-        if (activeAccount == null) {
-            return null
-        } else {
-            accounts.remove(activeAccount!!)
-            accountDao.delete(activeAccount!!)
+        return activeAccount?.let { account ->
+
+            account.logout()
+
+            accounts.remove(account)
+            accountDao.delete(account)
 
             if (accounts.size > 0) {
                 accounts[0].isActive = true
@@ -103,7 +115,7 @@ class AccountManager @Inject constructor(db: AppDatabase) {
             } else {
                 activeAccount = null
             }
-            return activeAccount
+            activeAccount
         }
     }
 

app/src/main/java/com/keylesspalace/tusky/db/AppDatabase.java

@@ -31,7 +31,7 @@ import java.io.File;
  */
 @Database(entities = { DraftEntity.class, AccountEntity.class, InstanceEntity.class, TimelineStatusEntity.class,
                 TimelineAccountEntity.class,  ConversationEntity.class
-        }, version = 38)
+        }, version = 39)
 public abstract class AppDatabase extends RoomDatabase {
 
     public abstract AccountDao accountDao();
@@ -573,4 +573,12 @@ public abstract class AppDatabase extends RoomDatabase {
             database.execSQL("DELETE FROM `TimelineStatusEntity`");
         }
     };
+
+    public static final Migration MIGRATION_38_39 = new Migration(38, 39) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL("ALTER TABLE `AccountEntity` ADD COLUMN `clientId` TEXT");
+            database.execSQL("ALTER TABLE `AccountEntity` ADD COLUMN `clientSecret` TEXT");
+        }
+    };
 }