From afa3c3a70e013cdd8b19a9d69bdb82aaa3eb06c6 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 9 Aug 2018 10:31:24 -0300 Subject: [PATCH] Screen Lock: Show verbose unlock message for older APIs --- .../org/briarproject/briar/android/login/UnlockActivity.java | 4 +++- briar-android/src/main/res/values/strings.xml | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/login/UnlockActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/login/UnlockActivity.java index 34e48cc8f..04c0f979e 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/login/UnlockActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/login/UnlockActivity.java @@ -18,6 +18,7 @@ import java.util.logging.Logger; import javax.inject.Inject; +import static android.os.Build.VERSION.SDK_INT; import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_KEYGUARD_UNLOCK; @RequiresApi(21) @@ -67,7 +68,8 @@ public class UnlockActivity extends BaseActivity { (KeyguardManager) getSystemService(KEYGUARD_SERVICE); if (keyguardManager == null) throw new AssertionError(); Intent intent = keyguardManager.createConfirmDeviceCredentialIntent( - getString(R.string.lock_unlock), null); + SDK_INT < 23 ? getString(R.string.lock_unlock_verbose) : + getString(R.string.lock_unlock), null); if (intent == null) { // the user must have removed the screen lock since locked LOG.warning("Unlocking without keyguard"); diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml index b7e626ba1..45c9ce6e7 100644 --- a/briar-android/src/main/res/values/strings.xml +++ b/briar-android/src/main/res/values/strings.xml @@ -451,6 +451,7 @@ Unlock Briar + Enter your device PIN, pattern or password to unlock Briar Briar is locked Tap to unlock