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

Commit 56dc2303 authored by Nihar Thakkar's avatar Nihar Thakkar Committed by Sumit Pundir
Browse files

Improve account configuration message, auto-add Google and eelo accounts

parent 9b844f97

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

+26 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import android.provider.CalendarContract 
import android.view.LayoutInflater

import android.view.View

import android.view.ViewGroup

import android.widget.Toast

import androidx.fragment.app.Fragment

import androidx.lifecycle.*

import foundation.e.accountmanager.Constants
@@ -116,6 +117,31 @@ class AccountDetailsFragment: Fragment() { 
        } else

            v.contactGroupMethod.isEnabled = true



	if (activity!!.intent.getStringExtra(LoginActivity.SETUP_ACCOUNT_PROVIDER_TYPE) == LoginActivity.ACCOUNT_PROVIDER_EELO ||

                activity!!.intent.getStringExtra(LoginActivity.SETUP_ACCOUNT_PROVIDER_TYPE) == LoginActivity.ACCOUNT_PROVIDER_GOOGLE) {

            val name = model.name.value 

            if (name.isNullOrBlank())

                model.nameError.value = getString(R.string.login_account_name_required)

            else {

		val idx = v.contactGroupMethod.selectedItemPosition

                val groupMethodName = resources.getStringArray(R.array.settings_contact_group_method_values)[idx]

		

		model.createAccount(

                        name,

                        loginModel.credentials!!,

			config,

                        GroupMethod.valueOf(groupMethodName)

                ).observe(this, Observer<Boolean> { success ->

                    if (success) {

			Toast.makeText(context, "Added account successfully", Toast.LENGTH_LONG).show()

                    	requireActivity().setResult(Activity.RESULT_OK)

                    	requireActivity().finish()

		    }

                })



            }

        }



        return v.root

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ class DetectConfigurationFragment: Fragment() { 
                    .setTitle(R.string.login_configuration_detection)

                    .setIcon(R.drawable.ic_error_dark)

                    .setMessage(R.string.login_no_caldav_carddav)

		    .setCancelable(false)

                    .setNeutralButton(R.string.login_view_logs) { _, _ ->

                        val intent = Intent(activity, DebugInfoActivity::class.java)

                        intent.putExtra(DebugInfoActivity.KEY_LOGS, model.configuration?.logs)

app/src/main/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -180,8 +180,8 @@ 
    <string name="login_account_name_already_taken">Account name already taken</string>

    <string name="login_account_not_created">Account could not be created</string>



    <string name="login_configuration_detection">Configuration detection</string>

    <string name="login_querying_server">Please wait, querying server…</string>

    <string name="login_configuration_detection">Add account</string>

    <string name="login_querying_server">Please wait, adding account…</string>

    <string name="login_no_caldav_carddav">Couldn\'t find CalDAV or CardDAV service.</string>

    <string name="login_view_logs">Show details</string>