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

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

Code cleanup (lint)

parent 41c9f189
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ buildscript {
    }

    dependencies {
        classpath 'com.android.tools.build:gradle:3.1.1'
        classpath 'com.android.tools.build:gradle:3.1.2'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
        classpath "org.jetbrains.dokka:dokka-android-gradle-plugin:${dokka_version}"
    }
@@ -60,7 +60,7 @@ dependencies {
    compile "com.squareup.okhttp3:okhttp:$okhttp_version"

    androidTestCompile "com.squareup.okhttp3:mockwebserver:$okhttp_version"
    androidTestCompile 'com.android.support.test:runner:1.0.1'
    androidTestCompile 'com.android.support.test:runner:1.0.2'

    testCompile "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
    testCompile 'junit:junit:4.12'
+2 −2
Original line number Diff line number Diff line
@@ -81,11 +81,11 @@ class DavCollectionTest {
        val members = collection.members.iterator()
        val member1 = members.next()
        assertEquals(sampleUrl().newBuilder().addPathSegment("test.doc").build(), member1.location)
        assertEquals("00001-abcd1", member1.properties.get(GetETag::class.java)!!.eTag)
        assertEquals("00001-abcd1", member1.properties[GetETag::class.java]!!.eTag)

        val member2 = members.next()
        assertEquals(sampleUrl().newBuilder().addPathSegment("vcard.vcf").build(), member2.location)
        assertEquals("00002-abcd1", member2.properties.get(GetETag::class.java)!!.eTag)
        assertEquals("00002-abcd1", member2.properties[GetETag::class.java]!!.eTag)

        assertEquals(1, collection.removedMembers.size)
        val removedMember = collection.removedMembers.first()
+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ class BasicDigestAuthHandler(
): Authenticator, Interceptor {

    companion object {
        private val HEADER_AUTHENTICATE = "WWW-Authenticate"
        private val HEADER_AUTHORIZATION = "Authorization"
        private const val HEADER_AUTHENTICATE = "WWW-Authenticate"
        private const val HEADER_AUTHORIZATION = "Authorization"

        // cached digest parameters
        var clientNonce = h(UUID.randomUUID().toString())
+2 −3
Original line number Diff line number Diff line
@@ -9,9 +9,8 @@
package at.bitfire.dav4android

import okhttp3.Response
import java.util.LinkedList
import java.util.*
import java.util.regex.Pattern
import kotlin.collections.HashMap

object HttpUtils {

@@ -142,7 +141,7 @@ object HttpUtils {

        override fun toString(): String {
            val s = StringBuilder()
            s.append(name + "(")
            s.append("$name(")
            for ((name, value) in params)
                s.append("$name=[$value],")
            s.append(")")
+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ class PropertyCollection {
        }
    }

    fun getMap(): Map<Property.Name, Property?> =
    private fun getMap(): Map<Property.Name, Property?> =
            if (!properties.isInitialized())
                mapOf()
            else
Loading