remove non required fields from loginActivity (d143be11) · Commits · e / os / AccountManager

app/src/main/java/at/bitfire/davdroid/syncadapter/EeloAccountAuthenticatorService.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import android.app.Service
		import android.content.Context
		import android.content.Intent
		import android.os.Bundle
		import at.bitfire.davdroid.R
		import at.bitfire.davdroid.db.AppDatabase
		import at.bitfire.davdroid.log.Logger
		import at.bitfire.davdroid.resource.LocalAddressBook
		@@ -125,7 +126,7 @@ class EeloAccountAuthenticatorService : Service(), OnAccountsUpdateListener {
		intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response)
		intent.putExtra(
		LoginActivity.SETUP_ACCOUNT_PROVIDER_TYPE,
		LoginActivity.ACCOUNT_PROVIDER_EELO
		context.getString(R.string.eelo_account_type)
		)
		val bundle = Bundle(1)
		bundle.putParcelable(AccountManager.KEY_INTENT, intent)

app/src/main/java/at/bitfire/davdroid/syncadapter/GoogleAccountAuthenticatorService.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.content.Context
		import android.content.Intent
		import android.os.Bundle
		import at.bitfire.davdroid.OpenIdUtils
		import at.bitfire.davdroid.R
		import at.bitfire.davdroid.db.AppDatabase
		import at.bitfire.davdroid.log.Logger
		import at.bitfire.davdroid.resource.LocalAddressBook
		@@ -127,7 +128,7 @@ class GoogleAccountAuthenticatorService : Service(), OnAccountsUpdateListener {
		intent.putExtra(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE, response)
		intent.putExtra(
		LoginActivity.SETUP_ACCOUNT_PROVIDER_TYPE,
		LoginActivity.ACCOUNT_PROVIDER_GOOGLE
		context.getString(R.string.google_account_type)
		)

		options?.let {

app/src/main/java/at/bitfire/davdroid/ui/setup/AccountDetailsFragment.kt

+5 −5

Original line number	Diff line number	Diff line
		@@ -142,8 +142,8 @@ class AccountDetailsFragment : Fragment() {
		} else
		v.contactGroupMethod.isEnabled = true

		if (requireActivity().intent.getStringExtra(LoginActivity.SETUP_ACCOUNT_PROVIDER_TYPE) == LoginActivity.ACCOUNT_PROVIDER_EELO \|\|
		requireActivity().intent.getStringExtra(LoginActivity.SETUP_ACCOUNT_PROVIDER_TYPE) == LoginActivity.ACCOUNT_PROVIDER_GOOGLE) {
		val providedAccountType = requireActivity().intent.getStringExtra(LoginActivity.SETUP_ACCOUNT_PROVIDER_TYPE)
		if ((providedAccountType != getString(R.string.account_type)) && (providedAccountType in AccountUtils.getMainAccountTypes(requireContext()))) {

		v.mainDetailLayout.visibility = View.GONE
		v.mainLoadingLayout.visibility = View.VISIBLE
		@@ -176,7 +176,7 @@ class AccountDetailsFragment : Fragment() {
		.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE)?.onResult(null)
		}

		if (requireActivity().intent.getStringExtra(LoginActivity.SETUP_ACCOUNT_PROVIDER_TYPE) == LoginActivity.ACCOUNT_PROVIDER_EELO) {
		if (requireActivity().intent.getStringExtra(LoginActivity.SETUP_ACCOUNT_PROVIDER_TYPE) == getString(R.string.eelo_account_type)) {
		val intent = Intent("drive.services.InitializerService")
		intent.setPackage(getString(R.string.e_drive_package_name))
		intent.putExtra(AccountManager.KEY_ACCOUNT_NAME, name)
		@@ -242,12 +242,12 @@ class AccountDetailsFragment : Fragment() {
		}

		when (activity.intent.getStringExtra(LoginActivity.SETUP_ACCOUNT_PROVIDER_TYPE)) {
		LoginActivity.ACCOUNT_PROVIDER_EELO -> {
		context.getString(R.string.eelo_account_type) -> {
		accountType = context.getString(R.string.eelo_account_type)
		addressBookAccountType = context.getString(R.string.account_type_eelo_address_book)
		baseURL = credentials?.serverUri.toString()
		}
		LoginActivity.ACCOUNT_PROVIDER_GOOGLE -> {
		context.getString(R.string.google_account_type) -> {
		accountType = context.getString(R.string.google_account_type)
		addressBookAccountType = context.getString(R.string.account_type_google_address_book)
		baseURL = null

app/src/main/java/at/bitfire/davdroid/ui/setup/DetectConfigurationFragment.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@ class DetectConfigurationFragment: Fragment() {
		}

		val accountType = requireActivity().intent.getStringExtra(LoginActivity.SETUP_ACCOUNT_PROVIDER_TYPE)
		val isMurenaAccountType = (accountType == LoginActivity.ACCOUNT_PROVIDER_EELO)
		val isMurenaAccountType = (accountType == getString(R.string.eelo_account_type))

		model.detectConfiguration(loginModel, isMurenaAccountType).observe(this, { result ->
		// save result for next step

app/src/main/java/at/bitfire/davdroid/ui/setup/LoginActivity.kt

+3 −4

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ import android.os.Bundle
		import android.view.MenuItem
		import androidx.appcompat.app.AppCompatActivity
		import androidx.fragment.app.Fragment
		import at.bitfire.davdroid.R
		import at.bitfire.davdroid.log.Logger
		import dagger.hilt.android.AndroidEntryPoint
		import javax.inject.Inject
		@@ -39,8 +40,6 @@ class LoginActivity: AppCompatActivity() {
		const val EXTRA_PASSWORD = "password"

		const val SETUP_ACCOUNT_PROVIDER_TYPE = "setup_account_provider_type"
		const val ACCOUNT_PROVIDER_EELO = "eelo"
		const val ACCOUNT_PROVIDER_GOOGLE = "google"
		const val OPENID_AUTH_FLOW_COMPLETE = "openId_authFlow_complete"

		const val OPEN_APP_PACKAGE_AFTER_AUTH = "open_app_package_after_auth"
		@@ -70,12 +69,12 @@ class LoginActivity: AppCompatActivity() {

		if (fragment != null) {
		when (intent.getStringExtra(SETUP_ACCOUNT_PROVIDER_TYPE)) {
		ACCOUNT_PROVIDER_EELO -> {
		getString(R.string.eelo_account_type) -> {
		supportFragmentManager.beginTransaction()
		.replace(android.R.id.content, EeloAuthenticatorFragment())
		.commit()
		}
		ACCOUNT_PROVIDER_GOOGLE -> {
		getString(R.string.google_account_type) -> {
		supportFragmentManager.beginTransaction()
		.replace(android.R.id.content, GoogleAuthFragment())
		.commit()