Merge upstream tag 6.710 into 1472-Update_to_upstream_6_711

image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:1263-Add_java_17_support"

image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:master"

stages:

- update-from-upstream

      </option>

    </JavaCodeStyleSettings>

    <JetCodeStyleSettings>

      <option name="PACKAGES_TO_USE_STAR_IMPORTS">

        <value>

          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />

        </value>

      </option>

      <option name="PACKAGES_IMPORT_LAYOUT">

        <value>

          <package name="" alias="false" withSubpackages="true" />

        applicationId = "net.thunderbird.feature.preview"

        versionCode = 1

        versionName = "1.0"

        buildConfigField(

            "String",

            "OAUTH_GMAIL_CLIENT_ID",

            "\"262622259280-5qb3vtj68d5dtudmaif4g9vd3cpar8r3.apps.googleusercontent.com\"",

        )

        buildConfigField(

            "String",

            "OAUTH_YAHOO_CLIENT_ID",

            "\"dj0yJmk9ejRCRU1ybmZjQlVBJmQ9WVdrOVVrZEViak4xYmxZbWNHbzlNQT09JnM9Y29uc3VtZXJzZWNyZXQmc3Y9MCZ4PTZj\"",

        )

        buildConfigField(

            "String",

            "OAUTH_AOL_CLIENT_ID",

            "\"dj0yJmk9cHYydkJkTUxHcXlYJmQ9WVdrOWVHZHhVVXN4VVV3bWNHbzlNQT09JnM9Y29uc3VtZXJzZWNyZXQmc3Y9MCZ4PTdm\"",

        )

        buildConfigField(

            "String",

            "OAUTH_MICROSOFT_CLIENT_ID",

            "\"e647013a-ada4-4114-b419-e43d250f99c5\"",

        )

        buildConfigField(

            "String",

            "OAUTH_MICROSOFT_REDIRECT_URI_ID",

            "\"VZF2DYuLYAu4TurFd6usQB2JPts%3D\"",

        )

        manifestPlaceholders["appAuthRedirectScheme"] = "com.fsck.k9.debug"

    }

    packaging {

        resources {

            excludes += listOf(

                "META-INF/DEPENDENCIES",

            )

        }

    }

    buildTypes {

        getByName("release") {

            isMinifyEnabled = false

            proguardFiles(

                getDefaultProguardFile("proguard-android-optimize.txt"),

                "proguard-rules.pro",

            )

            signingConfig = signingConfigs.getByName("debug")

        }

    }

    lint {

        baseline = file("lint-baseline.xml")

    }

}

dependencies {

    implementation(projects.core.ui.compose.designsystem)

    implementation(projects.core.common)

    implementation(projects.mail.common)

    implementation(projects.feature.onboarding)

    implementation(projects.feature.account.setup)

    implementation(libs.okhttp)

    implementation(libs.timber)

}

<?xml version="1.0" encoding="UTF-8"?>

<issues format="6" by="lint 8.0.2" type="baseline" client="gradle" dependencies="true" name="AGP (8.0.2)" variant="all" version="8.0.2">

    <issue

        id="CustomX509TrustManager"

        message="Implementing a custom `X509TrustManager` is error-prone and likely to be insecure. It is likely to disable certificate validation altogether, and is non-trivial to implement correctly without calling Android's default implementation."

        errorLine1="    private class SecureX509TrustManager implements X509TrustManager {"

        errorLine2="                  ~~~~~~~~~~~~~~~~~~~~~~">

        <location

            file="src/main/java/com/fsck/k9/mail/ssl/TrustManagerFactory.java"

            line="70"

            column="19"/>

    </issue>

</issues>

<?xml version="1.0" encoding="utf-8"?>

<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<manifest

    xmlns:tools="http://schemas.android.com/tools"

    xmlns:android="http://schemas.android.com/apk/res/android"

    >

    <uses-permission android:name="android.permission.INTERNET"/>

    <application

        android:name=".FeatureApplication"

        android:allowBackup="true"

        android:icon="@mipmap/ic_launcher"

        android:label="@string/app_name"

        android:usesCleartextTraffic="true"

        android:networkSecurityConfig="@xml/network_security_config"

        android:supportsRtl="true"

        android:theme="@style/Theme.Thunderbird.Splashscreen"

        tools:ignore="UnusedAttribute"

        >

        <activity

            android:name=".FeatureActivity"

            android:exported="true">

            android:exported="true"

            android:windowSoftInputMode="adjustResize"

            >

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity>

    </application>

</manifest>