Bugfixes and cleanup

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

@@ -12,8 +12,13 @@ class RipplePassthroughTextView : TextView {
   constructor(context: Context?, attrs: AttributeSet?, defStyleAttr: Int) :
     super(context, attrs, defStyleAttr)
 
-  override fun onTouchEvent(event: MotionEvent?): Boolean {
+  // The goal is to provide all normal interaction to the parent view, unless a link is touched
+  // But additionally, we want to provide all normal textview interactions as well
+  override fun onTouchEvent(event: MotionEvent): Boolean {
+    val movementMethod = this.movementMethod
+    this.movementMethod = null
     super.onTouchEvent(event)
+    this.movementMethod = movementMethod
     return movementMethod?.onTouchEvent(this, text as? Spannable, event) == true
   }
 }

app/src/main/java/de/kuschku/quasseldroid/util/service/ServiceBoundActivity.kt

@@ -19,7 +19,10 @@ import de.kuschku.libquassel.session.Backend
 import de.kuschku.libquassel.util.Optional
 import de.kuschku.quasseldroid.Keys
 import de.kuschku.quasseldroid.R
-import de.kuschku.quasseldroid.settings.*
+import de.kuschku.quasseldroid.settings.AppearanceSettings
+import de.kuschku.quasseldroid.settings.AutoCompleteSettings
+import de.kuschku.quasseldroid.settings.ConnectionSettings
+import de.kuschku.quasseldroid.settings.Settings
 import de.kuschku.quasseldroid.ui.setup.accounts.selection.AccountSelectionActivity
 import de.kuschku.quasseldroid.util.helper.sharedPreferences
 import de.kuschku.quasseldroid.util.helper.updateRecentsHeaderIfExisting

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

@@ -131,6 +131,7 @@ class SeekBarPreference : Preference, SeekBar.OnSeekBarChangeListener {
   override fun onStopTrackingTouch(seekBar: SeekBar) = notifyChanged()
   override fun onGetDefaultValue(ta: TypedArray, index: Int) = ta.getInt(index,
                                                                          DEFAULT_VALUE)
+
   override fun onSetInitialValue(restoreValue: Boolean, defaultValue: Any?) {
     if (restoreValue) {
       currentValue = getPersistedInt(currentValue)

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

@@ -26,8 +26,8 @@
       android:layout_height="wrap_content"
       android:ellipsize="marquee"
       android:singleLine="true"
-      android:textColor="?colorTextPrimary"
       android:textAppearance="?android:textAppearanceMedium"
+      android:textColor="?colorTextPrimary"
       android:textSize="16sp"
       tools:text="IRC Config" />
 

lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcChannel.kt

@@ -174,12 +174,22 @@ class IrcChannel(
 
   fun codecForEncoding() = _codecForEncoding
   fun codecForDecoding() = _codecForDecoding
-  fun setCodecForEncoding(codecName: String) = setCodecForEncoding(Charset.forName(codecName))
+  fun setCodecForEncoding(codecName: String) {
+    val charset = Charset.availableCharsets()[codecName]
+    if (charset != null) {
+      setCodecForEncoding(charset)
+    }
+  }
   fun setCodecForEncoding(codec: Charset) {
     _codecForEncoding = codec
   }
 
-  fun setCodecForDecoding(codecName: String) = setCodecForDecoding(Charset.forName(codecName))
+  fun setCodecForDecoding(codecName: String) {
+    val charset = Charset.availableCharsets()[codecName]
+    if (charset != null) {
+      setCodecForDecoding(charset)
+    }
+  }
   fun setCodecForDecoding(codec: Charset) {
     _codecForDecoding = codec
   }

lib/src/main/java/de/kuschku/libquassel/quassel/syncables/IrcUser.kt

@@ -11,7 +11,6 @@ import io.reactivex.Observable
 import io.reactivex.subjects.BehaviorSubject
 import org.threeten.bp.Instant
 import java.nio.charset.Charset
-
 class IrcUser(
   hostmask: String,
   network: Network,
@@ -96,12 +95,22 @@ class IrcUser(
   fun channels() = _channels.map(IrcChannel::name)
   fun codecForEncoding() = _codecForEncoding
   fun codecForDecoding() = _codecForDecoding
-  fun setCodecForEncoding(codecName: String) = setCodecForEncoding(Charset.forName(codecName))
+  fun setCodecForEncoding(codecName: String) {
+    val charset = Charset.availableCharsets()[codecName]
+    if (charset != null) {
+      setCodecForEncoding(charset)
+    }
+  }
   fun setCodecForEncoding(codec: Charset) {
     _codecForEncoding = codec
   }
 
-  fun setCodecForDecoding(codecName: String) = setCodecForDecoding(Charset.forName(codecName))
+  fun setCodecForDecoding(codecName: String) {
+    val charset = Charset.availableCharsets()[codecName]
+    if (charset != null) {
+      setCodecForDecoding(charset)
+    }
+  }
   fun setCodecForDecoding(codec: Charset) {
     _codecForDecoding = codec
   }
@@ -375,3 +384,4 @@ class IrcUser(
     val NULL = IrcUser("", Network.NULL, SignalProxy.NULL)
   }
 }
+

lib/src/main/java/de/kuschku/libquassel/quassel/syncables/Network.kt

@@ -625,15 +625,24 @@ class Network constructor(
   }
 
   fun setCodecForDecoding(codecName: String) {
-    setCodecForDecoding(Charset.forName(codecName))
+    val charset = Charset.availableCharsets()[codecName]
+    if (charset != null) {
+      setCodecForDecoding(charset)
+    }
   }
 
   fun setCodecForEncoding(codecName: String) {
-    setCodecForDecoding(Charset.forName(codecName))
+    val charset = Charset.availableCharsets()[codecName]
+    if (charset != null) {
+      setCodecForEncoding(charset)
+    }
   }
 
   fun setCodecForServer(codecName: String) {
-    setCodecForDecoding(Charset.forName(codecName))
+    val charset = Charset.availableCharsets()[codecName]
+    if (charset != null) {
+      setCodecForServer(charset)
+    }
   }
 
   override fun addSupport(param: String, value: String?) {

viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/data/BufferData.kt

@@ -2,7 +2,6 @@ package de.kuschku.quasseldroid.viewmodel.data
 
 import de.kuschku.libquassel.quassel.BufferInfo
 import de.kuschku.libquassel.quassel.syncables.Network
-import de.kuschku.libquassel.quassel.syncables.interfaces.INetwork
 
 data class BufferData(
   val info: BufferInfo? = null,