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

Commit da81482b authored by Ricki Hirner's avatar Ricki Hirner
Browse files

lint

parent f453d069

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

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import at.bitfire.davdroid.ui.DebugInfoActivity 
import at.bitfire.davdroid.ui.NotificationUtils

import java.util.logging.Level

import kotlin.concurrent.thread

import kotlin.system.exitProcess



@Suppress("unused")

class App: MultiDexApplication(), Thread.UncaughtExceptionHandler {
@@ -92,7 +93,7 @@ class App: MultiDexApplication(), Thread.UncaughtExceptionHandler { 
        intent.putExtra(DebugInfoActivity.KEY_THROWABLE, e)

        startActivity(intent)



        System.exit(1)

        exitProcess(1)

    }



}

app/src/main/java/at/bitfire/davdroid/CompatUtils.kt

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ package at.bitfire.davdroid 
import android.content.ContentProviderClient

import android.os.Build



@Suppress("DEPRECATION")

fun ContentProviderClient.closeCompat() {

    if (Build.VERSION.SDK_INT >= 24)

        close()

app/src/main/java/at/bitfire/davdroid/DavService.kt

+2 −2
Original line number Diff line number Diff line
@@ -150,9 +150,9 @@ class DavService: android.app.Service() { 
        /**

         * Checks if the given URL defines home sets and adds them to the home set list.

         *

         * @throws IOException

         * @throws java.io.IOException

         * @throws HttpException

         * @throws DavException

         * @throws at.bitfire.dav4jvm.exception.DavException

         */

        fun queryHomeSets(client: OkHttpClient, url: HttpUrl, recurse: Boolean = true) {

            val related = mutableSetOf<HttpUrl>()

app/src/main/java/at/bitfire/davdroid/DavUtils.kt

+12 −8
Original line number Diff line number Diff line
@@ -51,6 +51,8 @@ object DavUtils { 
               get the active DNS servers). */

            val connectivity = context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager

            val activeLink = connectivity.getLinkProperties(connectivity.activeNetwork)

            if (activeLink != null) {

                // get DNS servers of active network link and set them for dnsjava so that it can send SRV queries

                val simpleResolvers = activeLink.dnsServers.map {

                    Logger.log.fine("Using DNS server ${it.hostAddress}")

                    val resolver = SimpleResolver()
@@ -59,6 +61,8 @@ object DavUtils { 
                }

                val resolver = ExtendedResolver(simpleResolvers.toTypedArray())

                lookup.setResolver(resolver)

            } else

                Logger.log.severe("Couldn't determine DNS servers, dnsjava queries (SRV/TXT records) won't work")

        }

    }

app/src/main/java/at/bitfire/davdroid/log/Logger.kt

+2 −2
Original line number Diff line number Diff line
@@ -13,12 +13,12 @@ import android.app.PendingIntent 
import android.content.Context

import android.content.Intent

import android.content.SharedPreferences

import android.preference.PreferenceManager

import android.util.Log

import android.widget.Toast

import androidx.core.app.NotificationCompat

import androidx.core.app.NotificationManagerCompat

import androidx.core.content.FileProvider

import androidx.preference.PreferenceManager

import at.bitfire.davdroid.R

import at.bitfire.davdroid.ui.AppSettingsActivity

import at.bitfire.davdroid.ui.NotificationUtils
@@ -32,7 +32,7 @@ object Logger : SharedPreferences.OnSharedPreferenceChangeListener { 


    private const val LOG_TO_FILE = "log_to_file"



    val log = java.util.logging.Logger.getLogger("davx5")!!

    val log = java.util.logging.Logger.getLogger("davx5")



    private lateinit var context: Context

    private lateinit var preferences: SharedPreferences