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

Commit 48478c42 authored by Ricki Hirner's avatar Ricki Hirner
Browse files

Finish renaming dav4android → dav4jvm (thanks @mbiebl)

parent f4823f95

app/src/androidTest/java/at/bitfire/davdroid/model/CollectionInfoTest.kt

+2 −2
Original line number Original line Diff line number Diff line
@@ -10,8 +10,8 @@ package at.bitfire.davdroid.model 




import android.content.ContentValues

import android.content.ContentValues

import androidx.test.filters.SmallTest

import androidx.test.filters.SmallTest

import at.bitfire.dav4android.DavResource

import at.bitfire.dav4jvm.DavResource

import at.bitfire.dav4android.property.ResourceType

import at.bitfire.dav4jvm.property.ResourceType

import at.bitfire.davdroid.HttpClient

import at.bitfire.davdroid.HttpClient

import at.bitfire.davdroid.model.ServiceDB.Collections

import at.bitfire.davdroid.model.ServiceDB.Collections

import okhttp3.HttpUrl

import okhttp3.HttpUrl

app/src/androidTest/java/at/bitfire/davdroid/ui/setup/DavResourceFinderTest.kt

+3 −3
Original line number Original line Diff line number Diff line
@@ -10,9 +10,9 @@ package at.bitfire.davdroid.ui.setup 




import androidx.test.filters.SmallTest

import androidx.test.filters.SmallTest

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.platform.app.InstrumentationRegistry

import at.bitfire.dav4android.DavResource

import at.bitfire.dav4jvm.DavResource

import at.bitfire.dav4android.property.AddressbookHomeSet

import at.bitfire.dav4jvm.property.AddressbookHomeSet

import at.bitfire.dav4android.property.ResourceType

import at.bitfire.dav4jvm.property.ResourceType

import at.bitfire.davdroid.HttpClient

import at.bitfire.davdroid.HttpClient

import at.bitfire.davdroid.log.Logger

import at.bitfire.davdroid.log.Logger

import at.bitfire.davdroid.model.Credentials

import at.bitfire.davdroid.model.Credentials

app/src/main/java/at/bitfire/davdroid/syncadapter/SyncAdapterService.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ abstract class SyncAdapterService: Service() { 
            }

            }





            try {

            try {

                // required for dav4android (ServiceLoader)

                // required for dav4jvm (ServiceLoader)

                Thread.currentThread().contextClassLoader = context.classLoader

                Thread.currentThread().contextClassLoader = context.classLoader





                SyncManager.cancelNotifications(NotificationManagerCompat.from(context), authority, account)

                SyncManager.cancelNotifications(NotificationManagerCompat.from(context), authority, account)

scripts/adb-log.sh

+1 −1
Original line number Original line Diff line number Diff line 
#!/bin/sh

#!/bin/sh

adb shell setprop log.tag.cert4android VERBOSE

adb shell setprop log.tag.cert4android VERBOSE

adb shell setprop log.tag.davdroid VERBOSE

adb shell setprop log.tag.davdroid VERBOSE

adb shell setprop log.tag.dav4android VERBOSE
 
adb shell setprop log.tag.dav4jvm VERBOSE