aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfuzzard <fuzzard@users.noreply.github.com>2022-11-28 14:23:03 +1000
committerGitHub <noreply@github.com>2022-11-28 14:23:03 +1000
commitcebea6ff21c41c28d530d101fae46168dde1ed35 (patch)
tree6b79fd80ebecd65812566538c35cc8ee21af1bee
parent718d34d5655b70c5ba9822e1f488188536f19de5 (diff)
parent6d751ef099fd799ef6c93dc2a0134f52a33986db (diff)
Merge pull request #22193 from joseluismarti/fromHtml
[Android] Replace deprecated Html.fromHtml(String) call
-rw-r--r--tools/android/packaging/xbmc/src/Splash.java.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/android/packaging/xbmc/src/Splash.java.in b/tools/android/packaging/xbmc/src/Splash.java.in
index a777c6f89a..3b51c7cd00 100644
--- a/tools/android/packaging/xbmc/src/Splash.java.in
+++ b/tools/android/packaging/xbmc/src/Splash.java.in
@@ -537,7 +537,11 @@ public class Splash extends Activity
AlertDialog.Builder builder = new AlertDialog.Builder(act);
builder.setTitle(title);
builder.setIcon(android.R.drawable.ic_dialog_alert);
- builder.setMessage(Html.fromHtml(message));
+ if (Build.VERSION.SDK_INT >= 24) {
+ builder.setMessage(Html.fromHtml(message, Html.FROM_HTML_MODE_LEGACY));
+ } else {
+ builder.setMessage(Html.fromHtml(message));
+ }
builder.setPositiveButton("Exit",
new DialogInterface.OnClickListener()
{