Bimba.git

commit 80a69f427c7bf846e4cd0dbbe7ad0280cf27f34b

Author: Adam Pioterek <adam.pioterek@protonmail.ch>

Merge branch 'develop' into v2.2.2

 app/build.gradle | 4 +-
 app/src/main/java/ml/adamsprogs/bimba/activities/StopActivity.kt | 4 +-
 build.gradle | 4 +-


diff --git a/app/build.gradle b/app/build.gradle
index 483ef16f953e6f3d5a056367e4e6237901db927f..053942d2c3516a112b36037739800223883f06f1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@     defaultConfig {
         applicationId "ml.adamsprogs.bimba"
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 18
-        versionName "2.2.1"
+        versionCode 19
+        versionName "2.2.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }




diff --git a/app/src/main/java/ml/adamsprogs/bimba/activities/StopActivity.kt b/app/src/main/java/ml/adamsprogs/bimba/activities/StopActivity.kt
index 2e0129cd1f3e89e7c1bfcc7cc0eee5458afab98c..425c9d04d2798f49ec0fd81ec4b72cb41e13554a 100644
--- a/app/src/main/java/ml/adamsprogs/bimba/activities/StopActivity.kt
+++ b/app/src/main/java/ml/adamsprogs/bimba/activities/StopActivity.kt
@@ -99,10 +99,10 @@             providerProxy.getVmMessage(stopCode) { message ->
                 if (message != null) {
                     val rendered =
                             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                                Html.fromHtml(message, Html.FROM_HTML_MODE_LEGACY)
+                                Html.fromHtml(message, Html.FROM_HTML_MODE_LEGACY).toString()
                             } else {
                                 @Suppress("DEPRECATION")
-                                Html.fromHtml(message)
+                                Html.fromHtml(message).toString()
                             }
 
                     banner.visibility = View.VISIBLE




diff --git a/build.gradle b/build.gradle
index e5729f321efad6941c9845ff6b39ad453a9f9ae0..2db418dde841cfe37dc15e0d5f1cd140f603dfa2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.20'
+    ext.kotlin_version = '1.3.21'
     repositories {
         jcenter()
         maven { url 'https://maven.google.com' }
@@ -9,7 +9,7 @@         //maven { url 'https://dl.bintray.com/guardian/android' } // TooLargeTool
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong