Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
briar
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Julian Dehm
briar
Commits
afa3c3a7
Verified
Commit
afa3c3a7
authored
Aug 09, 2018
by
Torsten Grote
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Screen Lock: Show verbose unlock message for older APIs
parent
0f37a434
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
1 deletion
+4
-1
briar-android/src/main/java/org/briarproject/briar/android/login/UnlockActivity.java
.../org/briarproject/briar/android/login/UnlockActivity.java
+3
-1
briar-android/src/main/res/values/strings.xml
briar-android/src/main/res/values/strings.xml
+1
-0
No files found.
briar-android/src/main/java/org/briarproject/briar/android/login/UnlockActivity.java
View file @
afa3c3a7
...
...
@@ -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"
);
...
...
briar-android/src/main/res/values/strings.xml
View file @
afa3c3a7
...
...
@@ -451,6 +451,7 @@
<!-- App Locking -->
<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_tap_to_unlock"
>
Tap to unlock
</string>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment