fix issues with drive sync (69ef145f) · Commits · e / os / AccountManager

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

+21 −25

Original line number	Diff line number	Diff line
		@@ -60,8 +60,8 @@ class AccountDetailsFragment: Fragment() {

		val config = loginModel.configuration ?: throw IllegalStateException()

		model.name.value = config.calDAV?.email ?:
		loginModel.credentials?.userName ?:
		model.name.value = loginModel.credentials?.userName ?:
		config.calDAV?.email ?:
		loginModel.credentials?.certificateAlias

		// CardDAV-specific
		@@ -95,30 +95,11 @@ class AccountDetailsFragment: Fragment() {
		config,
		GroupMethod.valueOf(groupMethodName)
		).observe(this, Observer<Boolean> { success ->
		if (success) {
		if (success)
		requireActivity().finish()
		if (activity!!.intent.hasExtra(AccountManager
		.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE) && activity!!.intent
		.getParcelableExtra<AccountAuthenticatorResponse>(AccountManager
		.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE) != null) {
		activity!!.intent
		.getParcelableExtra<AccountAuthenticatorResponse>(AccountManager
		.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE).onResult(null)
		}

		if (activity!!.intent.getStringExtra(LoginActivity.SETUP_ACCOUNT_PROVIDER_TYPE) == LoginActivity.ACCOUNT_PROVIDER_EELO) {
		val intent = Intent("drive.services.InitializerService")
		intent.setPackage(getString(R.string.e_drive_package_name))
		intent.putExtra(AccountManager.KEY_ACCOUNT_NAME, name)
		intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE, getString(R.string.eelo_account_type))
		activity!!.startService(intent)
		}


		} else {
		else {
		Snackbar.make(requireActivity().findViewById(android.R.id.content), R.string.login_account_not_created, Snackbar.LENGTH_LONG).show()


		v.createAccountProgress.visibility = View.GONE
		v.createAccount.visibility = View.VISIBLE
		}
		@@ -158,9 +139,24 @@ class AccountDetailsFragment: Fragment() {
		Toast.makeText(context, "Added account successfully", Toast.LENGTH_LONG).show()
		requireActivity().setResult(Activity.RESULT_OK)
		requireActivity().finish()
		if (activity!!.intent.hasExtra(AccountManager
		.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE) && activity!!.intent
		.getParcelableExtra<AccountAuthenticatorResponse>(AccountManager
		.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE) != null) {
		activity!!.intent
		.getParcelableExtra<AccountAuthenticatorResponse>(AccountManager
		.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE).onResult(null)
		}
		})

		if (activity!!.intent.getStringExtra(LoginActivity.SETUP_ACCOUNT_PROVIDER_TYPE) == LoginActivity.ACCOUNT_PROVIDER_EELO) {
		val intent = Intent("drive.services.InitializerService")
		intent.setPackage(getString(R.string.e_drive_package_name))
		intent.putExtra(AccountManager.KEY_ACCOUNT_NAME, name)
		intent.putExtra(AccountManager.KEY_ACCOUNT_TYPE, getString(R.string.eelo_account_type))
		activity!!.startService(intent)
		}
		}
		})
		}
		}