Fixed Lint issues

app/build.gradle.kts

@@ -117,9 +117,6 @@ dependencies {
 
   implementation(project(":lib"))
 
-  implementation(project(":invokerannotations"))
-  kapt(project(":invokergenerator"))
-
   testImplementation("android.arch.persistence.room:testing:1.0.0-alpha9")
   testImplementation("junit:junit:4.12")
 

app/src/main/java/de/kuschku/quasseldroid_ng/persistence/PersistentSession.kt

@@ -22,5 +22,6 @@ class PersistentSession : ISession {
   override val networkConfig: NetworkConfig? = null
 
   override fun close() = Unit
-  override val state = BehaviorSubject.createDefault(ConnectionState.DISCONNECTED)
+  override val state: BehaviorSubject<ConnectionState>
+    = BehaviorSubject.createDefault(ConnectionState.DISCONNECTED)
 }

app/src/main/java/de/kuschku/quasseldroid_ng/persistence/QuasselDatabase.kt

@@ -38,7 +38,7 @@ abstract class QuasselDatabase : RoomDatabase() {
   ) {
     class MessageTypeConverters {
       @TypeConverter
-      fun convertInstant(value: Long) = Instant.ofEpochMilli(value)
+      fun convertInstant(value: Long): Instant = Instant.ofEpochMilli(value)
 
       @TypeConverter
       fun convertInstant(value: Instant) = value.toEpochMilli()

app/src/main/java/de/kuschku/quasseldroid_ng/ui/chat/ChatActivity.kt

 package de.kuschku.quasseldroid_ng.ui.chat
 
 import android.app.Activity
+import android.arch.lifecycle.LiveData
 import android.arch.lifecycle.Observer
 import android.content.Context
 import android.os.Bundle
@@ -13,6 +14,7 @@ import android.widget.Button
 import android.widget.TextView
 import butterknife.BindView
 import butterknife.ButterKnife
+import de.kuschku.libquassel.quassel.syncables.BufferViewManager
 import de.kuschku.libquassel.session.*
 import de.kuschku.libquassel.util.compatibility.LoggingHandler
 import de.kuschku.libquassel.util.compatibility.LoggingHandler.LogLevel.INFO
@@ -41,10 +43,10 @@ class ChatActivity : ServiceBoundActivity() {
 
   private val handler = AndroidHandlerThread("Chat")
 
-  private val sessionManager = backend.map(Backend::sessionManager)
+  private val sessionManager: LiveData<SessionManager?> = backend.map(Backend::sessionManager)
   private val state = sessionManager.switchMapRx(SessionManager::state)
 
-  private val bufferViewManager
+  private val bufferViewManager: LiveData<BufferViewManager?>
     = sessionManager.switchMapRx(SessionManager::session).map(ISession::bufferViewManager)
   private val bufferViewConfigs = bufferViewManager.switchMapRx { manager ->
     manager.bufferViewConfigIds.map { ids ->

app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountAdapter.kt

 package de.kuschku.quasseldroid_ng.ui.setup.accounts
 
+import android.annotation.SuppressLint
 import android.arch.paging.PagedListAdapter
 import android.support.v7.recyclerview.extensions.DiffCallback
 import android.support.v7.widget.AppCompatImageButton
@@ -76,7 +77,8 @@ class AccountAdapter :
     selectionListeners.remove(f)
   }
 
-  override fun onBindViewHolder(holder: AccountViewHolder, position: Int) {
+  override fun onBindViewHolder(holder: AccountViewHolder, @SuppressLint(
+    "RecyclerView") position: Int) {
     when (holder) {
       is AccountViewHolder.Item -> {
         val account = getItem(position)

app/src/main/java/de/kuschku/quasseldroid_ng/ui/setup/accounts/AccountSelectionSlide.kt

@@ -43,18 +43,18 @@ class AccountSelectionSlide : SlideFragment() {
                                savedInstanceState: Bundle?): View {
     val view = inflater.inflate(R.layout.setup_select_account, container, false)
     ButterKnife.bind(this, view)
-    val accountViewmodel = ViewModelProviders.of(this).get(
+    val accountViewModel = ViewModelProviders.of(this).get(
       AccountViewModel::class.java)
     val firstObserver = object : Observer<PagedList<AccountDatabase.Account>?> {
       override fun onChanged(t: PagedList<AccountDatabase.Account>?) {
         if (t?.isEmpty() != false)
           startActivityForResult(Intent(context, AccountSetupActivity::class.java),
                                  REQUEST_CREATE_FIRST)
-        accountViewmodel.accounts.removeObserver(this)
+        accountViewModel.accounts.removeObserver(this)
       }
     }
-    accountViewmodel.accounts.observe(this, firstObserver)
-    accountViewmodel.accounts.observe(this, Observer(adapter::setList))
+    accountViewModel.accounts.observe(this, firstObserver)
+    accountViewModel.accounts.observe(this, Observer(adapter::setList))
     accountList.layoutManager = LinearLayoutManager(context)
     accountList.itemAnimator = DefaultItemAnimator()
     accountList.adapter = adapter

app/src/main/java/de/kuschku/quasseldroid_ng/util/Patterns.kt

 package de.kuschku.quasseldroid_ng.util
 
+import org.intellij.lang.annotations.Language
 import java.util.regex.Pattern
 
 @SuppressWarnings("Access")
 object Patterns {
+  @Language("RegExp")
   const val IPv4
     = "(?:(?:[0-1]?[0-9]?[0-9]|2[0-5][0-5])\\.){3}(?:[0-1]?[0-9]?[0-9]|2[0-5][0-5])"
 
+  @Language("RegExp")
   const val IPv6
-    = "(?:(?:(?:[0-9a-fA-F]{1,4}:){7}(?:[0-9a-fA-F]{1,4}))|(?:(?:(?:[0-9a-fA-F]{1,4}:){1,7}|:):(?:[0-9a-fA-F]{1,4}))|(?:(?:(?:[0-9a-fA-F]{1,4}:){1,6}|:):(?:[0-9a-fA-F]{1,4}:){0,1}(?:[0-9a-fA-F]{1,4}))|(?:(?:(?:[0-9a-fA-F]{1,4}:){1,5}|:):(?:[0-9a-fA-F]{1,4}:){0,2}(?:[0-9a-fA-F]{1,4}))|(?:(?:(?:[0-9a-fA-F]{1,4}:){1,4}|:):(?:[0-9a-fA-F]{1,4}:){0,3}(?:[0-9a-fA-F]{1,4}))|(?:(?:(?:[0-9a-fA-F]{1,4}:){1,3}|:):(?:[0-9a-fA-F]{1,4}:){1,4}(?:[0-9a-fA-F]{1,4}))|(?:(?:(?:[0-9a-fA-F]{1,4}:){1,2}|:):(?:[0-9a-fA-F]{1,4}:){0,5}(?:[0-9a-fA-F]{1,4}))|(?:(?:(?:[0-9a-fA-F]{1,4}:)|:):(?:[0-9a-fA-F]{1,4}:){0,6}(?:[0-9a-fA-F]{1,4})))"
+    = "(?:(?:(?:[0-9a-fA-F]{1,4}:){7}(?:[0-9a-fA-F]{1,4}))|(?:(?:(?:[0-9a-fA-F]{1,4}:){1,7}|:):(?:[0-9a-fA-F]{1,4}))|(?:(?:(?:[0-9a-fA-F]{1,4}:){1,6}|:):(?:[0-9a-fA-F]{1,4}:)?(?:[0-9a-fA-F]{1,4}))|(?:(?:(?:[0-9a-fA-F]{1,4}:){1,5}|:):(?:[0-9a-fA-F]{1,4}:){0,2}(?:[0-9a-fA-F]{1,4}))|(?:(?:(?:[0-9a-fA-F]{1,4}:){1,4}|:):(?:[0-9a-fA-F]{1,4}:){0,3}(?:[0-9a-fA-F]{1,4}))|(?:(?:(?:[0-9a-fA-F]{1,4}:){1,3}|:):(?:[0-9a-fA-F]{1,4}:){1,4}(?:[0-9a-fA-F]{1,4}))|(?:(?:(?:[0-9a-fA-F]{1,4}:){1,2}|:):(?:[0-9a-fA-F]{1,4}:){0,5}(?:[0-9a-fA-F]{1,4}))|(?:(?:(?:[0-9a-fA-F]{1,4}:)|:):(?:[0-9a-fA-F]{1,4}:){0,6}(?:[0-9a-fA-F]{1,4})))"
 
-  const val IP_ADDRESS_STRING = "(?:" + IPv4 + "|" + IPv6 + ")"
+  @Language("RegExp")
+  const val IP_ADDRESS_STRING = """(?:$IPv4|$IPv6)"""
 
-  const val UCS_CHAR = "[" +
-    "\u00A0-\uD7FF" +
-    "\uF900-\uFDCF" +
-    "\uFDF0-\uFFEF" +
-    "\uD800\uDC00-\uD83F\uDFFD" +
-    "\uD840\uDC00-\uD87F\uDFFD" +
-    "\uD880\uDC00-\uD8BF\uDFFD" +
-    "\uD8C0\uDC00-\uD8FF\uDFFD" +
-    "\uD900\uDC00-\uD93F\uDFFD" +
-    "\uD940\uDC00-\uD97F\uDFFD" +
-    "\uD980\uDC00-\uD9BF\uDFFD" +
-    "\uD9C0\uDC00-\uD9FF\uDFFD" +
-    "\uDA00\uDC00-\uDA3F\uDFFD" +
-    "\uDA40\uDC00-\uDA7F\uDFFD" +
-    "\uDA80\uDC00-\uDABF\uDFFD" +
-    "\uDAC0\uDC00-\uDAFF\uDFFD" +
-    "\uDB00\uDC00-\uDB3F\uDFFD" +
-    "\uDB44\uDC00-\uDB7F\uDFFD" +
-    "&&[^\u00A0[\u2000-\u200A]\u2028\u2029\u202F\u3000]" +
-    "]"
+  @Language("RegExp")
+  const val UCS_CHAR
+    = "[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF\uD800\uDC00-\uD83F\uDFFD\uD840\uDC00-\uD87F\uDFFD\uD880\uDC00-\uD8BF\uDFFD\uD8C0\uDC00-\uD8FF\uDFFD\uD900\uDC00-\uD93F\uDFFD\uD940\uDC00-\uD97F\uDFFD\uD980\uDC00-\uD9BF\uDFFD\uD9C0\uDC00-\uD9FF\uDFFD\uDA00\uDC00-\uDA3F\uDFFD\uDA40\uDC00-\uDA7F\uDFFD\uDA80\uDC00-\uDABF\uDFFD\uDAC0\uDC00-\uDAFF\uDFFD\uDB00\uDC00-\uDB3F\uDFFD\uDB44\uDC00-\uDB7F\uDFFD&&[^\u00A0[\u2000-\u200A]\u2028\u2029\u202F\u3000]]"
   /**
    * Valid characters for IRI label defined in RFC 3987.
    */
+  @Language("RegExp")
   const val LABEL_CHAR
-    = "a-zA-Z0-9" + UCS_CHAR
+    = """a-zA-Z0-9$UCS_CHAR"""
   /**
    * Valid characters for IRI TLD defined in RFC 3987.
    */
+  @Language("RegExp")
   const val TLD_CHAR
-    = "a-zA-Z" + UCS_CHAR
+    = """a-zA-Z$UCS_CHAR"""
   /**
    * RFC 1035 Section 2.3.4 limits the labels to a maximum 63 octets.
    */
+  @Language("RegExp")
   const val IRI_LABEL
-    = "[" + LABEL_CHAR + "](?:[" + LABEL_CHAR + "_\\-]{0,61}[" + LABEL_CHAR + "]){0,1}"
+    = """[$LABEL_CHAR](?:[${LABEL_CHAR}_\-]{0,61}[$LABEL_CHAR])?"""
   /**
    * RFC 3492 references RFC 1034 and limits Punycode algorithm output to 63 characters.
    */
+  @Language("RegExp")
   const val PUNYCODE_TLD
-    = "xn\\-\\-[\\w\\-]{0,58}\\w"
+    = """xn--[\w\-]{0,58}\w"""
+
+  @Language("RegExp")
   const val TLD
-    = "(?:" + PUNYCODE_TLD + "|" + "[" + TLD_CHAR + "]{2,63}" + ")"
+    = """(?:$PUNYCODE_TLD|[$TLD_CHAR]{2,63})"""
+
+  @Language("RegExp")
   const val HOST_NAME
-    = "(?:" + IRI_LABEL + "\\.)+" + TLD + ".?"
+    = """(?:$IRI_LABEL\.)+$TLD.?"""
+
+  @Language("RegExp")
   const val LOCAL_HOST_NAME
-    = "(?:" + IRI_LABEL + "\\.)*" + IRI_LABEL
+    = """(?:$IRI_LABEL\.)*$IRI_LABEL"""
+
+  @Language("RegExp")
   const val DOMAIN_NAME_STR
-    = "(?:" + LOCAL_HOST_NAME + "|" + HOST_NAME + "|" + IP_ADDRESS_STRING + ")"
-  val DOMAIN_NAME = Pattern.compile(DOMAIN_NAME_STR)
+    = """(?:$LOCAL_HOST_NAME|$HOST_NAME|$IP_ADDRESS_STRING)"""
+  val DOMAIN_NAME: Pattern = Pattern.compile(DOMAIN_NAME_STR)
 }

app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/LiveDataHelper.kt

@@ -2,7 +2,6 @@ package de.kuschku.quasseldroid_ng.util.helper
 
 import android.arch.lifecycle.*
 import android.support.annotation.MainThread
-import de.kuschku.libquassel.util.helpers.toLiveData
 import io.reactivex.BackpressureStrategy
 import io.reactivex.Observable
 
@@ -37,7 +36,7 @@ inline fun <X, Y> LiveData<X?>.switchMap(
 inline fun <X, Y> LiveData<X?>.switchMapRx(
   strategy: BackpressureStrategy,
   noinline func: (X) -> Observable<Y>?
-): LiveData<Y> {
+): LiveData<Y?> {
   val result = MediatorLiveData<Y>()
   result.addSource(this, object : Observer<X?> {
     internal var mSource: LiveData<Y>? = null
@@ -64,7 +63,7 @@ inline fun <X, Y> LiveData<X?>.switchMapRx(
 @MainThread
 inline fun <X, Y> LiveData<X?>.switchMapRx(
   noinline func: (X) -> Observable<Y>?
-): LiveData<Y> = switchMapRx(BackpressureStrategy.LATEST, func)
+): LiveData<Y?> = switchMapRx(BackpressureStrategy.LATEST, func)
 
 @MainThread
 inline fun <X, Y> LiveData<X?>.map(
@@ -113,5 +112,5 @@ inline fun <T> LiveData<T>.observeForeverSticky(observer: Observer<T>) {
   observer.onChanged(value)
 }
 
-inline fun <T> LiveData<T>.toObservable(lifecycleOwner: LifecycleOwner)
+inline fun <T> LiveData<T>.toObservable(lifecycleOwner: LifecycleOwner): Observable<T>
   = Observable.fromPublisher(LiveDataReactiveStreams.toPublisher(lifecycleOwner, this))

app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/ObservableHelper.kt

-package de.kuschku.libquassel.util.helpers
+package de.kuschku.quasseldroid_ng.util.helper
 
+import android.arch.lifecycle.LiveData
 import android.arch.lifecycle.LiveDataReactiveStreams
 import io.reactivex.BackpressureStrategy
 import io.reactivex.Observable
 
 inline fun <T> Observable<T>.toLiveData(
-  strategy: BackpressureStrategy = BackpressureStrategy.LATEST)
-  = LiveDataReactiveStreams.fromPublisher(toFlowable(strategy))
+  strategy: BackpressureStrategy = BackpressureStrategy.LATEST
+): LiveData<T> = LiveDataReactiveStreams.fromPublisher(toFlowable(strategy))

app/src/main/java/de/kuschku/quasseldroid_ng/util/helper/SharedPreferencesHelper.kt

 package de.kuschku.quasseldroid_ng.util.helper
 
+import android.annotation.SuppressLint
 import android.content.SharedPreferences
 
 fun SharedPreferences.editApply(f: SharedPreferences.Editor.() -> Unit) {
@@ -8,6 +9,7 @@ fun SharedPreferences.editApply(f: SharedPreferences.Editor.() -> Unit) {
   editor.apply()
 }
 
+@SuppressLint("ApplySharedPref")
 fun SharedPreferences.editCommit(f: SharedPreferences.Editor.() -> Unit) {
   val editor = this.edit()
   editor.f()

app/src/main/res/layout-sw600dp-land/activity_setup.xml

 <merge 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"
   android:layout_height="match_parent">
 
@@ -19,6 +20,7 @@
     app:backgroundTint="#8A000000"
     app:elevation="0dip"
     app:fabSize="normal"
-    app:pressedTranslationZ="0dip" />
+    app:pressedTranslationZ="0dip"
+    tools:ignore="RtlHardcoded" />
 
 </merge>

app/src/main/res/layout-sw600dp-land/setup_slide.xml

@@ -6,7 +6,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent">
 
-  <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+  <TextView
     android:id="@+id/title"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -28,7 +28,7 @@
     android:layout_toLeftOf="@+id/scrollView"
     android:layout_toStartOf="@+id/scrollView" />
 
-  <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+  <TextView
     android:id="@+id/description"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"

app/src/main/res/layout-sw600dp/activity_setup.xml

 <merge 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"
   android:layout_height="match_parent">
 
@@ -24,7 +25,8 @@
       app:backgroundTint="#8A000000"
       app:elevation="0dip"
       app:fabSize="normal"
-      app:pressedTranslationZ="0dip" />
+      app:pressedTranslationZ="0dip"
+      tools:ignore="RtlHardcoded" />
 
   </FrameLayout>
 

app/src/main/res/layout-sw600dp/setup_slide.xml

@@ -24,9 +24,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="8dp"
-        android:text="Connection"
         android:textSize="28sp"
-        android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse" />
+        android:theme="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"
+        tools:text="Connection" />
 
       <TextView
         android:id="@+id/description"

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

@@ -87,7 +87,7 @@
 
   </LinearLayout>
 
-  <include layout="@layout/content_nicklist" />
+  <include layout="@layout/content_nick_list" />
 
-  <include layout="@layout/content_chatlist" />
+  <include layout="@layout/content_chat_list" />
 </android.support.v4.widget.DrawerLayout>

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

 <merge 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"
   android:layout_height="match_parent">
 
@@ -16,6 +17,7 @@
     android:layout_marginBottom="16dp"
     android:layout_marginRight="16dp"
     android:tint="#ffffff"
-    app:fabSize="normal" />
+    app:fabSize="normal"
+    tools:ignore="RtlHardcoded" />
 
 </merge>

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

-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent">
-
-  <android.support.v4.widget.NestedScrollView
+  xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
 
@@ -31,7 +28,8 @@
           android:layout_height="24dp"
           android:layout_gravity="center_vertical"
           android:tint="#757575"
-            app:srcCompat="@drawable/ic_pencil" />
+          app:srcCompat="@drawable/ic_pencil"
+          tools:ignore="ContentDescription" />
       </FrameLayout>
 
       <android.support.design.widget.TextInputLayout
@@ -68,7 +66,8 @@
           android:layout_height="24dp"
           android:layout_gravity="center_vertical"
           android:tint="#757575"
-            app:srcCompat="@drawable/ic_server_network" />
+          app:srcCompat="@drawable/ic_server_network"
+          tools:ignore="ContentDescription" />
       </FrameLayout>
 
       <LinearLayout
@@ -131,7 +130,8 @@
           android:layout_height="24dp"
           android:layout_gravity="center_vertical"
           android:tint="#757575"
-            app:srcCompat="@drawable/ic_account" />
+          app:srcCompat="@drawable/ic_account"
+          tools:ignore="ContentDescription" />
       </FrameLayout>
 
       <LinearLayout
@@ -175,4 +175,3 @@
       android:layout_height="16dp" />
   </LinearLayout>
 </android.support.v4.widget.NestedScrollView>
-</FrameLayout>

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

 <LinearLayout 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"
   android:layout_height="72dp"
   android:background="?attr/selectableItemBackground"
@@ -10,36 +11,26 @@
   android:paddingLeft="16dp"
   android:paddingRight="16dp">
 
-  <LinearLayout
-    android:layout_width="48dp"
-    android:layout_height="match_parent">
-
   <ImageView
     android:layout_width="32dp"
     android:layout_height="32dp"
     android:layout_gravity="center_vertical"
+    android:layout_marginEnd="16dp"
+    android:layout_marginRight="16dp"
     android:tint="#727272"
-      app:srcCompat="@drawable/ic_add" />
-
-  </LinearLayout>
-
-  <LinearLayout
-    android:layout_width="0dip"
-    android:layout_height="match_parent"
-    android:layout_margin="8dp"
-    android:layout_weight="1"
-    android:gravity="center_vertical|start"
-    android:orientation="vertical">
+    app:srcCompat="@drawable/ic_add"
+    tools:ignore="ContentDescription" />
 
   <TextView
     android:id="@+id/account_name"
-      android:layout_width="match_parent"
+    android:layout_width="0dip"
     android:layout_height="wrap_content"
+    android:layout_gravity="center_vertical|start"
+    android:layout_margin="8dp"
+    android:layout_weight="1"
     android:fontFamily="sans-serif-medium"
-      android:gravity="center_vertical|start"
     android:lines="1"
     android:singleLine="true"
     android:text="New Account"
     android:textSize="14sp" />
 </LinearLayout>
-</LinearLayout>