From 09c932c02c20ce3bed94dd220603dc7de2ce6894 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Tue, 25 Aug 2020 16:18:15 +0300 Subject: [PATCH] Account Settings: add a flag to check if legacy (and use in account page). --- .../main/java/com/etesync/syncadapter/AccountSettings.kt | 3 +++ .../java/com/etesync/syncadapter/ui/AccountActivity.kt | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/etesync/syncadapter/AccountSettings.kt b/app/src/main/java/com/etesync/syncadapter/AccountSettings.kt index 4967508e..99b18e2b 100644 --- a/app/src/main/java/com/etesync/syncadapter/AccountSettings.kt +++ b/app/src/main/java/com/etesync/syncadapter/AccountSettings.kt @@ -77,6 +77,9 @@ constructor(internal val context: Context, internal val account: Account) { get() = accountManager.getUserData(account, KEY_ETEBASE_SESSION) set(value) = accountManager.setUserData(account, KEY_ETEBASE_SESSION, value) + val isLegacy: Boolean + get() = authToken != null + // CalDAV settings var manageCalendarColors: Boolean diff --git a/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt b/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt index 1cbf7b14..08eae1f5 100644 --- a/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt +++ b/app/src/main/java/com/etesync/syncadapter/ui/AccountActivity.kt @@ -87,6 +87,7 @@ class AccountActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, PopupMe account = intent.getParcelableExtra(EXTRA_ACCOUNT) title = account.name + val settings = AccountSettings(this, account) setContentView(R.layout.activity_account) @@ -131,8 +132,10 @@ class AccountActivity : BaseActivity(), Toolbar.OnMenuItemClickListener, PopupMe HintManager.setHintSeen(this, HINT_VIEW_COLLECTION, true) } - if (!SetupUserInfoFragment.hasUserInfo(this, account)) { - SetupUserInfoFragment.newInstance(account).show(supportFragmentManager, null) + if (settings.isLegacy) { + if (!SetupUserInfoFragment.hasUserInfo(this, account)) { + SetupUserInfoFragment.newInstance(account).show(supportFragmentManager, null) + } } }