Loading cardinal-android/app/src/main/java/earth/maps/cardinal/data/murena/MurenaAccountProvider.kt +11 −14 Original line number Diff line number Diff line Loading @@ -21,7 +21,6 @@ package earth.maps.cardinal.data.murena import android.accounts.Account import android.accounts.AccountManager import android.content.Context import android.os.Build import android.util.Log import dagger.hilt.android.qualifiers.ApplicationContext import earth.maps.cardinal.domain.murena.MurenaAccountConstants Loading @@ -36,7 +35,7 @@ class MurenaAccountProvider @Inject constructor( get() = AccountManager.get(context) fun getMurenaAccounts(): List<Account> { return queryVisibleMurenaAccounts() return findVisibleMurenaAccounts() } fun getPrimaryMurenaAccount(): Account? { Loading @@ -47,7 +46,7 @@ class MurenaAccountProvider @Inject constructor( return getPrimaryMurenaAccount() != null } private fun queryVisibleMurenaAccounts(): List<Account> { private fun findVisibleMurenaAccounts(): List<Account> { val accountType = MurenaAccountConstants.MURENA_ACCOUNT_TYPE val accountsByType = queryAccounts("getAccountsByType") { accountManager.getAccountsByType(accountType).toList() Loading @@ -56,7 +55,6 @@ class MurenaAccountProvider @Inject constructor( return accountsByType } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { val accountsForPackage = queryAccounts("getAccountsByTypeForPackage") { accountManager.getAccountsByTypeForPackage(accountType, context.packageName).toList() } Loading @@ -68,7 +66,6 @@ class MurenaAccountProvider @Inject constructor( if (visibilityAccounts.isNotEmpty()) { return visibilityAccounts } } return emptyList() } Loading Loading
cardinal-android/app/src/main/java/earth/maps/cardinal/data/murena/MurenaAccountProvider.kt +11 −14 Original line number Diff line number Diff line Loading @@ -21,7 +21,6 @@ package earth.maps.cardinal.data.murena import android.accounts.Account import android.accounts.AccountManager import android.content.Context import android.os.Build import android.util.Log import dagger.hilt.android.qualifiers.ApplicationContext import earth.maps.cardinal.domain.murena.MurenaAccountConstants Loading @@ -36,7 +35,7 @@ class MurenaAccountProvider @Inject constructor( get() = AccountManager.get(context) fun getMurenaAccounts(): List<Account> { return queryVisibleMurenaAccounts() return findVisibleMurenaAccounts() } fun getPrimaryMurenaAccount(): Account? { Loading @@ -47,7 +46,7 @@ class MurenaAccountProvider @Inject constructor( return getPrimaryMurenaAccount() != null } private fun queryVisibleMurenaAccounts(): List<Account> { private fun findVisibleMurenaAccounts(): List<Account> { val accountType = MurenaAccountConstants.MURENA_ACCOUNT_TYPE val accountsByType = queryAccounts("getAccountsByType") { accountManager.getAccountsByType(accountType).toList() Loading @@ -56,7 +55,6 @@ class MurenaAccountProvider @Inject constructor( return accountsByType } if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { val accountsForPackage = queryAccounts("getAccountsByTypeForPackage") { accountManager.getAccountsByTypeForPackage(accountType, context.packageName).toList() } Loading @@ -68,7 +66,6 @@ class MurenaAccountProvider @Inject constructor( if (visibilityAccounts.isNotEmpty()) { return visibilityAccounts } } return emptyList() } Loading