diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt index 66cf9c0..d418123 100644 --- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt +++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/MainActivity.kt @@ -26,7 +26,6 @@ import android.content.Intent import android.graphics.Typeface import android.os.Bundle import android.support.v7.app.AppCompatActivity -import android.text.Html import android.text.InputFilter import android.text.InputType import android.text.TextUtils @@ -43,6 +42,7 @@ import com.google.gson.JsonSyntaxException import net.thauvin.erik.android.tesremoteprogrammer.models.Config import net.thauvin.erik.android.tesremoteprogrammer.models.Configurations import net.thauvin.erik.android.tesremoteprogrammer.util.Dtmf +import net.thauvin.erik.android.tesremoteprogrammer.util.fromHtml import net.thauvin.erik.android.tesremoteprogrammer.util.isDKS import net.thauvin.erik.android.tesremoteprogrammer.util.isDigits import org.jetbrains.anko.AnkoLogger @@ -92,8 +92,6 @@ class MainActivity : AppCompatActivity(), AnkoLogger { const val QUOTE = "'" } - private fun fromHtml(s: String) = Html.fromHtml(s, Html.FROM_HTML_MODE_LEGACY) - private fun initConfigurations() { try { ObjectInputStream(openFileInput(currentConfigData)).use { @@ -113,7 +111,7 @@ class MainActivity : AppCompatActivity(), AnkoLogger { if (validateConfig(config, errors)) { info(">>> ${config.params.name}: successfully loaded") } else { - info(">>> ${config.params.name}: " + fromHtml(errors.toString())) + info(">>> ${config.params.name}: " + errors.toString().fromHtml()) } } @@ -153,7 +151,7 @@ class MainActivity : AppCompatActivity(), AnkoLogger { if (errors.isNotEmpty()) { alert { title = getString(R.string.alert_config_error) - message = fromHtml("$errors") + message = errors.toString().fromHtml() cancelButton { } }.show() } diff --git a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/util/Strings.kt b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/util/Strings.kt index 0b1c118..e126ae0 100644 --- a/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/util/Strings.kt +++ b/app/src/main/java/net/thauvin/erik/android/tesremoteprogrammer/util/Strings.kt @@ -17,8 +17,12 @@ */ package net.thauvin.erik.android.tesremoteprogrammer.util +import android.text.Html + private val digitPattern = Regex("[0-9]+") +fun String.fromHtml() = Html.fromHtml(this, Html.FROM_HTML_MODE_LEGACY) + fun String.isDigits() = isNotBlank() && matches(digitPattern) fun String.isDKS(): Boolean = equals(Dtmf.DKS, true)