TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 12:05:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify keyguard stuff.

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-09-24 17:35:41 -07:00
parent 123c7b2119
commit 0402b45480
2 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/org/thoughtcrime/redphone/RedPhone.java
View File

@ -100,6 +100,7 @@ public class RedPhone extends Activity {
@Override
public void onCreate(Bundle savedInstanceState) {
getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED);
super.onCreate(savedInstanceState);
requestWindowFeature(Window.FEATURE_NO_TITLE);

32
src/org/thoughtcrime/redphone/call/LockManager.java
View File

@ -3,7 +3,6 @@ package org.thoughtcrime.redphone.call;
import android.app.KeyguardManager;
import android.content.Context;
import android.net.wifi.WifiManager;
import android.os.Build;
import android.os.PowerManager;
import android.provider.Settings;
import android.util.Log;
@ -19,15 +18,12 @@ public class LockManager {
private final PowerManager.WakeLock fullLock;
private final PowerManager.WakeLock partialLock;
private final KeyguardManager.KeyguardLock keyGuardLock;
private final KeyguardManager km;
private final WifiManager.WifiLock wifiLock;
private final ProximityLock proximityLock;
private final AccelerometerListener accelerometerListener;
private final boolean wifiLockEnforced;
private boolean keyguardDisabled;
private int orientation = AccelerometerListener.ORIENTATION_UNKNOWN;
@ -51,9 +47,6 @@ public class LockManager {
partialLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "RedPhone Partial");
proximityLock = new ProximityLock(pm);
km = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
keyGuardLock = km.newKeyguardLock("RedPhone KeyGuard");
WifiManager wm = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
wifiLock = wm.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, "RedPhone Wifi");
@ -98,22 +91,18 @@ public class LockManager {
case IDLE:
setLockState(LockState.SLEEP);
accelerometerListener.enable(false);
maybeEnableKeyguard();
break;
case PROCESSING:
setLockState(LockState.PARTIAL);
accelerometerListener.enable(false);
maybeEnableKeyguard();
break;
case INTERACTIVE:
setLockState(LockState.FULL);
accelerometerListener.enable(false);
disableKeyguard();
break;
case IN_CALL:
accelerometerListener.enable(true);
updateInCallLockState();
disableKeyguard();
break;
}
}
@ -149,25 +138,4 @@ public class LockManager {
}
Log.d(TAG, "Entered Lock State: " + newState);
}
private void disableKeyguard() {
if(keyguardLocked()) {
keyGuardLock.disableKeyguard();
keyguardDisabled = true;
}
}
private void maybeEnableKeyguard() {
if (keyguardDisabled) {
keyGuardLock.reenableKeyguard();
keyguardDisabled = false;
}
}
private boolean keyguardLocked() {
if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
return km.isKeyguardLocked();
}
return true;
}
}