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

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

Lint cleanup

parent 267e7372

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

+1 −1
Original line number Diff line number Diff line
@@ -24,6 +24,6 @@ abstract class AndroidSingleton<T> { 
        return newSingleton

    }



    abstract protected fun createInstance(context: Context): T

    protected abstract fun createInstance(context: Context): T



}
 
 No newline at end of file

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

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ import at.bitfire.dav4jvm.UrlUtils 
import at.bitfire.dav4jvm.exception.HttpException

import at.bitfire.dav4jvm.property.*

import at.bitfire.davdroid.log.Logger

import at.bitfire.davdroid.model.*

import at.bitfire.davdroid.model.Collection

import at.bitfire.davdroid.model.*

import at.bitfire.davdroid.settings.AccountSettings

import at.bitfire.davdroid.ui.DebugInfoActivity

import at.bitfire.davdroid.ui.NotificationUtils
@@ -299,7 +299,7 @@ class DavService: IntentService("DavService") { 
                val itHomeSets = homeSets.iterator()

                while (itHomeSets.hasNext()) {

                    val (homeSetUrl, homeSet) = itHomeSets.next()

                    Logger.log.fine("Listing home set ${homeSetUrl}")

                    Logger.log.fine("Listing home set $homeSetUrl")



                    try {

                        DavResource(httpClient, homeSetUrl).propfind(1, *DAV_COLLECTION_PROPERTIES) { response, relation ->

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

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ object DavUtils { 


    fun lastSegmentOfUrl(url: HttpUrl): String {

        // the list returned by HttpUrl.pathSegments() is unmodifiable, so we have to create a copy

        val segments = LinkedList<String>(url.pathSegments)

        val segments = LinkedList(url.pathSegments)

        segments.reverse()



        return segments.firstOrNull { it.isNotEmpty() } ?: "/"

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

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ class ForegroundService : Service() { 


        fun startIfEnabled(context: Context) {

            if (isEnabled(context)) {

                val serviceIntent = Intent(ForegroundService.ACTION_FOREGROUND, null, context, ForegroundService::class.java)

                val serviceIntent = Intent(ACTION_FOREGROUND, null, context, ForegroundService::class.java)

                if (Build.VERSION.SDK_INT >= 26)

                    context.startForegroundService(serviceIntent)

                else

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

+2 −2
Original line number Diff line number Diff line
@@ -171,11 +171,11 @@ class HttpClient private constructor( 
        }



        fun build(): HttpClient {

            val trustManager = certManager ?: {

            val trustManager = certManager ?: run {

                val factory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm())

                factory.init(null as KeyStore?)

                factory.trustManagers.first() as X509TrustManager

            }()

            }



            val hostnameVerifier = certManager?.hostnameVerifier(OkHostnameVerifier)

                    ?: OkHostnameVerifier