Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 20:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Screen Lock: Show verbose unlock message for older APIs

Browse Source
This commit is contained in:
Torsten Grote
2018-08-09 10:31:24 -03:00
parent 0f37a43415
commit afa3c3a70e
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/main/java/org/briarproject/briar/android/login/UnlockActivity.java
View File

@@ -18,6 +18,7 @@ import java.util.logging.Logger;
import javax.inject.Inject; import javax.inject.Inject;
import static android.os.Build.VERSION.SDK_INT;
import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_KEYGUARD_UNLOCK; import static org.briarproject.briar.android.activity.RequestCodes.REQUEST_KEYGUARD_UNLOCK;
@RequiresApi(21) @RequiresApi(21)
@@ -67,7 +68,8 @@ public class UnlockActivity extends BaseActivity {
(KeyguardManager) getSystemService(KEYGUARD_SERVICE); (KeyguardManager) getSystemService(KEYGUARD_SERVICE);
if (keyguardManager == null) throw new AssertionError(); if (keyguardManager == null) throw new AssertionError();
Intent intent = keyguardManager.createConfirmDeviceCredentialIntent( 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) { if (intent == null) {
// the user must have removed the screen lock since locked // the user must have removed the screen lock since locked
LOG.warning("Unlocking without keyguard"); LOG.warning("Unlocking without keyguard");

1
briar-android/src/main/res/values/strings.xml
View File

@@ -451,6 +451,7 @@
<!-- App Locking --> <!-- App Locking -->
<string name="lock_unlock">Unlock Briar</string> <string name="lock_unlock">Unlock Briar</string>
<string name="lock_unlock_verbose">Enter your device PIN, pattern or password to unlock Briar</string>
<string name="lock_is_locked">Briar is locked</string> <string name="lock_is_locked">Briar is locked</string>
<string name="lock_tap_to_unlock">Tap to unlock</string> <string name="lock_tap_to_unlock">Tap to unlock</string>