Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Julian Dehm
briar
Commits
64e30844
Verified
Commit
64e30844
authored
Aug 13, 2018
by
Torsten Grote
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Screen Lock: Remember when keyguard was shown (for Android 6)
Also automatically unlock if device screenlock was removed.
parent
4d63272c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
32 additions
and
3 deletions
+32
-3
briar-android/src/main/java/org/briarproject/briar/android/account/LockManagerImpl.java
...g/briarproject/briar/android/account/LockManagerImpl.java
+4
-0
briar-android/src/main/java/org/briarproject/briar/android/login/UnlockActivity.java
.../org/briarproject/briar/android/login/UnlockActivity.java
+26
-3
briar-android/src/main/java/org/briarproject/briar/api/android/LockManager.java
.../java/org/briarproject/briar/api/android/LockManager.java
+2
-0
No files found.
briar-android/src/main/java/org/briarproject/briar/android/account/LockManagerImpl.java
View file @
64e30844
...
...
@@ -89,6 +89,10 @@ public class LockManagerImpl implements LockManager, Service, EventListener {
@Override
public
boolean
isLocked
()
{
if
(
locked
&&
!
hasScreenLock
(
appContext
))
{
lockable
.
postValue
(
false
);
locked
=
false
;
}
return
locked
;
}
...
...
briar-android/src/main/java/org/briarproject/briar/android/login/UnlockActivity.java
View file @
64e30844
...
...
@@ -20,7 +20,6 @@ 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
.
util
.
UiUtils
.
hasScreenLock
;
@RequiresApi
(
21
)
@MethodsNotNullByDefault
...
...
@@ -29,10 +28,13 @@ public class UnlockActivity extends BaseActivity {
private
static
final
Logger
LOG
=
Logger
.
getLogger
(
UnlockActivity
.
class
.
getName
());
private
static
final
String
KEYGUARD_SHOWN
=
"keyguardShown"
;
@Inject
LockManager
lockManager
;
private
boolean
keyguardShown
=
false
;
@Override
public
void
injectActivity
(
ActivityComponent
component
)
{
component
.
inject
(
this
);
...
...
@@ -45,6 +47,20 @@ public class UnlockActivity extends BaseActivity {
Button
button
=
findViewById
(
R
.
id
.
unlock
);
button
.
setOnClickListener
(
view
->
requestKeyguardUnlock
());
keyguardShown
=
state
!=
null
&&
state
.
getBoolean
(
KEYGUARD_SHOWN
);
}
@Override
protected
void
onSaveInstanceState
(
Bundle
outState
)
{
super
.
onSaveInstanceState
(
outState
);
// Saving whether we've shown the keyguard already is necessary
// for Android 6 when this activity gets destroyed.
//
// This will not help Android 5.
// There the system will show the keyguard once again.
// So if this activity was destroyed, the user needs to enter PIN twice.
outState
.
putBoolean
(
KEYGUARD_SHOWN
,
keyguardShown
);
}
@Override
...
...
@@ -53,7 +69,10 @@ public class UnlockActivity extends BaseActivity {
super
.
onActivityResult
(
requestCode
,
resultCode
,
data
);
if
(
requestCode
==
REQUEST_KEYGUARD_UNLOCK
)
{
if
(
resultCode
==
RESULT_OK
)
unlock
();
else
finish
();
else
{
finish
();
overridePendingTransition
(
0
,
0
);
}
}
}
...
...
@@ -63,8 +82,11 @@ public class UnlockActivity extends BaseActivity {
// Show keyguard after onActivityResult() as been called.
// Check if app is still locked, lockable
// and not finishing (which is possible if recreated)
if
(
lockManager
.
isLocked
()
&&
hasScreenLock
(
this
)
&&
!
isFinishing
())
{
if
(
!
keyguardShown
&&
lockManager
.
isLocked
()
&&
!
isFinishing
())
{
requestKeyguardUnlock
();
}
else
if
(!
lockManager
.
isLocked
())
{
setResult
(
RESULT_OK
);
finish
();
}
}
...
...
@@ -85,6 +107,7 @@ public class UnlockActivity extends BaseActivity {
LOG
.
warning
(
"Unlocking without keyguard"
);
unlock
();
}
else
{
keyguardShown
=
true
;
startActivityForResult
(
intent
,
REQUEST_KEYGUARD_UNLOCK
);
overridePendingTransition
(
0
,
0
);
}
...
...
briar-android/src/main/java/org/briarproject/briar/api/android/LockManager.java
View file @
64e30844
...
...
@@ -20,6 +20,8 @@ public interface LockManager {
/**
* Returns true if app is currently locked, false otherwise.
* If the device's screen lock was removed while the app was locked,
* calling this will unlock the app automatically.
*/
boolean
isLocked
();
...
...
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