Fix lint issues

app/build.gradle

@@ -62,7 +62,8 @@ dependencies {
     implementation "com.android.support:appcompat-v7:$supportVersion"
     implementation "com.android.support:preference-v7:$supportVersion"
     implementation "com.android.support:cardview-v7:$supportVersion"
-    implementation "com.android.support:support-v4:$supportVersion"
+    implementation "com.android.support:support-v13:$supportVersion"
+    implementation "com.android.support:preference-v14:$supportVersion"
     implementation "com.android.support:design:$supportVersion"
     implementation "com.android.support:multidex:1.0.2"
 

app/src/main/AndroidManifest.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ch.dissem.apps.abit"
+    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="ch.dissem.apps.abit">
-    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -15,11 +14,12 @@
     <uses-permission android:name="android.permission.WRITE_CONTACTS" />
 
     <application
+        android:name="android.support.multidex.MultiDexApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
+        android:supportsRtl="true"
-        android:name="android.support.multidex.MultiDexApplication">
+        android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name">
@@ -173,20 +173,30 @@
             android:exported="false" />
 
         <!-- Receive Wi-Fi connection state changes -->
-        <receiver android:name=".listener.WifiReceiver" android:enabled="@bool/is_pre_api_21">
+        <receiver
+            android:name=".listener.WifiReceiver"
+            android:enabled="@bool/is_pre_api_21">
             <intent-filter>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+                <!-- This is bad for battery life, but needed on older devices to check
+                     if WiFi is available. Let's be honest, the whole app is bad for
+                     battery life. -->
+                <action
+                    android:name="android.net.conn.CONNECTIVITY_CHANGE"
+                    tools:ignore="BatteryLife" />
             </intent-filter>
         </receiver>
-        <receiver android:name=".service.StartServiceReceiver" android:enabled="@bool/is_post_api_21">
+        <receiver
+            android:name=".service.StartServiceReceiver"
+            android:enabled="@bool/is_post_api_21">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
+
         <service
             android:name=".service.StartupNodeOnWifiService"
-            android:permission="android.permission.BIND_JOB_SERVICE"
+            android:exported="true"
-            android:exported="true"/>
+            android:permission="android.permission.BIND_JOB_SERVICE" />
 
         <activity
             android:name=".StatusActivity"

app/src/main/java/ch/dissem/apps/abit/AddressDetailFragment.kt

@@ -204,7 +204,7 @@ class AddressDetailFragment : Fragment() {
          * The fragment argument representing the item ID that this fragment
          * represents.
          */
-        val ARG_ITEM = "item"
+        const val ARG_ITEM = "item"
-        val EXPORT_POSTFIX = ".keys.dat"
+        const val EXPORT_POSTFIX = ".keys.dat"
     }
 }

app/src/main/java/ch/dissem/apps/abit/Identicon.kt

@@ -92,7 +92,7 @@ class Identicon(input: BitmessageAddress) : Drawable() {
     override fun getOpacity() = PixelFormat.TRANSPARENT
 
     companion object {
-        private val SIZE = 9
+        private const val SIZE = 9
-        private val CENTER_COLUMN = 5
+        private const val CENTER_COLUMN = 5
     }
 }

app/src/main/java/ch/dissem/apps/abit/ImportIdentitiesFragment.kt

@@ -72,6 +72,6 @@ class ImportIdentitiesFragment : Fragment() {
     }
 
     companion object {
-        val WIF_DATA = "wif_data"
+        const val WIF_DATA = "wif_data"
     }
 }

app/src/main/java/ch/dissem/apps/abit/ListHolder.kt

@@ -19,7 +19,7 @@ package ch.dissem.apps.abit
 /**
  * @author Christian Basler
  */
-interface ListHolder<L> {
+interface ListHolder<in L> {
     fun updateList(label: L)
 
     fun setActivateOnItemClick(activateOnItemClick: Boolean)

app/src/main/java/ch/dissem/apps/abit/MainActivity.kt

@@ -507,7 +507,8 @@ class MainActivity : AppCompatActivity(), ListSelectionListener<Serializable> {
 
     fun setDetailView(fragment: Fragment) {
         if (hasDetailPane) {
-            supportFragmentManager.beginTransaction()
+            supportFragmentManager
+                .beginTransaction()
                 .replace(R.id.message_detail_container, fragment)
                 .commit()
         }

app/src/main/java/ch/dissem/apps/abit/MessageDetailFragment.kt

@@ -298,7 +298,7 @@ class MessageDetailFragment : Fragment() {
          * The fragment argument representing the item ID that this fragment
          * represents.
          */
-        val ARG_ITEM = "item"
+        const val ARG_ITEM = "item"
 
         fun isInTrash(item: Plaintext?) = item?.labels?.any { it.type == Label.Type.TRASH } == true
     }

app/src/main/java/ch/dissem/apps/abit/notification/ErrorNotification.kt

@@ -55,6 +55,6 @@ class ErrorNotification(ctx: Context) : AbstractNotification(ctx) {
     override val notificationId = ERROR_NOTIFICATION_ID
 
     companion object {
-        val ERROR_NOTIFICATION_ID = 4
+        const val ERROR_NOTIFICATION_ID = 4
     }
 }

app/src/main/java/ch/dissem/apps/abit/notification/NewMessageNotification.kt

@@ -128,7 +128,7 @@ class NewMessageNotification(ctx: Context) : AbstractNotification(ctx) {
     override val notificationId = NEW_MESSAGE_NOTIFICATION_ID
 
     companion object {
-        private val NEW_MESSAGE_NOTIFICATION_ID = 1
+        private const val NEW_MESSAGE_NOTIFICATION_ID = 1
         private val SPAN_EMPHASIS = StyleSpan(Typeface.BOLD)
     }
 }

app/src/main/java/ch/dissem/apps/abit/repository/AndroidInventory.kt

@@ -54,7 +54,7 @@ class AndroidInventory(private val sql: SqlHelper) : Inventory {
     private fun getCache(stream: Long): MutableMap<InventoryVector, Long> {
         fun addToCache(stream: Long): MutableMap<InventoryVector, Long> {
             val result: MutableMap<InventoryVector, Long> = ConcurrentHashMap()
-            cache.put(stream, result)
+            cache[stream] = result
 
             val projection = arrayOf(COLUMN_HASH, COLUMN_EXPIRES)
 
@@ -149,7 +149,7 @@ class AndroidInventory(private val sql: SqlHelper) : Inventory {
 
             sql.writableDatabase.insertOrThrow(TABLE_NAME, null, values)
 
-            getCache(objectMessage.stream).put(iv, objectMessage.expiresTime)
+            getCache(objectMessage.stream)[iv] = objectMessage.expiresTime
         } catch (e: SQLiteConstraintException) {
             LOG.trace(e.message, e)
         }

app/src/main/java/ch/dissem/apps/abit/repository/AndroidProofOfWorkRepository.kt

@@ -125,13 +125,13 @@ class AndroidProofOfWorkRepository(private val sql: SqlHelper) : ProofOfWorkRepo
     companion object {
         private val LOG = LoggerFactory.getLogger(AndroidProofOfWorkRepository::class.java)
 
-        private val TABLE_NAME = "POW"
+        private const val TABLE_NAME = "POW"
-        private val COLUMN_INITIAL_HASH = "initial_hash"
+        private const val COLUMN_INITIAL_HASH = "initial_hash"
-        private val COLUMN_DATA = "data"
+        private const val COLUMN_DATA = "data"
-        private val COLUMN_VERSION = "version"
+        private const val COLUMN_VERSION = "version"
-        private val COLUMN_NONCE_TRIALS_PER_BYTE = "nonce_trials_per_byte"
+        private const val COLUMN_NONCE_TRIALS_PER_BYTE = "nonce_trials_per_byte"
-        private val COLUMN_EXTRA_BYTES = "extra_bytes"
+        private const val COLUMN_EXTRA_BYTES = "extra_bytes"
-        private val COLUMN_EXPIRATION_TIME = "expiration_time"
+        private const val COLUMN_EXPIRATION_TIME = "expiration_time"
-        private val COLUMN_MESSAGE_ID = "message_id"
+        private const val COLUMN_MESSAGE_ID = "message_id"
     }
 }

app/src/main/java/ch/dissem/apps/abit/repository/SqlHelper.kt

@@ -90,7 +90,7 @@ class SqlHelper(private val ctx: Context) : SQLiteOpenHelper(ctx, DATABASE_NAME,
 
     companion object {
         // If you change the database schema, you must increment the database version.
-        private val DATABASE_VERSION = 7
+        private const val DATABASE_VERSION = 7
-        val DATABASE_NAME = "jabit.db"
+        const val DATABASE_NAME = "jabit.db"
     }
 }

app/src/main/java/ch/dissem/apps/abit/service/BitmessageService.kt

@@ -25,11 +25,9 @@ import android.net.ConnectivityManager
 import android.os.Handler
 import ch.dissem.apps.abit.notification.NetworkNotification
 import ch.dissem.apps.abit.notification.NetworkNotification.Companion.NETWORK_NOTIFICATION_ID
-import ch.dissem.apps.abit.util.NetworkUtils
 import ch.dissem.apps.abit.util.Preferences
 import ch.dissem.bitmessage.BitmessageContext
 import ch.dissem.bitmessage.utils.Property
-import org.jetbrains.anko.connectivityManager
 
 /**
  * Define a Service that returns an IBinder for the

app/src/main/java/ch/dissem/apps/abit/service/ProofOfWorkService.kt

@@ -19,7 +19,6 @@ package ch.dissem.apps.abit.service
 import android.app.Service
 import android.content.Intent
 import android.os.Binder
-import android.os.IBinder
 import android.support.v4.content.ContextCompat
 import ch.dissem.apps.abit.notification.ProofOfWorkNotification
 import ch.dissem.apps.abit.notification.ProofOfWorkNotification.Companion.ONGOING_NOTIFICATION_ID

app/src/main/java/ch/dissem/apps/abit/service/StartupNodeOnWifiService.kt

@@ -2,7 +2,6 @@ package ch.dissem.apps.abit.service
 
 import android.app.job.JobParameters
 import android.app.job.JobService
-import android.content.Intent
 import android.os.Build
 import android.support.annotation.RequiresApi
 import ch.dissem.apps.abit.util.NetworkUtils

app/src/main/java/ch/dissem/apps/abit/synchronization/SyncService.kt

@@ -18,7 +18,6 @@ package ch.dissem.apps.abit.synchronization
 
 import android.app.Service
 import android.content.Intent
-import android.os.IBinder
 
 /**
  * Define a Service that returns an IBinder for the

app/src/main/java/ch/dissem/apps/abit/util/Drawables.kt

@@ -44,7 +44,7 @@ import java.io.ByteArrayOutputStream
 object Drawables {
     private val LOG = LoggerFactory.getLogger(Drawables::class.java)
 
-    private val QR_CODE_SIZE = 350
+    private const val QR_CODE_SIZE = 350
 
     fun addIcon(ctx: Context, menu: Menu, menuItem: Int, icon: IIcon): MenuItem {
         val item = menu.findItem(menuItem)

app/src/main/java/ch/dissem/apps/abit/util/Observable.kt

@@ -25,7 +25,7 @@ class Observable<T>(value: T) {
      * To prevent memory leaks, the observer must be removed if it isn't used anymore.
      */
     fun addObserver(key: Any, observer: (T) -> Unit) {
-        observers.put(key, observer)
+        observers[key] = observer
     }
 
     /**

app/src/main/java/ch/dissem/apps/abit/util/PRNGFixes.java

@@ -152,7 +152,7 @@ public final class PRNGFixes {
      */
     private static class LinuxPRNGSecureRandomProvider extends Provider {
 
-        public LinuxPRNGSecureRandomProvider() {
+        LinuxPRNGSecureRandomProvider() {
             super("LinuxPRNG",
                 1.0,
                 "A Linux-specific random number provider that uses"

app/src/main/res/layout/contact_row.xml

@@ -37,11 +37,11 @@
         android:layout_alignTop="@+id/avatar"
         android:layout_toEndOf="@+id/avatar"
         android:ellipsize="end"
-        android:lines="1"
         android:paddingBottom="0dp"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
         android:paddingTop="0dp"
+        android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textStyle="bold"
         tools:text="Name" />
@@ -53,9 +53,9 @@
         android:layout_alignBottom="@+id/avatar"
         android:layout_toEndOf="@+id/avatar"
         android:ellipsize="marquee"
-        android:lines="1"
         android:paddingLeft="8dp"
         android:paddingRight="8dp"
+        android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceSmall"
         tools:text="BM-2cW0000000000000000000000000000000" />
 

app/src/main/res/layout/dialog_add_deterministic_identity.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
   ~ Copyright 2016 Christian Basler
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,8 +14,7 @@
   ~ limitations under the License.
   -->
 
-<android.support.constraint.ConstraintLayout
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -38,9 +36,9 @@
 
     <android.support.design.widget.TextInputLayout
         android:id="@+id/label_wrapper"
-        android:layout_marginTop="24dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@id/description">
 
@@ -82,7 +80,8 @@
             android:ems="10"
             android:hint="@string/number_of_identities"
             android:inputType="number"
-            android:text="1"/>
+            android:text="1"
+            tools:ignore="HardcodedText" />
 
     </android.support.design.widget.TextInputLayout>
 

app/src/main/res/layout/message_row.xml

@@ -26,6 +26,7 @@
         android:layout_height="match_parent"
         android:background="@drawable/bg_item_normal_state"
         android:clickable="true"
+        android:focusable="true"
         android:foreground="?attr/selectableItemBackground"
         tools:ignore="UselessParent">
 

app/src/main/res/layout/select_identity_row.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
   ~ Copyright 2016 Christian Basler
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,6 +30,7 @@
         android:paddingEnd="8dp"
         android:paddingStart="16dp"
         android:paddingTop="8dp"
+        android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceMedium"
         tools:text="Name" />
 
@@ -38,13 +38,13 @@
         android:id="@+id/address"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
         android:layout_alignParentBottom="true"
+        android:layout_alignParentStart="true"
         android:ellipsize="marquee"
-        android:lines="1"
         android:paddingBottom="8dp"
         android:paddingEnd="8dp"
         android:paddingStart="48dp"
+        android:singleLine="true"
         android:textAppearance="?android:attr/textAppearanceSmall"
         tools:text="BM-2cW0000000000000000000000000000000" />
 

app/src/main/res/values/styles.xml

@@ -5,7 +5,7 @@
         <item name="android:activatedBackgroundIndicator">@drawable/bg_item_activated</item>
         <item name="android:textColor">@color/colorPrimaryText</item>
         <item name="android:textColorSecondary">@color/colorSecondaryText</item>
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
     </style>
 
     <style name="CustomShowcaseTheme" parent="ShowcaseView">

app/src/main/res/xml/file_paths.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<paths xmlns:android="http://schemas.android.com/apk/res/android">
+<paths>
     <files-path name="exports" path="exports/"/>
 </paths>

app/src/main/res/xml/preferences.xml

@@ -1,64 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <SwitchPreferenceCompat
+    <android.support.v7.preference.SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="wifi_only"
         android:summary="@string/wifi_only_summary"
         android:title="@string/wifi_only" />
-    <SwitchPreferenceCompat
+    <android.support.v7.preference.SwitchPreferenceCompat
         android:defaultValue="true"
         android:key="request_acknowledgements"
         android:summary="@string/request_acknowledgements_summary"
         android:title="@string/request_acknowledgements" />
-    <EditTextPreference
+    <android.support.v7.preference.EditTextPreference
         android:inputType="textUri"
         android:key="trusted_node"
         android:summary="@string/trusted_node_summary"
         android:title="@string/trusted_node" />
-    <EditTextPreference
+    <android.support.v7.preference.EditTextPreference
         android:defaultValue="120"
         android:inputType="number"
         android:key="sync_timeout"
         android:summary="@string/sync_timeout_summary"
         android:title="@string/sync_timeout" />
-    <SwitchPreferenceCompat
+    <android.support.v7.preference.SwitchPreferenceCompat
         android:defaultValue="false"
         android:dependency="trusted_node"
         android:key="server_pow"
         android:summary="@string/server_pow_summary"
-        android:title="@string/server_pow"
+        android:title="@string/server_pow" />
-        />
+    <android.support.v7.preference.Preference
-    <Preference
         android:key="about"
         android:summary="@string/about_summary"
-        android:title="@string/about"
+        android:title="@string/about" />
-        />
+    <android.support.v7.preference.Preference
-    <Preference
         android:key="help_out"
         android:summary="@string/help_out_summary"
         android:title="@string/help_out">
         <intent
             android:action="android.intent.action.VIEW"
             android:data="@string/help_out_link" />
-    </Preference>
+    </android.support.v7.preference.Preference>
-    <Preference
+    <android.support.v7.preference.Preference
         android:key="cleanup"
-        android:title="@string/cleanup"
         android:summary="@string/cleanup_summary"
-        />
+        android:title="@string/cleanup" />
-    <Preference
+    <android.support.v7.preference.Preference
         android:key="export"
-        android:title="@string/export_data"
         android:summary="@string/export_data_summary"
-        />
+        android:title="@string/export_data" />
-    <Preference
+    <android.support.v7.preference.Preference
         android:key="import"
-        android:title="@string/import_data"
         android:summary="@string/import_data_summary"
-        />
+        android:title="@string/import_data" />
-    <Preference
+    <android.support.v7.preference.Preference
         android:key="status"
         android:summary="@string/status_summary"
-        android:title="@string/status"
+        android:title="@string/status" />
-        />
+</android.support.v7.preference.PreferenceScreen>
-</PreferenceScreen>

app/src/test/java/ch/dissem/bitmessage/repository/AndroidAddressRepositoryTest.kt

@@ -17,7 +17,7 @@
 package ch.dissem.bitmessage.repository
 
 import android.os.Build
-import ch.dissem.apps.abit.BuildConfig
+import android.os.Build.VERSION_CODES.LOLLIPOP
 import ch.dissem.apps.abit.repository.AndroidAddressRepository
 import ch.dissem.apps.abit.repository.SqlHelper
 import ch.dissem.bitmessage.entity.BitmessageAddress
@@ -32,7 +32,7 @@ import org.robolectric.RuntimeEnvironment
 import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-@Config(sdk = intArrayOf(Build.VERSION_CODES.LOLLIPOP), packageName = "ch.dissem.apps.abit")
+@Config(sdk = [LOLLIPOP], packageName = "ch.dissem.apps.abit")
 class AndroidAddressRepositoryTest : TestBase() {
     private val contactA = "BM-2cW7cD5cDQJDNkE7ibmyTxfvGAmnPqa9Vt"
     private val contactB = "BM-2cTtkBnb4BUYDndTKun6D9PjtueP2h1bQj"

app/src/test/java/ch/dissem/bitmessage/repository/AndroidInventoryTest.kt

@@ -17,7 +17,7 @@
 package ch.dissem.bitmessage.repository
 
 import android.os.Build
-import ch.dissem.apps.abit.BuildConfig
+import android.os.Build.VERSION_CODES.LOLLIPOP
 import ch.dissem.apps.abit.repository.AndroidInventory
 import ch.dissem.apps.abit.repository.SqlHelper
 import ch.dissem.bitmessage.entity.BitmessageAddress
@@ -40,7 +40,7 @@ import org.robolectric.annotation.Config
 import java.util.*
 
 @RunWith(RobolectricTestRunner::class)
-@Config(sdk = intArrayOf(Build.VERSION_CODES.LOLLIPOP), packageName = "ch.dissem.apps.abit")
+@Config(sdk = [LOLLIPOP], packageName = "ch.dissem.apps.abit")
 class AndroidInventoryTest : TestBase() {
     private lateinit var inventory: Inventory
 
@@ -141,5 +141,6 @@ class AndroidInventoryTest : TestBase() {
         payload = payload
     )
 
-    private val getPubkey: GetPubkey = GetPubkey(BitmessageAddress("BM-2cW7cD5cDQJDNkE7ibmyTxfvGAmnPqa9Vt"))
+    private val getPubkey: GetPubkey =
+        GetPubkey(BitmessageAddress("BM-2cW7cD5cDQJDNkE7ibmyTxfvGAmnPqa9Vt"))
 }

app/src/test/java/ch/dissem/bitmessage/repository/AndroidLabelRepositoryTest.kt

@@ -17,6 +17,7 @@
 package ch.dissem.bitmessage.repository
 
 import android.os.Build
+import android.os.Build.VERSION_CODES.LOLLIPOP
 import ch.dissem.apps.abit.repository.AndroidLabelRepository
 import ch.dissem.apps.abit.repository.SqlHelper
 import ch.dissem.bitmessage.entity.valueobject.Label
@@ -30,7 +31,7 @@ import org.robolectric.RuntimeEnvironment
 import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-@Config(sdk = intArrayOf(Build.VERSION_CODES.LOLLIPOP), packageName = "ch.dissem.apps.abit")
+@Config(sdk = [LOLLIPOP], packageName = "ch.dissem.apps.abit")
 class AndroidLabelRepositoryTest : TestBase() {
 
     private lateinit var repo: LabelRepository

app/src/test/java/ch/dissem/bitmessage/repository/AndroidMessageRepositoryTest.kt

@@ -16,7 +16,7 @@
 
 package ch.dissem.bitmessage.repository
 
-import android.os.Build
+import android.os.Build.VERSION_CODES.LOLLIPOP
 import ch.dissem.apps.abit.repository.AndroidAddressRepository
 import ch.dissem.apps.abit.repository.AndroidLabelRepository
 import ch.dissem.apps.abit.repository.AndroidMessageRepository
@@ -31,7 +31,6 @@ import ch.dissem.bitmessage.entity.valueobject.ExtendedEncoding
 import ch.dissem.bitmessage.entity.valueobject.Label
 import ch.dissem.bitmessage.entity.valueobject.PrivateKey
 import ch.dissem.bitmessage.entity.valueobject.extended.Message
-import ch.dissem.bitmessage.ports.LabelRepository
 import ch.dissem.bitmessage.ports.MessageRepository
 import ch.dissem.bitmessage.utils.UnixTime
 import org.hamcrest.BaseMatcher
@@ -48,7 +47,7 @@ import org.robolectric.annotation.Config
 import java.util.*
 
 @RunWith(RobolectricTestRunner::class)
-@Config(sdk = intArrayOf(Build.VERSION_CODES.LOLLIPOP), packageName = "ch.dissem.apps.abit")
+@Config(sdk = [LOLLIPOP], packageName = "ch.dissem.apps.abit")
 class AndroidMessageRepositoryTest : TestBase() {
     private lateinit var contactA: BitmessageAddress
     private lateinit var contactB: BitmessageAddress

app/src/test/java/ch/dissem/bitmessage/repository/AndroidNodeRegistryTest.kt

@@ -17,7 +17,7 @@
 package ch.dissem.bitmessage.repository
 
 import android.os.Build
-import ch.dissem.apps.abit.BuildConfig
+import android.os.Build.VERSION_CODES.LOLLIPOP
 import ch.dissem.apps.abit.repository.AndroidNodeRegistry
 import ch.dissem.apps.abit.repository.SqlHelper
 import ch.dissem.bitmessage.entity.valueobject.NetworkAddress
@@ -39,7 +39,7 @@ import java.util.*
  * as the initial nodes' IP addresses are determined by DNS lookup.
  */
 @RunWith(RobolectricTestRunner::class)
-@Config(sdk = intArrayOf(Build.VERSION_CODES.LOLLIPOP), packageName = "ch.dissem.apps.abit")
+@Config(sdk = [LOLLIPOP], packageName = "ch.dissem.apps.abit")
 class AndroidNodeRegistryTest : TestBase() {
     private lateinit var registry: NodeRegistry
 

app/src/test/java/ch/dissem/bitmessage/repository/AndroidProofOfWorkRepositoryTest.kt

@@ -46,7 +46,7 @@ import kotlin.properties.Delegates
  * @author Christian Basler
  */
 @RunWith(RobolectricTestRunner::class)
-@Config(sdk = intArrayOf(LOLLIPOP), packageName = "ch.dissem.apps.abit")
+@Config(sdk = [LOLLIPOP], packageName = "ch.dissem.apps.abit")
 class AndroidProofOfWorkRepositoryTest : TestBase() {
     private lateinit var repo: ProofOfWorkRepository
     private lateinit var addressRepo: AddressRepository