Implement account settings and password change.

app/src/main/java/com/etesync/syncadapter/EtebaseLocalCache.kt

@@ -153,6 +153,7 @@ class EtebaseLocalCache private constructor(context: Context, username: String)
             }
         }
 
+        // FIXME: If we ever cache this we need to cache bust on changePassword
         fun getEtebase(context: Context, httpClient: OkHttpClient, settings: AccountSettings): Account {
             val client = Client.create(httpClient, settings.uri?.toString())
             return Account.restore(client, settings.etebaseSession!!, null)

app/src/main/java/com/etesync/syncadapter/ui/AccountSettingsActivity.kt

@@ -18,11 +18,11 @@ import android.provider.CalendarContract
 import android.text.TextUtils
 import android.view.MenuItem
 import androidx.core.app.NavUtils
+import androidx.fragment.app.Fragment
 import androidx.loader.app.LoaderManager
 import androidx.loader.content.AsyncTaskLoader
 import androidx.loader.content.Loader
 import androidx.preference.*
-import at.bitfire.ical4android.TaskProvider
 import at.bitfire.ical4android.TaskProvider.Companion.OPENTASK_PROVIDERS
 import com.etesync.syncadapter.*
 import com.etesync.syncadapter.Constants.KEY_ACCOUNT
@@ -43,7 +43,8 @@ class AccountSettingsActivity : BaseActivity() {
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
 
         if (savedInstanceState == null) {
-            val frag = AccountSettingsFragment()
+            val settings = AccountSettings(this, account)
+            val frag: Fragment = if (settings.isLegacy) LegacyAccountSettingsFragment() else AccountSettingsFragment()
             frag.arguments = intent.extras
             supportFragmentManager.beginTransaction()
                     .replace(android.R.id.content, frag)
@@ -60,139 +61,226 @@ class AccountSettingsActivity : BaseActivity() {
         } else
             return false
     }
+}
 
 
-    class AccountSettingsFragment : PreferenceFragmentCompat(), LoaderManager.LoaderCallbacks<AccountSettings> {
+class AccountSettingsFragment() : PreferenceFragmentCompat(), LoaderManager.LoaderCallbacks<AccountSettings> {
-        internal lateinit var account: Account
+    internal lateinit var account: Account
 
-        override fun onCreate(savedInstanceState: Bundle?) {
+    override fun onCreate(savedInstanceState: Bundle?) {
-            super.onCreate(savedInstanceState)
+        super.onCreate(savedInstanceState)
 
-            account = arguments?.getParcelable(KEY_ACCOUNT)!!
+        account = arguments?.getParcelable(KEY_ACCOUNT)!!
-
-            loaderManager.initLoader(0, arguments, this)
-        }
-
-        override fun onCreatePreferences(bundle: Bundle, s: String) {
-            addPreferencesFromResource(R.xml.settings_account)
-        }
-
-        override fun onCreateLoader(id: Int, args: Bundle?): Loader<AccountSettings> {
-            return AccountSettingsLoader(context!!, args!!.getParcelable(KEY_ACCOUNT) as Account)
-        }
-
-        override fun onLoadFinished(loader: Loader<AccountSettings>, settings: AccountSettings?) {
-            if (settings == null) {
-                activity!!.finish()
-                return
-            }
-
-            // Category: dashboard
-            val prefManageAccount = findPreference("manage_account")
-            prefManageAccount.onPreferenceClickListener = Preference.OnPreferenceClickListener { _ ->
-                WebViewActivity.openUrl(activity!!, Constants.dashboard.buildUpon().appendQueryParameter("email", account.name).build())
-                true
-            }
-
-            // category: authentication
-            val prefPassword = findPreference("password") as EditTextPreference
-            prefPassword.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
-                val credentials = if (newValue != null) LoginCredentials(settings.uri, account.name, newValue as String) else null
-                LoginCredentialsChangeFragment.newInstance(account, credentials!!).show(fragmentManager!!, null)
-                loaderManager.restartLoader(0, arguments, this@AccountSettingsFragment)
-                false
-            }
-
-            // Category: encryption
-            val prefEncryptionPassword = findPreference("encryption_password")
-            prefEncryptionPassword.onPreferenceClickListener = Preference.OnPreferenceClickListener { _ ->
-                startActivity(ChangeEncryptionPasswordActivity.newIntent(activity!!, account))
-                true
-            }
-
-            val prefSync = findPreference("sync_interval") as ListPreference
-            val syncInterval = settings.getSyncInterval(CalendarContract.AUTHORITY) // Calendar is the baseline interval
-            if (syncInterval != null) {
-                prefSync.value = syncInterval.toString()
-                if (syncInterval == AccountSettings.SYNC_INTERVAL_MANUALLY)
-                    prefSync.setSummary(R.string.settings_sync_summary_manually)
-                else
-                    prefSync.summary = getString(R.string.settings_sync_summary_periodically, prefSync.entry)
-                prefSync.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
-                    val newInterval = java.lang.Long.parseLong(newValue as String)
-                    settings.setSyncInterval(App.addressBooksAuthority, newInterval)
-                    settings.setSyncInterval(CalendarContract.AUTHORITY, newInterval)
-                    OPENTASK_PROVIDERS.forEach {
-                        settings.setSyncInterval(it.authority, newInterval)
-                    }
-                    loaderManager.restartLoader(0, arguments, this@AccountSettingsFragment)
-                    false
-                }
-            } else {
-                prefSync.isEnabled = false
-                prefSync.setSummary(R.string.settings_sync_summary_not_available)
-            }
-
-            val prefWifiOnly = findPreference("sync_wifi_only") as SwitchPreferenceCompat
-            prefWifiOnly.isChecked = settings.syncWifiOnly
-            prefWifiOnly.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, wifiOnly ->
-                settings.setSyncWiFiOnly(wifiOnly as Boolean)
-                loaderManager.restartLoader(0, arguments, this@AccountSettingsFragment)
-                false
-            }
-
-            val prefWifiOnlySSID = findPreference("sync_wifi_only_ssid") as EditTextPreference
-            val onlySSID = settings.syncWifiOnlySSID
-            prefWifiOnlySSID.text = onlySSID
-            if (onlySSID != null)
-                prefWifiOnlySSID.summary = getString(R.string.settings_sync_wifi_only_ssid_on, onlySSID)
-            else
-                prefWifiOnlySSID.setSummary(R.string.settings_sync_wifi_only_ssid_off)
-            prefWifiOnlySSID.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
-                val ssid = newValue as String
-                settings.syncWifiOnlySSID = if (!TextUtils.isEmpty(ssid)) ssid else null
-                loaderManager.restartLoader(0, arguments, this@AccountSettingsFragment)
-                false
-            }
-        }
-
-        override fun onLoaderReset(loader: Loader<AccountSettings>) {}
 
+        loaderManager.initLoader(0, arguments, this)
     }
 
+    override fun onCreatePreferences(bundle: Bundle, s: String) {
+        addPreferencesFromResource(R.xml.settings_account)
+    }
 
-    private class AccountSettingsLoader(context: Context, internal val account: Account) : AsyncTaskLoader<AccountSettings>(context), SyncStatusObserver {
+    override fun onCreateLoader(id: Int, args: Bundle?): Loader<AccountSettings> {
-        internal lateinit var listenerHandle: Any
+        return AccountSettingsLoader(context!!, args!!.getParcelable(KEY_ACCOUNT) as Account)
+    }
 
-        override fun onStartLoading() {
+    override fun onLoadFinished(loader: Loader<AccountSettings>, settings: AccountSettings?) {
-            forceLoad()
+        if (settings == null) {
-            listenerHandle = ContentResolver.addStatusChangeListener(ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS, this)
+            activity!!.finish()
+            return
+        }
+        // Category: dashboard
+        val prefManageAccount = findPreference("manage_account")
+        prefManageAccount.onPreferenceClickListener = Preference.OnPreferenceClickListener { _ ->
+            WebViewActivity.openUrl(activity!!, Constants.dashboard.buildUpon().appendQueryParameter("email", account.name).build())
+            true
         }
 
-        override fun onStopLoading() {
+        // Category: encryption
-            ContentResolver.removeStatusChangeListener(listenerHandle)
+        val prefEncryptionPassword = findPreference("password")
+        prefEncryptionPassword.onPreferenceClickListener = Preference.OnPreferenceClickListener { _ ->
+            startActivity(ChangeEncryptionPasswordActivity.newIntent(activity!!, account))
+            true
         }
 
-        override fun abandon() {
+        val prefSync = findPreference("sync_interval") as ListPreference
-            onStopLoading()
+        val syncInterval = settings.getSyncInterval(CalendarContract.AUTHORITY) // Calendar is the baseline interval
-        }
+        if (syncInterval != null) {
-
+            prefSync.value = syncInterval.toString()
-        override fun loadInBackground(): AccountSettings? {
+            if (syncInterval == AccountSettings.SYNC_INTERVAL_MANUALLY)
-            val settings: AccountSettings
+                prefSync.setSummary(R.string.settings_sync_summary_manually)
-            try {
+            else
-                settings = AccountSettings(context, account)
+                prefSync.summary = getString(R.string.settings_sync_summary_periodically, prefSync.entry)
-            } catch (e: InvalidAccountException) {
+            prefSync.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
-                return null
+                val newInterval = java.lang.Long.parseLong(newValue as String)
+                settings.setSyncInterval(App.addressBooksAuthority, newInterval)
+                settings.setSyncInterval(CalendarContract.AUTHORITY, newInterval)
+                OPENTASK_PROVIDERS.forEach {
+                    settings.setSyncInterval(it.authority, newInterval)
+                }
+                loaderManager.restartLoader(0, arguments, this@AccountSettingsFragment)
+                false
             }
-
+        } else {
-            return settings
+            prefSync.isEnabled = false
+            prefSync.setSummary(R.string.settings_sync_summary_not_available)
         }
 
-        override fun onStatusChanged(which: Int) {
+        val prefWifiOnly = findPreference("sync_wifi_only") as SwitchPreferenceCompat
-            Logger.log.fine("Reloading account settings")
+        prefWifiOnly.isChecked = settings.syncWifiOnly
-            forceLoad()
+        prefWifiOnly.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, wifiOnly ->
+            settings.setSyncWiFiOnly(wifiOnly as Boolean)
+            loaderManager.restartLoader(0, arguments, this@AccountSettingsFragment)
+            false
         }
 
+        val prefWifiOnlySSID = findPreference("sync_wifi_only_ssid") as EditTextPreference
+        val onlySSID = settings.syncWifiOnlySSID
+        prefWifiOnlySSID.text = onlySSID
+        if (onlySSID != null)
+            prefWifiOnlySSID.summary = getString(R.string.settings_sync_wifi_only_ssid_on, onlySSID)
+        else
+            prefWifiOnlySSID.setSummary(R.string.settings_sync_wifi_only_ssid_off)
+        prefWifiOnlySSID.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+            val ssid = newValue as String
+            settings.syncWifiOnlySSID = if (!TextUtils.isEmpty(ssid)) ssid else null
+            loaderManager.restartLoader(0, arguments, this@AccountSettingsFragment)
+            false
+        }
+    }
+
+    override fun onLoaderReset(loader: Loader<AccountSettings>) {}
+
+}
+
+
+
+class LegacyAccountSettingsFragment : PreferenceFragmentCompat(), LoaderManager.LoaderCallbacks<AccountSettings> {
+    internal lateinit var account: Account
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        account = arguments?.getParcelable(KEY_ACCOUNT)!!
+
+        loaderManager.initLoader(0, arguments, this)
+    }
+
+    override fun onCreatePreferences(bundle: Bundle, s: String) {
+        addPreferencesFromResource(R.xml.settings_account_legacy)
+    }
+
+    override fun onCreateLoader(id: Int, args: Bundle?): Loader<AccountSettings> {
+        return AccountSettingsLoader(context!!, args!!.getParcelable(KEY_ACCOUNT) as Account)
+    }
+
+    override fun onLoadFinished(loader: Loader<AccountSettings>, settings: AccountSettings?) {
+        if (settings == null) {
+            activity!!.finish()
+            return
+        }
+
+        // Category: dashboard
+        val prefManageAccount = findPreference("manage_account")
+        prefManageAccount.onPreferenceClickListener = Preference.OnPreferenceClickListener { _ ->
+            WebViewActivity.openUrl(activity!!, Constants.dashboard.buildUpon().appendQueryParameter("email", account.name).build())
+            true
+        }
+
+        // category: authentication
+        val prefPassword = findPreference("password") as EditTextPreference
+        prefPassword.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+            val credentials = if (newValue != null) LoginCredentials(settings.uri, account.name, newValue as String) else null
+            LoginCredentialsChangeFragment.newInstance(account, credentials!!).show(fragmentManager!!, null)
+            loaderManager.restartLoader(0, arguments, this@LegacyAccountSettingsFragment)
+            false
+        }
+
+        // Category: encryption
+        val prefEncryptionPassword = findPreference("encryption_password")
+        prefEncryptionPassword.onPreferenceClickListener = Preference.OnPreferenceClickListener { _ ->
+            startActivity(ChangeEncryptionPasswordActivity.newIntent(activity!!, account))
+            true
+        }
+
+        val prefSync = findPreference("sync_interval") as ListPreference
+        val syncInterval = settings.getSyncInterval(CalendarContract.AUTHORITY) // Calendar is the baseline interval
+        if (syncInterval != null) {
+            prefSync.value = syncInterval.toString()
+            if (syncInterval == AccountSettings.SYNC_INTERVAL_MANUALLY)
+                prefSync.setSummary(R.string.settings_sync_summary_manually)
+            else
+                prefSync.summary = getString(R.string.settings_sync_summary_periodically, prefSync.entry)
+            prefSync.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                val newInterval = java.lang.Long.parseLong(newValue as String)
+                settings.setSyncInterval(App.addressBooksAuthority, newInterval)
+                settings.setSyncInterval(CalendarContract.AUTHORITY, newInterval)
+                OPENTASK_PROVIDERS.forEach {
+                    settings.setSyncInterval(it.authority, newInterval)
+                }
+                loaderManager.restartLoader(0, arguments, this@LegacyAccountSettingsFragment)
+                false
+            }
+        } else {
+            prefSync.isEnabled = false
+            prefSync.setSummary(R.string.settings_sync_summary_not_available)
+        }
+
+        val prefWifiOnly = findPreference("sync_wifi_only") as SwitchPreferenceCompat
+        prefWifiOnly.isChecked = settings.syncWifiOnly
+        prefWifiOnly.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, wifiOnly ->
+            settings.setSyncWiFiOnly(wifiOnly as Boolean)
+            loaderManager.restartLoader(0, arguments, this@LegacyAccountSettingsFragment)
+            false
+        }
+
+        val prefWifiOnlySSID = findPreference("sync_wifi_only_ssid") as EditTextPreference
+        val onlySSID = settings.syncWifiOnlySSID
+        prefWifiOnlySSID.text = onlySSID
+        if (onlySSID != null)
+            prefWifiOnlySSID.summary = getString(R.string.settings_sync_wifi_only_ssid_on, onlySSID)
+        else
+            prefWifiOnlySSID.setSummary(R.string.settings_sync_wifi_only_ssid_off)
+        prefWifiOnlySSID.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+            val ssid = newValue as String
+            settings.syncWifiOnlySSID = if (!TextUtils.isEmpty(ssid)) ssid else null
+            loaderManager.restartLoader(0, arguments, this@LegacyAccountSettingsFragment)
+            false
+        }
+    }
+
+    override fun onLoaderReset(loader: Loader<AccountSettings>) {}
+}
+
+private class AccountSettingsLoader(context: Context, internal val account: Account) : AsyncTaskLoader<AccountSettings>(context), SyncStatusObserver {
+    internal lateinit var listenerHandle: Any
+
+    override fun onStartLoading() {
+        forceLoad()
+        listenerHandle = ContentResolver.addStatusChangeListener(ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS, this)
+    }
+
+    override fun onStopLoading() {
+        ContentResolver.removeStatusChangeListener(listenerHandle)
+    }
+
+    override fun abandon() {
+        onStopLoading()
+    }
+
+    override fun loadInBackground(): AccountSettings? {
+        val settings: AccountSettings
+        try {
+            settings = AccountSettings(context, account)
+        } catch (e: InvalidAccountException) {
+            return null
+        }
+
+        return settings
+    }
+
+    override fun onStatusChanged(which: Int) {
+        Logger.log.fine("Reloading account settings")
+        forceLoad()
     }
 
 }

app/src/main/java/com/etesync/syncadapter/ui/ChangeEncryptionPasswordActivity.kt

@@ -15,6 +15,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AlertDialog
+import com.etebase.client.Client
 import com.etesync.syncadapter.AccountSettings
 import com.etesync.syncadapter.HttpClient
 import com.etesync.syncadapter.R
@@ -53,7 +54,7 @@ open class ChangeEncryptionPasswordActivity : BaseActivity() {
         AlertDialog.Builder(this)
                 .setTitle(R.string.wrong_encryption_password)
                 .setIcon(R.drawable.ic_error_dark)
-                .setMessage(getString(R.string.wrong_encryption_password_content, e.localizedMessage))
+                .setMessage(e.localizedMessage)
                 .setPositiveButton(android.R.string.ok) { _, _ ->
                     // dismiss
                 }.show()
@@ -62,6 +63,45 @@ open class ChangeEncryptionPasswordActivity : BaseActivity() {
     fun changePasswordDo(old_password: String, new_password: String) {
         val settings = AccountSettings(this, account)
 
+        if (settings.isLegacy) {
+            legacyChangePasswordDo(settings, old_password, new_password)
+            return
+        }
+
+        doAsync {
+            val httpClient = HttpClient.sharedClient
+
+            try {
+                Logger.log.info("Loging in with old password")
+                val client = Client.create(httpClient, settings.uri?.toString())
+                val etebase = com.etebase.client.Account.login(client, account.name, old_password)
+                Logger.log.info("Login successful")
+
+                etebase.changePassword(new_password)
+
+                settings.etebaseSession = etebase.save(null)
+
+                uiThread {
+                    progress.dismiss()
+                    AlertDialog.Builder(this@ChangeEncryptionPasswordActivity)
+                            .setTitle(R.string.change_encryption_password_success_title)
+                            .setMessage(R.string.change_encryption_password_success_body)
+                            .setPositiveButton(android.R.string.ok) { _, _ ->
+                                this@ChangeEncryptionPasswordActivity.finish()
+                            }.show()
+
+                    requestSync(applicationContext, account)
+                }
+            } catch (e: Exception) {
+                uiThread {
+                    changePasswordError(e)
+                }
+                return@doAsync
+            }
+        }
+    }
+
+    fun legacyChangePasswordDo(settings: AccountSettings, old_password: String, new_password: String) {
         doAsync {
             val httpClient = HttpClient.Builder(this@ChangeEncryptionPasswordActivity, settings).setForeground(false).build().okHttpClient
 

app/src/main/res/xml/settings_account.xml

@@ -18,25 +18,12 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/settings_encryption">
-
-        <Preference
-            android:title="@string/settings_encryption_password"
-            android:key="encryption_password"
-            android:summary="@string/settings_encryption_password_summary"
-            android:persistent="false"
-        />
-
-    </PreferenceCategory>
-
     <PreferenceCategory android:title="@string/settings_sync">
-        <EditTextPreference
+        <Preference
             android:key="password"
-            android:title="@string/settings_password"
+            android:title="@string/settings_encryption_password"
-            android:persistent="false"
+            android:summary="@string/settings_encryption_password_summary"
-            android:inputType="textPassword"
+            />
-            android:summary="@string/settings_password_summary"
-            android:dialogTitle="@string/settings_enter_password" />
 
         <ListPreference
             android:key="sync_interval"

app/src/main/res/xml/settings_account_legacy.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2013 – 2015 Ricki Hirner (bitfire web engineering).
+  ~ All rights reserved. This program and the accompanying materials
+  ~ are made available under the terms of the GNU Public License v3.0
+  ~ which accompanies this distribution, and is available at
+  ~ http://www.gnu.org/licenses/gpl.html
+  -->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <PreferenceCategory android:title="@string/settings_manage_account">
+
+        <Preference
+            android:key="manage_account"
+            android:title="@string/settings_account_dashboard"
+            android:persistent="false"
+            android:summary="@string/settings_manage_account_summary" />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/settings_encryption">
+
+        <Preference
+            android:title="@string/settings_encryption_password"
+            android:key="encryption_password"
+            android:summary="@string/settings_encryption_password_summary"
+            android:persistent="false"
+        />
+
+    </PreferenceCategory>
+
+    <PreferenceCategory android:title="@string/settings_sync">
+        <EditTextPreference
+            android:key="password"
+            android:title="@string/settings_password"
+            android:persistent="false"
+            android:inputType="textPassword"
+            android:summary="@string/settings_password_summary"
+            android:dialogTitle="@string/settings_enter_password" />
+
+        <ListPreference
+            android:key="sync_interval"
+            android:persistent="false"
+            android:title="@string/settings_sync_interval"
+            android:entries="@array/settings_sync_interval_names"
+            android:entryValues="@array/settings_sync_interval_seconds" />
+
+        <SwitchPreferenceCompat
+            android:key="sync_wifi_only"
+            android:persistent="false"
+            android:title="@string/settings_sync_wifi_only"
+            android:summaryOn="@string/settings_sync_wifi_only_on"
+            android:summaryOff="@string/settings_sync_wifi_only_off"
+            />
+
+        <EditTextPreference
+            android:key="sync_wifi_only_ssid"
+            android:dependency="sync_wifi_only"
+            android:persistent="false"
+            android:title="@string/settings_sync_wifi_only_ssid"
+            android:dialogMessage="@string/settings_sync_wifi_only_ssid_message"/>
+
+    </PreferenceCategory>
+</PreferenceScreen>