Update dependencies, lint

5 files changed, 9 insertions, 11 deletions

diff --git a/build.gradle b/build.gradle
index 715ccbc..4001e1f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,15 +66,15 @@ dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata:2.1.0'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0'
-    implementation 'com.google.android.material:material:1.2.0-alpha03'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
+    implementation 'com.google.android.material:material:1.2.0-alpha05'
     implementation "org.conscrypt:conscrypt-android:${versions.conscrypt}"
 
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test:rules:1.2.0'
-    androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.12.5'
+    androidTestImplementation 'com.squareup.okhttp3:mockwebserver:3.12.10'
     androidTestImplementation 'commons-io:commons-io:2.6'
     androidTestImplementation 'org.apache.commons:commons-lang3:3.9'
 
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index d3104a2..75378c7 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="at.bitfire.cert4android">
 
     <application>
diff --git a/src/main/java/at/bitfire/cert4android/CustomCertService.kt b/src/main/java/at/bitfire/cert4android/CustomCertService.kt
index a35ef8a..4c5e44b 100644
--- a/src/main/java/at/bitfire/cert4android/CustomCertService.kt
+++ b/src/main/java/at/bitfire/cert4android/CustomCertService.kt
@@ -234,7 +234,7 @@ class CustomCertService: Service() {
                             putExtra(EXTRA_TRUSTED, false)
                         }
 
-                        val id = Arrays.hashCode(raw)
+                        val id = raw.contentHashCode()
                         val notify = NotificationCompat.Builder(this@CustomCertService, NotificationUtils.CHANNEL_CERTIFICATES)
                                 .setSmallIcon(R.drawable.ic_lock_open_white)
                                 .setContentTitle(this@CustomCertService.getString(R.string.certificate_notification_connection_security))
diff --git a/src/main/java/at/bitfire/cert4android/TrustCertificateActivity.kt b/src/main/java/at/bitfire/cert4android/TrustCertificateActivity.kt
index f8bfe0f..3e74e15 100644
--- a/src/main/java/at/bitfire/cert4android/TrustCertificateActivity.kt
+++ b/src/main/java/at/bitfire/cert4android/TrustCertificateActivity.kt
@@ -125,7 +125,7 @@ class TrustCertificateActivity: AppCompatActivity() {
             }
         }
 
-        fun fingerprint(cert: X509Certificate, algorithm: String) =
+        private fun fingerprint(cert: X509Certificate, algorithm: String) =
                 try {
                     val md = MessageDigest.getInstance(algorithm)
                     "$algorithm: ${hexString(md.digest(cert.encoded))}"
@@ -133,7 +133,7 @@ class TrustCertificateActivity: AppCompatActivity() {
                     e.message ?: "Couldn't create message digest"
                 }
 
-        fun hexString(data: ByteArray): String {
+        private fun hexString(data: ByteArray): String {
             val str = data.mapTo(LinkedList()) { String.format("%02x", it) }
             return str.joinToString(":")
         }
diff --git a/src/main/res/layout/activity_trust_certificate.xml b/src/main/res/layout/activity_trust_certificate.xml
index acdfffb..3b74b6c 100644
--- a/src/main/res/layout/activity_trust_certificate.xml
+++ b/src/main/res/layout/activity_trust_certificate.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <data>
         <variable