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

Commit b7f7e8e0 authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Revert "mail: Move adding accounts to seperate activity" 

This reverts commit 831fb8f8.
parent 605a966d

feature/account/accountmanager/src/main/kotlin/app/k9mail/feature/account/accountmanager/AccountManagerConstants.kt

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ object AccountManagerConstants { 


    const val OPEN_APP_PACKAGE_AFTER_AUTH = "open_app_package_after_auth"

    const val OPEN_APP_ACTIVITY_AFTER_AUTH = "open_app_activity_after_auth"

    const val TO_OPEN_AFTER_AUTH_ACTIVITY = "com.fsck.k9.activity.accountmanager.EeloAccountActivity"

    const val TO_OPEN_AFTER_AUTH_ACTIVITY = "com.fsck.k9.activity.MessageList"

    const val USERNAME_HINT = "userNameHint"



    val ACCOUNT_TYPES = listOf(EELO_ACCOUNT_TYPE, GOOGLE_ACCOUNT_TYPE, YAHOO_ACCOUNT_TYPE)

gradle/libs.versions.toml

+0 −4
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ kotlinxSerialization = "1.7.3" 
ktlint = "1.2.1"

kxml2 = "1.0"

leakcanary = "2.13"

material3 = "1.3.1"

mime4j = "0.8.9"

minidns = "1.0.5"

mockito = "5.14.2"
@@ -100,7 +99,6 @@ spotlessPlugin = "6.25.0" 
timber = "5.0.1"

tokenautocomplete = "4.0.0-beta01-k9mail02"

turbine = "1.2.0"

ui = "1.7.6"

xmlpull = "1.0"

zxing = "3.5.3"
@@ -164,7 +162,6 @@ androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle- 
androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidxLifecycle" }

androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "androidxLifecycle" }

androidx-localbroadcastmanager = { module = "androidx.localbroadcastmanager:localbroadcastmanager", version.ref = "androidxLocalBroadcastManager" }

androidx-material3 = { module = "androidx.compose.material3:material3", version.ref = "material3" }

androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigation" }

androidx-navigation-fragment = { module = "androidx.navigation:navigation-fragment", version.ref = "androidxNavigation" }

androidx-navigation-ui = { module = "androidx.navigation:navigation-ui", version.ref = "androidxNavigation" }
@@ -177,7 +174,6 @@ androidx-test-espresso-core = { module = "androidx.test.espresso:espresso-core", 
androidx-test-ext-junit-ktx = { module = "androidx.test.ext:junit-ktx", version.ref = "androidxTestExt" }

androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidxTestRules" }

androidx-test-runner = { module = "androidx.test:runner", version.ref = "androidxTestRunner" }

androidx-ui = { module = "androidx.compose.ui:ui", version.ref = "ui" }

androidx-work-runtime = { module = "androidx.work:work-runtime", version.ref = "androidxWork" }

androidx-work-testing = { module = "androidx.work:work-testing", version.ref = "androidxWork" }

apache-httpclient5 = { module = "org.apache.httpcomponents.client5:httpclient5", version.ref = "apacheHttpclient5" }

legacy/common/src/main/AndroidManifest.xml

+1 −8
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ 
            />



        <activity

            android:name="com.fsck.k9.activity.accountmanager.EeloAccountActivity"

            android:name="com.fsck.k9.activity.MessageList"

            android:launchMode="singleTop"

            android:exported="true"

            >
@@ -132,13 +132,6 @@ 
                <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />

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

            </intent-filter>

        </activity>



        <activity

            android:name="com.fsck.k9.activity.MessageList"

            android:launchMode="singleTop"

            android:exported="true"

            >

            <intent-filter>

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

                <data

legacy/ui/legacy/build.gradle.kts

+0 −2
Original line number Diff line number Diff line
@@ -33,9 +33,7 @@ dependencies { 
    implementation(projects.plugins.openpgpApiLib.openpgpApi)



    implementation(libs.androidx.appcompat)

    implementation(libs.androidx.material3)

    implementation(libs.androidx.preference)

    implementation(libs.androidx.ui)

    implementation(libs.preferencex)

    implementation(libs.preferencex.datetimepicker)

    implementation(libs.preferencex.colorpicker)

legacy/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt

+7 −1
Original line number Diff line number Diff line
@@ -145,7 +145,13 @@ open class MessageList : 
            return

        }



        val accounts = accountManager.getAccounts()

        val accountCreator = EeloAccountCreator(this)

        var accounts = accountManager.getAccounts()



        if (accountCreator.loadAccountsFromAccountManager()) {

            accounts = accountManager.getAccounts()

        }



        deleteIncompleteAccounts(accounts)



        val hasAccountSetup = accounts.any { it.isFinishedSetup }