From fd5ed456f958f4732dde9bf559d2747c7dc40eb7 Mon Sep 17 00:00:00 2001 From: Juha Heinanen Date: Sat, 1 Jun 2019 19:38:25 +0300 Subject: [PATCH] - Used HtmlCompat to convert About HTML to text (should work on all Android API levels). --- app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt index 53c9150d..94c4814c 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt @@ -2,10 +2,9 @@ package com.tutpro.baresip import android.app.Activity import android.content.Intent -import android.os.Build import android.os.Bundle +import android.support.v4.text.HtmlCompat import android.support.v7.app.AppCompatActivity -import android.text.Html import android.text.method.LinkMovementMethod import android.view.MenuItem import android.widget.TextView @@ -17,10 +16,7 @@ class AboutActivity : AppCompatActivity() { setContentView(R.layout.activity_about) val aboutText = findViewById(R.id.aboutText) val text = String.format(getString(R.string.about_text), BuildConfig.VERSION_NAME) - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) - aboutText.text = Html.fromHtml(text, Html.FROM_HTML_MODE_LEGACY) - else - aboutText.text = Html.fromHtml(text) + aboutText.text = HtmlCompat.fromHtml(text, HtmlCompat.FROM_HTML_MODE_LEGACY) aboutText.setMovementMethod(LinkMovementMethod.getInstance()) }