arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-06-27 18:32:37 +00:00
Code Issues Releases Wiki Activity

Account Settings: add a flag to check if legacy (and use in account page).

Browse Source
This commit is contained in:
Tom Hacohen 2020-08-25 16:18:15 +03:00
parent 90cc39deeb
commit 09c932c02c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/etesync/syncadapter/AccountSettings.kt
View File

@ -77,6 +77,9 @@ constructor(internal val context: Context, internal val account: Account) {
get() = accountManager.getUserData(account, KEY_ETEBASE_SESSION) get() = accountManager.getUserData(account, KEY_ETEBASE_SESSION)
set(value) = accountManager.setUserData(account, KEY_ETEBASE_SESSION, value) set(value) = accountManager.setUserData(account, KEY_ETEBASE_SESSION, value)
val isLegacy: Boolean
get() = authToken != null
// CalDAV settings // CalDAV settings
var manageCalendarColors: Boolean var manageCalendarColors: Boolean

3
app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt
View File

@ -87,6 +87,7 @@ class AccountActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, PopupMe
account = intent.getParcelableExtra(EXTRA_ACCOUNT) account = intent.getParcelableExtra(EXTRA_ACCOUNT)
title = account.name title = account.name
val settings = AccountSettings(this, account)
setContentView(R.layout.activity_account) setContentView(R.layout.activity_account)
@ -131,10 +132,12 @@ class AccountActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, PopupMe
HintManager.setHintSeen(this, HINT_VIEW_COLLECTION, true) HintManager.setHintSeen(this, HINT_VIEW_COLLECTION, true)
} }
if (settings.isLegacy) {
if (!SetupUserInfoFragment.hasUserInfo(this, account)) { if (!SetupUserInfoFragment.hasUserInfo(this, account)) {
SetupUserInfoFragment.newInstance(account).show(supportFragmentManager, null) SetupUserInfoFragment.newInstance(account).show(supportFragmentManager, null)
} }
} }
}
override fun onCreateOptionsMenu(menu: Menu): Boolean { override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.activity_account, menu) menuInflater.inflate(R.menu.activity_account, menu)