From 83dc45be35e8c2ba2b068cc4a6ea97f894b07fd7 Mon Sep 17 00:00:00 2001 From: Conny Duck Date: Sat, 16 Feb 2019 14:49:17 +0100 Subject: [PATCH] fix ConcurrentModificationException when sorting accounts --- .../main/java/com/keylesspalace/tusky/db/AccountManager.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/keylesspalace/tusky/db/AccountManager.kt b/app/src/main/java/com/keylesspalace/tusky/db/AccountManager.kt index 518542878..b02d8c75a 100644 --- a/app/src/main/java/com/keylesspalace/tusky/db/AccountManager.kt +++ b/app/src/main/java/com/keylesspalace/tusky/db/AccountManager.kt @@ -160,7 +160,8 @@ class AccountManager(db: AppDatabase) { * @return an immutable list of all accounts in the database with the active account first */ fun getAllAccountsOrderedByActive(): List { - accounts.sortWith(Comparator { l, r -> + val accountsCopy = accounts.toMutableList() + accountsCopy.sortWith(Comparator { l, r -> when { l.isActive && !r.isActive -> -1 r.isActive && !l.isActive -> 1 @@ -168,7 +169,7 @@ class AccountManager(db: AppDatabase) { } }) - return accounts.toList() + return accountsCopy } /**