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

Commit 2774011c authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '1723-Update_to_v4_3_9' into 'main' 

1723-Update to v4.3.9-ose

See merge request !112
parents 3df75c32 2522378a

app/build.gradle

+6 −8
Original line number Diff line number Diff line
@@ -18,14 +18,14 @@ android { 
    defaultConfig {

        applicationId "foundation.e.accountmanager"



        versionCode 403080000

        versionName '4.3.8'

        versionCode 403090002

        versionName '4.3.9'



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



        setProperty "archivesBaseName", "davx5-ose-" + getVersionName()



        minSdkVersion 24        // Android 7.1

        minSdkVersion 24        // Android 7.0

        targetSdkVersion 33     // Android 13



        buildConfigField "String", "userAgent", "\"DAVx5\""
@@ -205,14 +205,11 @@ dependencies { 
    implementation "com.squareup.okhttp3:logging-interceptor:${versions.okhttp}"

    //noinspection GradleDependency - don't update until API level 26 (Android 8) is the minimum API [https://github.com/bitfireAT/davx5/issues/130]

    implementation 'commons-io:commons-io:2.8.0'

    //noinspection GradleDependency - dnsjava 3+ needs Java 8/Android 7

    implementation 'dnsjava:dnsjava:2.1.9'

    implementation 'dnsjava:dnsjava:3.5.2'

    implementation "io.github.nsk90:kstatemachine-jvm:0.22.1"

    implementation 'net.openid:appauth:0.11.1'

    //noinspection GradleDependency

    implementation "org.apache.commons:commons-collections4:${versions.commonsCollections}"

    //noinspection GradleDependency

    implementation "org.apache.commons:commons-lang3:${versions.commonsLang}"

    //noinspection GradleDependency

    implementation "org.apache.commons:commons-text:${versions.commonsText}"

    implementation 'junit:junit:4.13.2'

    implementation 'foundation.e:elib:0.0.1-alpha11'
@@ -245,6 +242,7 @@ dependencies { 
    androidTestImplementation 'junit:junit:4.13.2'



    testImplementation "com.squareup.okhttp3:mockwebserver:${versions.okhttp}"

    testImplementation 'junit:junit:4.13.2'

}



def retrieveKey(String keyName) {

app/proguard-rules-release.pro

+4 −0
Original line number Diff line number Diff line
@@ -70,9 +70,13 @@ 
# Additional rules which are now required since missing classes can't be ignored in R8 anymore.

# [https://developer.android.com/build/releases/past-releases/agp-7-0-0-release-notes#r8-missing-class-warning]

-dontwarn com.android.org.conscrypt.SSLParametersImpl

-dontwarn com.sun.jna.**                 # dnsjava

-dontwarn groovy.**

-dontwarn java.beans.Transient

-dontwarn javax.naming.NamingException   # dnsjava

-dontwarn javax.naming.directory.**      # dnsjava

-dontwarn junit.textui.TestRunner

-dontwarn lombok.**                      # dnsjava

-dontwarn org.apache.harmony.xnet.provider.jsse.SSLParametersImpl

-dontwarn org.bouncycastle.jsse.**

-dontwarn org.codehaus.groovy.**

app/src/androidTest/kotlin/at/bitfire/davdroid/servicedetection/RefreshCollectionsWorkerTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -143,13 +143,13 @@ class RefreshCollectionsWorkerTest { 
    }



    @Test

    fun testQueryHomesets() {

    fun testDiscoverHomesets() {

        val service = createTestService(Service.TYPE_CARDDAV)!!

        val baseUrl = mockServer.url(PATH_CARDDAV + SUBPATH_PRINCIPAL)



        // Query home sets

        RefreshCollectionsWorker.Refresher(db, service, settings, client.okHttpClient)

            .queryHomeSets(baseUrl)

            .discoverHomesets(baseUrl)



        // Check home sets have been saved to database

        assertEquals(mockServer.url("$PATH_CARDDAV$SUBPATH_ADDRESSBOOK_HOMESET/"), db.homeSetDao().getByService(service.id).first().url)

app/src/androidTest/kotlin/at/bitfire/davdroid/ui/webdav/AddWebdavMountActivityTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
package at.bitfire.davdroid.ui.webdav



import android.security.NetworkSecurityPolicy

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.core.app.ApplicationProvider

import at.bitfire.davdroid.db.AppDatabase

import at.bitfire.davdroid.db.WebDavMount

import dagger.hilt.android.testing.HiltAndroidRule
@@ -34,7 +34,7 @@ class AddWebdavMountActivityTest { 
    fun setUp() {

        hiltRule.inject()



        model = spyk(AddWebdavMountActivity.Model(InstrumentationRegistry.getInstrumentation().targetContext, db))

        model = spyk(AddWebdavMountActivity.Model(ApplicationProvider.getApplicationContext(), db))



        Assume.assumeTrue(NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted)

    }

app/src/main/kotlin/at/bitfire/davdroid/App.kt

+5 −5
Original line number Diff line number Diff line
@@ -63,6 +63,11 @@ class App: Application(), Thread.UncaughtExceptionHandler, Configuration.Provide 


    @Inject lateinit var workerFactory: HiltWorkerFactory



    override val workManagerConfiguration: Configuration

        get() = Configuration.Builder()

            .setWorkerFactory(workerFactory)

            .build()



    override fun onCreate() {

        super.onCreate()

        Logger.initialize(this)
@@ -105,11 +110,6 @@ class App: Application(), Thread.UncaughtExceptionHandler, Configuration.Provide 
        }

    }



    override fun getWorkManagerConfiguration() =

        Configuration.Builder()

            .setWorkerFactory(workerFactory)

            .build()



    override fun uncaughtException(t: Thread, e: Throwable) {

        Logger.log.log(Level.SEVERE, "Unhandled exception!", e)