diff --git a/app/src/main/java/com/huanchengfly/tieba/post/activities/LoginActivity.kt b/app/src/main/java/com/huanchengfly/tieba/post/activities/LoginActivity.kt index 7e2c498f..6baba505 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/activities/LoginActivity.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/activities/LoginActivity.kt @@ -101,7 +101,7 @@ class LoginActivity : BaseActivity(), WebViewListener { AccountUtil.newAccount(account.uid, account) { isLoadingAccount = false if (it) { - AccountUtil.switchUser(this@LoginActivity, account.id) + AccountUtil.switchAccount(this@LoginActivity, account.id) snackBar.setText("登录成功,即将跳转") handler.postDelayed({ snackBar.dismiss() diff --git a/app/src/main/java/com/huanchengfly/tieba/post/fragments/PreferencesFragment.kt b/app/src/main/java/com/huanchengfly/tieba/post/fragments/PreferencesFragment.kt index 44028237..cf1db485 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/fragments/PreferencesFragment.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/fragments/PreferencesFragment.kt @@ -84,7 +84,7 @@ class PreferencesFragment : PreferencesFragment() { val accountsPreference = findPreference("switch_account") accountsPreference!!.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _: Preference?, newValue: Any? -> - if (AccountUtil.switchUser( + if (AccountUtil.switchAccount( attachContext, Integer.valueOf((newValue as String?)!!) ) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/settings/account/AccountManagePage.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/settings/account/AccountManagePage.kt index 1ad4487b..c24f7ffd 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/page/settings/account/AccountManagePage.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/page/settings/account/AccountManagePage.kt @@ -94,10 +94,12 @@ fun AccountManagePage( ) } }, - onValueChange = { AccountUtil.switchUser(context, it.toInt()) }, + onValueChange = { AccountUtil.switchAccount(context, it.toInt()) }, enabled = true, defaultValue = account.id.toString(), - entries = AllAccounts.current.associate { it.id.toString() to (it.nameShow ?: it.name) } + entries = AllAccounts.current.associate { + it.id.toString() to (it.nameShow ?: it.name) + } ) } else { TextPref( diff --git a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Toolbar.kt b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Toolbar.kt index cbf2d6cc..9942c15e 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Toolbar.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/ui/widgets/compose/Toolbar.kt @@ -82,7 +82,7 @@ fun AccountNavIcon( menuContent = { val allAccounts = AccountUtil.allAccounts allAccounts.forEach { - DropdownMenuItem(onClick = { AccountUtil.switchUser(context, it.id) }) { + DropdownMenuItem(onClick = { AccountUtil.switchAccount(context, it.id) }) { Box( modifier = Modifier .clip(CircleShape) diff --git a/app/src/main/java/com/huanchengfly/tieba/post/utils/AccountUtil.kt b/app/src/main/java/com/huanchengfly/tieba/post/utils/AccountUtil.kt index c77f9127..61a2a370 100644 --- a/app/src/main/java/com/huanchengfly/tieba/post/utils/AccountUtil.kt +++ b/app/src/main/java/com/huanchengfly/tieba/post/utils/AccountUtil.kt @@ -92,7 +92,7 @@ object AccountUtil { } @JvmStatic - fun switchUser(context: Context, id: Int): Boolean { + fun switchAccount(context: Context, id: Int): Boolean { context.sendBroadcast(Intent().setAction(ACTION_SWITCH_ACCOUNT)) val account = runCatching { getAccountInfo(id) }.getOrNull() ?: return false mutableCurrentAccountState.value = account @@ -188,7 +188,7 @@ object AccountUtil { if (accounts.size > 1) { accounts = allAccounts account = accounts[0] - switchUser(context, account.id) + switchAccount(context, account.id) Toast.makeText(context, "退出登录成功,已切换至账号 " + account.nameShow, Toast.LENGTH_SHORT).show() return }