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

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

Merge branch '3511-main-ose-murena_login1' into 'main-ose' 

Initial Account Manager Transition - Part 1

See merge request !167
parents 5553018c 0c5f08df

app/build.gradle.kts

+13 −0
Original line number Diff line number Diff line
@@ -228,10 +228,12 @@ dependencies { 
        exclude(group="junit")

        exclude(group="org.ogce", module="xpp3")    // Android has its own XmlPullParser implementation

    }

    /*

    implementation(libs.bitfire.synctools) {

        exclude(group="androidx.test")              // synctools declares test rules, but we don't want them in non-test code

        exclude(group = "junit")

    }

    */



    // third-party libs

    @Suppress("RedundantSuppression")
@@ -254,6 +256,17 @@ dependencies { 
    implementation(libs.commons.codec)

    implementation(libs.commons.lang)



    // e-Specific dependencies - (Avoid moving into toml)

    implementation("foundation.e:elib:0.0.1-alpha11")

    implementation("foundation.e:synctools:58bc6752") {

        exclude(group="androidx.test")

        exclude(group = "junit")

    }

    implementation("org.mnode.ical4j:ical4j:3.2.19") {

        exclude(group = "commons-logging", module = "commons-logging")

    }

    implementation("com.googlecode.ez-vcard:ez-vcard:0.12.1")



    // for tests

    androidTestImplementation(libs.androidx.arch.core.testing)

    androidTestImplementation(libs.androidx.test.core)

app/src/main/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ 
        <package android:name="at.techbee.jtx" />

        <package android:name="org.dmfs.tasks" />

        <package android:name="org.tasks" />

        <package android:name="foundation.e.tasks" />



        <!-- ICSx5 for Webcal feeds -->

        <package android:name="at.bitfire.icsdroid"/>

app/src/main/ic_launcher-web.png

−3.31 KiB (19.4 KiB)
Loading image diff...

app/src/main/kotlin/at/bitfire/davdroid/db/AppDatabase.kt

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase 
import at.bitfire.davdroid.R

import at.bitfire.davdroid.TextTable

import at.bitfire.davdroid.db.migration.AutoMigration12

import at.bitfire.davdroid.db.migration.AutoMigration13

import at.bitfire.davdroid.db.migration.AutoMigration16

import at.bitfire.davdroid.db.migration.AutoMigration18

import at.bitfire.davdroid.ui.AccountsActivity
@@ -49,7 +50,7 @@ import javax.inject.Singleton 
    AutoMigration(from = 15, to = 16, spec = AutoMigration16::class),

    AutoMigration(from = 14, to = 15),

    AutoMigration(from = 13, to = 14),

    AutoMigration(from = 12, to = 13),

    AutoMigration(from = 12, to = 13, spec = AutoMigration13::class),

    AutoMigration(from = 11, to = 12, spec = AutoMigration12::class),

    AutoMigration(from = 10, to = 11),

    AutoMigration(from = 9, to = 10)

app/src/main/kotlin/at/bitfire/davdroid/db/migration/AutoMigration13.kt

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * Copyright © All Contributors. See LICENSE and AUTHORS in the root directory for details.

 */



package at.bitfire.davdroid.db.migration





import android.content.Context

import androidx.room.DeleteColumn

import androidx.room.ProvidedAutoMigrationSpec

import androidx.room.migration.AutoMigrationSpec

import dagger.Binds

import dagger.Module

import dagger.hilt.InstallIn

import dagger.hilt.android.qualifiers.ApplicationContext

import dagger.hilt.components.SingletonComponent

import dagger.multibindings.IntoSet

import java.util.logging.Logger

import javax.inject.Inject



@ProvidedAutoMigrationSpec

@DeleteColumn(tableName = "service", columnName = "accountType")

@DeleteColumn(tableName = "service", columnName = "authState")

@DeleteColumn(tableName = "service", columnName = "addressBookAccountType")

class AutoMigration13 @Inject constructor(

    @ApplicationContext val context: Context,

    val logger: Logger

): AutoMigrationSpec {



    @Module

    @InstallIn(SingletonComponent::class)

    abstract class AutoMigrationModule {

        @Binds @IntoSet

        abstract fun provide(impl: AutoMigration13): AutoMigrationSpec

    }

}
 
 No newline at end of file