Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f811897 authored by Abhishek Aggarwal's avatar Abhishek Aggarwal
Browse files

Merge branch '700-contact-categories' into 'master' 

AccountManager: Update contact default to categories

See merge request !41
parents c5613b13 3c4b3ed6

app/src/main/java/foundation/e/accountmanager/settings/AccountSettings.kt

+6 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ class AccountSettings( 


    companion object {



        const val CURRENT_VERSION = 10

        const val CURRENT_VERSION = 11

        const val KEY_SETTINGS_VERSION = "version"



        const val KEY_USERNAME = "user_name"
@@ -313,6 +313,11 @@ class AccountSettings( 
    }





    @Suppress("unused","FunctionName")

    private fun update_10_11() {

        setGroupMethod(GroupMethod.CATEGORIES)

    }



    @Suppress("unused","FunctionName")

    /**

     * Task synchronization now handles alarms, categories, relations and unknown properties.

app/src/main/java/foundation/e/accountmanager/ui/setup/AccountDetailsFragment.kt

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ class AccountDetailsFragment : Fragment() { 
        v.carddav.visibility = if (config.cardDAV != null) View.VISIBLE else View.GONE

        if (settings.has(AccountSettings.KEY_CONTACT_GROUP_METHOD))

            v.contactGroupMethod.isEnabled = false

        v.contactGroupMethod.setSelection(1)



        v.createAccount.setOnClickListener {

            val name = model.name.value