Fix lint and test issues

app/build.gradle.kts

@@ -24,7 +24,7 @@ plugins {
 }
 
 android {
-  compileSdkVersion(29)
+  compileSdkVersion(30)
 
   signingConfigs {
     SigningData.of(project.rootProject.properties("signing.properties"))?.let {
@@ -39,7 +39,7 @@ android {
 
   defaultConfig {
     minSdkVersion(20)
-    targetSdkVersion(29)
+    targetSdkVersion(30)
 
     applicationId = "com.iskrembilen.quasseldroid"
     versionCode = cmd("git", "rev-list", "--count", "HEAD")?.toIntOrNull() ?: 1
@@ -120,7 +120,7 @@ dependencies {
 
   withVersion("2.2.5") {
     implementation("androidx.room", "room-runtime", version)
-    kapt("androidx.room", "room-compiler", version)
+    annotationProcessor("androidx.room", "room-compiler", version)
     implementation("androidx.room", "room-rxjava2", version)
     testImplementation("androidx.room", "room-testing", version)
   }

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

@@ -85,6 +85,7 @@ import de.kuschku.quasseldroid.ui.setup.network.LinkNetwork
 import de.kuschku.quasseldroid.ui.setup.network.NetworkSetupActivity
 import de.kuschku.quasseldroid.ui.setup.user.UserSetupActivity
 import de.kuschku.quasseldroid.util.backport.OsConstants
+import de.kuschku.quasseldroid.util.deceptive_networks.DeceptiveNetworkDialog
 import de.kuschku.quasseldroid.util.helper.*
 import de.kuschku.quasseldroid.util.irc.format.IrcFormatDeserializer
 import de.kuschku.quasseldroid.util.missingfeatures.MissingFeaturesDialog
@@ -94,7 +95,6 @@ import de.kuschku.quasseldroid.util.ui.DragInterceptBottomSheetBehavior
 import de.kuschku.quasseldroid.util.ui.drawable.DrawerToggleActivityDrawable
 import de.kuschku.quasseldroid.util.ui.drawable.NickCountDrawable
 import de.kuschku.quasseldroid.util.ui.view.WarningBarView
-import de.kuschku.quasseldroid.util.deceptive_networks.DeceptiveNetworkDialog
 import de.kuschku.quasseldroid.viewmodel.ChatViewModel
 import de.kuschku.quasseldroid.viewmodel.data.BufferData
 import de.kuschku.quasseldroid.viewmodel.helper.ChatViewModelHelper
@@ -185,7 +185,7 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
         }
         intent.hasExtra(KEY_NETWORK_ID) && intent.hasExtra(KEY_CHANNEL)   -> {
           val networkId = NetworkId(intent.getIntExtra(KEY_NETWORK_ID, -1))
-          val channel = intent.getStringExtra(KEY_CHANNEL)
+          val channel = intent.getStringExtra(KEY_CHANNEL) ?: ""
 
           val forceJoin = intent.getBooleanExtra(KEY_FORCE_JOIN, false)
 
@@ -943,26 +943,20 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
     outState.putBoolean(KEY_OPEN_DRAWER_END, binding.drawerLayout.isDrawerOpen(GravityCompat.END))
   }
 
-  override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
+  override fun onRestoreInstanceState(savedInstanceState: Bundle) {
     super.onRestoreInstanceState(savedInstanceState)
-    if (savedInstanceState != null) {
     chatViewModel.onRestoreInstanceState(savedInstanceState)
-    }
 
-    connectedAccount = AccountId(savedInstanceState?.getLong(KEY_CONNECTED_ACCOUNT, -1L) ?: -1L)
+    connectedAccount = AccountId(savedInstanceState.getLong(KEY_CONNECTED_ACCOUNT, -1L))
 
-    if (savedInstanceState?.getBoolean(KEY_OPEN_DRAWER_START) == true &&
-        resources.getBoolean(R.bool.buffer_drawer_exists)) {
+    if (savedInstanceState.getBoolean(KEY_OPEN_DRAWER_START) && resources.getBoolean(R.bool.buffer_drawer_exists)) {
       binding.drawerLayout.openDrawer(GravityCompat.START)
     }
-    if (savedInstanceState?.getBoolean(KEY_OPEN_DRAWER_END) == true) {
+    if (savedInstanceState.getBoolean(KEY_OPEN_DRAWER_END)) {
       binding.drawerLayout.openDrawer(GravityCompat.END)
     }
-    if (savedInstanceState?.getBoolean(KEY_OPEN_DRAWER_START) != null ||
-        savedInstanceState?.getBoolean(KEY_OPEN_DRAWER_END) != null) {
     restoredDrawerState = true
   }
-  }
 
   override fun onCreateOptionsMenu(menu: Menu?): Boolean {
     val nickCountDrawableSize = resources.getDimensionPixelSize(R.dimen.size_nick_count)
@@ -984,7 +978,7 @@ class ChatActivity : ServiceBoundActivity(), SharedPreferences.OnSharedPreferenc
     return super.onCreateOptionsMenu(menu)
   }
 
-  override fun onOptionsItemSelected(item: MenuItem?) = when (item?.itemId) {
+  override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
     android.R.id.home           -> {
       drawerToggle.onOptionsItemSelected(item)
     }

app/src/main/java/de/kuschku/quasseldroid/ui/setup/ServiceBoundSetupActivity.kt

@@ -235,9 +235,8 @@ abstract class ServiceBoundSetupActivity :
     super.onSaveInstanceState(outState)
   }
 
-  override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
+  override fun onRestoreInstanceState(savedInstanceState: Bundle) {
     super.onRestoreInstanceState(savedInstanceState)
-    if (savedInstanceState != null) {
     if (savedInstanceState.containsKey(resultKey)) {
       adapter.result.putAll(savedInstanceState.getBundle(resultKey))
       adapter.allChanged()
@@ -247,7 +246,6 @@ abstract class ServiceBoundSetupActivity :
     if (savedInstanceState.containsKey(currentItemKey))
       viewPager.currentItem = savedInstanceState.getInt(currentItemKey)
     currentPage.value = adapter.getItem(viewPager.currentItem)
-    }
     pageChanged()
   }
 

app/src/main/java/de/kuschku/quasseldroid/ui/setup/SetupActivity.kt

@@ -195,9 +195,8 @@ abstract class SetupActivity : DaggerAppCompatActivity() {
     super.onSaveInstanceState(outState)
   }
 
-  override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
+  override fun onRestoreInstanceState(savedInstanceState: Bundle) {
     super.onRestoreInstanceState(savedInstanceState)
-    if (savedInstanceState != null) {
     if (savedInstanceState.containsKey(resultKey)) {
       adapter.result.putAll(savedInstanceState.getBundle(resultKey))
       adapter.allChanged()
@@ -207,7 +206,6 @@ abstract class SetupActivity : DaggerAppCompatActivity() {
     if (savedInstanceState.containsKey(currentItemKey))
       viewPager.currentItem = savedInstanceState.getInt(currentItemKey)
     currentPage.value = adapter.getItem(viewPager.currentItem)
-    }
     pageChanged()
   }
 

app/src/main/java/de/kuschku/quasseldroid/ui/setup/network/NetworkSetupActivity.kt

@@ -36,12 +36,11 @@ class NetworkSetupActivity : ServiceBoundSetupActivity() {
   @Inject
   lateinit var modelHelper: EditorViewModelHelper
 
-  private lateinit var arguments: Bundle
-  override val initData: Bundle
-    get() = arguments
+  override var initData: Bundle = Bundle.EMPTY
+    private set
 
   override fun onCreate(savedInstanceState: Bundle?) {
-    arguments = intent.getBundleExtra("link")
+    initData = intent.getBundleExtra("link") ?: Bundle.EMPTY
     super.onCreate(savedInstanceState)
   }
 

app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/ServiceBoundSettingsActivity.kt

@@ -95,7 +95,7 @@ abstract class ServiceBoundSettingsActivity(private val fragment: Fragment? = nu
     super.onBackPressed()
   }
 
-  override fun onOptionsItemSelected(item: MenuItem?) = when (item?.itemId) {
+  override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
     android.R.id.home -> {
       shouldNavigateAway {
         if (supportParentActivityIntent != null) {

app/src/main/java/de/kuschku/quasseldroid/util/ui/settings/SettingsActivity.kt

@@ -94,7 +94,7 @@ abstract class SettingsActivity(protected val fragment: Fragment? = null) : Them
     super.onBackPressed()
   }
 
-  override fun onOptionsItemSelected(item: MenuItem?) = when (item?.itemId) {
+  override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
     android.R.id.home -> {
       shouldNavigateAway {
         if (supportParentActivityIntent != null) {

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

@@ -46,6 +46,7 @@
     app:backgroundTint="#8A000000"
     app:elevation="0dip"
     app:fabSize="normal"
+    android:contentDescription="@string/label_next"
     app:pressedTranslationZ="0dip"
     app:srcCompat="@drawable/ic_forward"
     app:tint="#ffffffff"

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

@@ -47,6 +47,7 @@
     app:elevation="0dip"
     app:fabSize="normal"
     app:pressedTranslationZ="0dip"
+    android:contentDescription="@string/label_next"
     app:srcCompat="@drawable/ic_forward"
     app:tint="#ffffffff"
     tools:ignore="RtlHardcoded" />

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

@@ -47,6 +47,7 @@
     app:fabSize="normal"
     app:srcCompat="@drawable/ic_forward"
     app:tint="#ffffffff"
+    android:contentDescription="@string/label_next"
     tools:ignore="RtlHardcoded"
     tools:src="@drawable/ic_arrow_right" />
 

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

@@ -51,6 +51,7 @@
     android:visibility="gone"
     app:backgroundTint="#8A808080"
     app:elevation="0dip"
+    android:contentDescription="@string/label_scroll_to_latest"
     app:fabSize="mini"
     app:pressedTranslationZ="0dip"
     app:srcCompat="@drawable/ic_scroll_down" />

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

@@ -35,6 +35,7 @@
     android:layout_height="wrap_content"
     android:layout_gravity="end|bottom"
     android:layout_margin="16dp"
+    android:contentDescription="@string/label_new_alias"
     app:fabSize="normal"
     app:srcCompat="@drawable/ic_add"
     app:tint="?colorTextPrimaryInverse" />

app/src/main/res/values-de/strings.xml

@@ -84,6 +84,7 @@
   <string name="label_mention_long">Kopiert den Nutzernamen in die Eingabezeile</string>
   <string name="label_network">Netzwerk</string>
   <string name="label_new_account">Account hinzufügen</string>
+  <string name="label_new_alias">Alias hinzufügen</string>
   <string name="label_new_chatlist">Chatliste hinzufügen</string>
   <string name="label_new_highlight_ignore_rule">Neue Hervorhebungsignorierregel</string>
   <string name="label_new_highlight_rule">Neue Hervorhebungsregel</string>
@@ -122,6 +123,7 @@
   <string name="label_reset">Zurücksetzen</string>
   <string name="label_save">Speichern</string>
   <string name="label_saving">Speichern…</string>
+  <string name="label_scroll_to_latest">Zu neuesten Nachrichten scrollen</string>
   <string name="label_search">Suchen…</string>
   <string name="label_search_buffer">Chats suchen</string>
   <string name="label_search_channels">Kanäle suchen</string>

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

@@ -84,6 +84,7 @@
   <string name="label_mention_long">Copy username into input line</string>
   <string name="label_network">Network</string>
   <string name="label_new_account">New Account</string>
+  <string name="label_new_alias">New Alias</string>
   <string name="label_new_chatlist">New Chatlist</string>
   <string name="label_new_highlight_ignore_rule">New Highlight Ignore Rule</string>
   <string name="label_new_highlight_rule">New Highlight Rule</string>
@@ -122,6 +123,7 @@
   <string name="label_reset">Reset</string>
   <string name="label_save">Save</string>
   <string name="label_saving">Saving…</string>
+  <string name="label_scroll_to_latest">Scroll to latest messages</string>
   <string name="label_search">Search…</string>
   <string name="label_search_buffer">Search Chats</string>
   <string name="label_search_channels">Search Channels</string>

invokergenerator/build.gradle.kts

@@ -34,5 +34,5 @@ dependencies {
   implementation("org.jetbrains.kotlin", "kotlin-compiler-embeddable", "1.4.31")
   implementation("com.squareup", "kotlinpoet", "1.8.0")
   compileOnly("com.google.auto.service:auto-service:1.0-rc7")
-  kapt("com.google.auto.service:auto-service:1.0-rc7")
+  annotationProcessor("com.google.auto.service:auto-service:1.0-rc7")
 }

malheur/build.gradle.kts

@@ -23,11 +23,11 @@ plugins {
 }
 
 android {
-  compileSdkVersion(29)
+  compileSdkVersion(30)
 
   defaultConfig {
     minSdkVersion(20)
-    targetSdkVersion(29)
+    targetSdkVersion(30)
 
     consumerProguardFiles("proguard-rules.pro")
 

persistence/build.gradle.kts

@@ -24,11 +24,11 @@ plugins {
 }
 
 android {
-  compileSdkVersion(29)
+  compileSdkVersion(30)
 
   defaultConfig {
     minSdkVersion(20)
-    targetSdkVersion(29)
+    targetSdkVersion(30)
 
     consumerProguardFiles("proguard-rules.pro")
 
@@ -55,7 +55,7 @@ dependencies {
 
   withVersion("2.2.5") {
     implementation("androidx.room", "room-runtime", version)
-    kapt("androidx.room", "room-compiler", version)
+    annotationProcessor("androidx.room", "room-compiler", version)
     implementation("androidx.room", "room-rxjava2", version)
     testImplementation("androidx.room", "room-testing", version)
   }

ui_spinner/build.gradle.kts

@@ -23,11 +23,11 @@ plugins {
 }
 
 android {
-  compileSdkVersion(29)
+  compileSdkVersion(30)
 
   defaultConfig {
     minSdkVersion(20)
-    targetSdkVersion(29)
+    targetSdkVersion(30)
 
     consumerProguardFiles("proguard-rules.pro")
 

viewmodel/build.gradle.kts

@@ -23,11 +23,11 @@ plugins {
 }
 
 android {
-  compileSdkVersion(29)
+  compileSdkVersion(30)
 
   defaultConfig {
     minSdkVersion(20)
-    targetSdkVersion(29)
+    targetSdkVersion(30)
 
     consumerProguardFiles("proguard-rules.pro")