Merge remote-tracking branch 'origin/master'

kontalk · May 7, 2016 · aacf0e9 · aacf0e9
2 parents 81b61e4 + 1aed3b9
commit aacf0e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/src/main/java/org/kontalk/ui/MainActivity.java b/app/src/main/java/org/kontalk/ui/MainActivity.java
@@ -88,7 +88,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 new AlertDialogWrapper.Builder(this)
                     .setIcon(android.R.drawable.ic_dialog_alert)
                     .setTitle(R.string.title_huawei_protected_apps)
-                    .setMessage(getString(R.string.msg_huawei_protected_apps, getString(R.string.app_name)))
+                    .setMessage(R.string.msg_huawei_protected_apps)
                     .setView(dontShowAgain)
                     .setPositiveButton(R.string.btn_huawei_protected_apps, new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int which) {

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -470,7 +470,7 @@
     <string name="learn_more">Learn more</string>
 
     <string name="title_huawei_protected_apps">Huawei Protected Apps</string>
-    <string name="msg_huawei_protected_apps">%s requires to be enabled in Protected Apps to function properly.%n</string>
+    <string name="msg_huawei_protected_apps">Kontalk requires to be enabled in Protected Apps to function properly.\n</string>
     <string name="btn_huawei_protected_apps">Protected Apps</string>
     <string name="check_do_not_show_again">Do not show again</string>