Mastodon/Twidere-App-Android-Twitter-Mastodon
1
0
Fork 0
mirror of https://github.com/TwidereProject/Twidere-Android synced 2025-01-05 13:09:48 +01:00
Code Issues Releases Wiki Activity

fixed account selector

Browse Source
This commit is contained in:
Mariotaku Lee 2016-12-05 10:10:21 +08:00
parent 9f4548c2e9
commit 97e85836ba
2 changed files with 75 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

137
twidere/src/main/kotlin/org/mariotaku/twidere/activity/AccountSelectorActivity.kt
View File

@ -36,8 +36,8 @@ import org.mariotaku.twidere.TwidereConstants.*
import org.mariotaku.twidere.adapter.AccountDetailsAdapter
import org.mariotaku.twidere.annotation.AccountType
import org.mariotaku.twidere.app.TwidereApplication
import org.mariotaku.twidere.extension.model.is_oauth
import org.mariotaku.twidere.model.UserKey
import org.mariotaku.twidere.model.account.cred.Credentials
import org.mariotaku.twidere.model.util.AccountUtils
class AccountSelectorActivity : BaseActivity(), OnClickListener, OnItemClickListener {
@ -46,6 +46,75 @@ class AccountSelectorActivity : BaseActivity(), OnClickListener, OnItemClickList
private var firstCreated: Boolean = false
private val keysWhiteList: Array<UserKey>?
get() {
return intent.getParcelableArrayExtra(EXTRA_ACCOUNT_KEYS)?.toTypedArray(UserKey.CREATOR)
}
private val isOAuthOnly: Boolean
get() {
return intent.getBooleanExtra(EXTRA_OAUTH_ONLY, false)
}
private val accountHost: String?
get() {
return intent.getStringExtra(EXTRA_ACCOUNT_HOST)
}
private val isSelectNoneAllowed: Boolean
get() {
return intent.getBooleanExtra(EXTRA_ALLOW_SELECT_NONE, false)
}
private val isSingleSelection: Boolean
get() {
return intent.getBooleanExtra(EXTRA_SINGLE_SELECTION, false)
}
private val startIntent: Intent?
get() {
val startIntent = intent.getParcelableExtra<Intent>(EXTRA_START_INTENT)
startIntent?.setExtrasClassLoader(TwidereApplication::class.java.classLoader)
return startIntent
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
firstCreated = savedInstanceState == null
setContentView(R.layout.activity_account_selector)
adapter = AccountDetailsAdapter(this).apply {
setSwitchEnabled(!isSingleSelection)
setSortEnabled(false)
isProfileImageDisplayed = preferences.getBoolean(KEY_DISPLAY_PROFILE_IMAGE, true)
val am = AccountManager.get(context)
val allAccountDetails = AccountUtils.getAllAccountDetails(am, AccountUtils.getAccounts(am))
val extraKeys = keysWhiteList
val oAuthOnly = isOAuthOnly
val accountHost = accountHost
addAll(allAccountDetails.filter {
if (extraKeys != null) {
return@filter extraKeys.contains(it.key)
}
if (oAuthOnly && !it.is_oauth) {
return@filter false
}
if (USER_TYPE_TWITTER_COM == accountHost) {
if (it.key.host != null && it.type != AccountType.TWITTER) return@filter false
} else if (accountHost != null) {
if (accountHost != it.key.host) return@filter false
}
return@filter true
})
}
accountsList.choiceMode = if (isSingleSelection) ListView.CHOICE_MODE_NONE else ListView.CHOICE_MODE_MULTIPLE
if (isSingleSelection) {
accountsList.onItemClickListener = this
}
selectAccountButtons.visibility = if (isSingleSelection) View.GONE else View.VISIBLE
accountsList.adapter = adapter
}
override fun onClick(view: View) {
when (view.id) {
R.id.save -> {
@ -83,70 +152,4 @@ class AccountSelectorActivity : BaseActivity(), OnClickListener, OnItemClickList
finish()
}
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
firstCreated = savedInstanceState == null
setContentView(R.layout.activity_account_selector)
adapter = AccountDetailsAdapter(this).apply {
setSwitchEnabled(isSingleSelection)
setSortEnabled(false)
isProfileImageDisplayed = preferences.getBoolean(KEY_DISPLAY_PROFILE_IMAGE, true)
val am = AccountManager.get(context)
val allAccountDetails = AccountUtils.getAllAccountDetails(am, AccountUtils.getAccounts(am))
addAll(allAccountDetails.filter {
if (isOAuthOnly && it.credentials_type != Credentials.Type.OAUTH && it.credentials_type != Credentials.Type.XAUTH) {
return@filter false
}
if (USER_TYPE_TWITTER_COM == accountHost) {
if (it.key.host == null || it.type == AccountType.TWITTER) return@filter false
} else if (accountHost != null) {
if (accountHost != it.key.host) return@filter false
}
return@filter true
})
}
accountsList.choiceMode = if (isSingleSelection) ListView.CHOICE_MODE_NONE else ListView.CHOICE_MODE_MULTIPLE
if (isSingleSelection) {
accountsList.onItemClickListener = this
}
selectAccountButtons.visibility = if (isSingleSelection) View.GONE else View.VISIBLE
accountsList.adapter = adapter
}
private val intentExtraIds: Array<UserKey>?
get() {
return intent.getParcelableArrayExtra(EXTRA_ACCOUNT_KEYS)?.toTypedArray(UserKey.CREATOR)
}
private val isOAuthOnly: Boolean
get() {
return intent.getBooleanExtra(EXTRA_OAUTH_ONLY, false)
}
private val accountHost: String?
get() {
return intent.getStringExtra(EXTRA_ACCOUNT_HOST)
}
private val isSelectNoneAllowed: Boolean
get() {
return intent.getBooleanExtra(EXTRA_ALLOW_SELECT_NONE, false)
}
private val isSingleSelection: Boolean
get() {
return intent.getBooleanExtra(EXTRA_SINGLE_SELECTION, false)
}
private fun shouldSelectOnlyItem(): Boolean {
return intent.getBooleanExtra(EXTRA_SELECT_ONLY_ITEM, false)
}
private val startIntent: Intent?
get() {
val startIntent = intent.getParcelableExtra<Intent>(EXTRA_START_INTENT)
startIntent?.setExtrasClassLoader(TwidereApplication::class.java.classLoader)
return startIntent
}
}

6
twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountDetailsExtensions.kt
View File

@ -3,6 +3,7 @@ package org.mariotaku.twidere.extension.model
import android.content.Context
import org.mariotaku.twidere.model.AccountDetails
import org.mariotaku.twidere.model.account.TwitterAccountExtras
import org.mariotaku.twidere.model.account.cred.Credentials
import org.mariotaku.twidere.model.account.cred.OAuthCredentials
import org.mariotaku.twidere.util.TwitterContentUtils
@ -17,4 +18,7 @@ fun AccountDetails.isOfficial(context: Context): Boolean {
credentials.consumer_key, credentials.consumer_secret);
}
return false
}
}
val AccountDetails.is_oauth: Boolean
get() = credentials_type == Credentials.Type.OAUTH || credentials_type == Credentials.Type.XAUTH