From b568077bf6b972ffc4e75fa731c59ec794a9c482 Mon Sep 17 00:00:00 2001 From: Darcy Wong Date: Wed, 27 Feb 2019 23:13:04 +0700 Subject: [PATCH] Fix duplicate "keyboard" / "model" string on install --- .../main/java/com/tavultesoft/kmapro/PackageActivity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java index b6238a36ac..832cfa4362 100644 --- a/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java +++ b/android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/PackageActivity.java @@ -99,8 +99,8 @@ public class PackageActivity extends AppCompatActivity { packageActivityTitle.setTextSize(getResources().getDimension(R.dimen.titlebar_label_textsize)); packageActivityTitle.setGravity(Gravity.CENTER); - String pkgTargetTitle = pkgTarget.equals(PackageProcessor.PP_TARGET_KEYBOARDS) ? getString(R.string.install_keyboard_package) : - getString(R.string.install_lexical_model_package); + String pkgTargetTitle = pkgTarget.equals(PackageProcessor.PP_TARGET_KEYBOARDS) ? + getString(R.string.install_keyboard_package) : getString(R.string.install_lexical_model_package); String titleStr = String.format("%s %s", pkgTargetTitle, pkgVersion); packageActivityTitle.setText(titleStr); getSupportActionBar().setCustomView(packageActivityTitle); @@ -162,10 +162,10 @@ public class PackageActivity extends AppCompatActivity { // No welcome.htm so display minimal package information String targetString = ""; if (pkgTarget.equals(PackageProcessor.PP_TARGET_KEYBOARDS)) { - targetString = pkgName != null && pkgName.toLowerCase().endsWith(PackageProcessor.PP_TARGET_KEYBOARDS) + targetString = pkgName != null && pkgName.toLowerCase().endsWith("keyboard") ? "" : String.format(" %s", getString(R.string.title_keyboard)); } else if (pkgTarget.equals(PackageProcessor.PP_TARGET_LEXICAL_MODELS)) { - targetString = pkgName != null && pkgName.toLowerCase().endsWith(PackageProcessor.PP_TARGET_LEXICAL_MODELS) + targetString = pkgName != null && pkgName.toLowerCase().endsWith("model") ? "" :String.format(" %s", "model"); } String htmlString = String.format(