Merge branch '2874-main-yahoo_mail' into 'main' (cbfd0a35) · Commits · e / os / AccountManager

app/build.gradle

+9 −2

Original line number	Diff line number	Diff line
		@@ -23,8 +23,8 @@ android {
		defaultConfig {
		applicationId "foundation.e.accountmanager"

		versionCode 403090005
		versionName '4.3.10'
		versionCode 403090006
		versionName '4.3.9-6'

		buildConfigField "long", "buildTime", System.currentTimeMillis() + "L"

		@@ -84,10 +84,17 @@ android {
		keyAlias System.getenv("ANDROID_KEY_ALIAS")
		keyPassword System.getenv("ANDROID_KEY_PASSWORD")
		}
		debug {
		storeFile file("keystore/platform.jks")
		storePassword "platform"
		keyAlias "platform"
		keyPassword "platform"
		}
		}

		buildTypes {
		debug {
		signingConfig = signingConfigs.debug
		buildConfigField "String", "EMAIL_KEY", "\"invalid\""
		}

0 → 100644

+2.98 KiB

File added.

No diff preview for this file type.

+2 −3

Original line number	Diff line number	Diff line
		@@ -201,18 +201,17 @@ class AccountSettings(
		}

		private fun addEmailToBundle(bundle: Bundle, email: String?, userName: String?) {
		if (email != null) {
		if (!email.isNullOrEmpty() && email != "null") {
		bundle.putString(KEY_EMAIL_ADDRESS, email)
		return
		}

		userName?.let {
		if (it.contains("@")) {
		if (it != "null" && it.contains("@")) {
		bundle.putString(KEY_EMAIL_ADDRESS, it)
		}
		}
		}

		}