TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-04 12:25:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Screen security if enabled.

Browse Source 
Fixes #4187
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-10-02 13:40:49 -07:00
parent 26f8870344
commit f01cab57c7
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,12 +30,12 @@ import android.content.IntentFilter;
import android.content.ServiceConnection; import android.content.ServiceConnection;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.media.AudioManager; import android.media.AudioManager;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.os.Message; import android.os.Message;
import android.util.Log; import android.util.Log;
import android.view.KeyEvent;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
@ -47,6 +47,7 @@ import org.thoughtcrime.redphone.ui.CallScreen;
import org.thoughtcrime.redphone.util.AudioUtils; import org.thoughtcrime.redphone.util.AudioUtils;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
/** /**
* The main UI class for RedPhone. Most of the heavy lifting is * The main UI class for RedPhone. Most of the heavy lifting is
@ -116,6 +117,7 @@ public class RedPhone extends Activity {
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
initializeScreenshotSecurity();
initializeServiceBinding(); initializeServiceBinding();
registerBluetoothReceiver(); registerBluetoothReceiver();
} }
@ -140,6 +142,16 @@ public class RedPhone extends Activity {
bindService(bindIntent, serviceConnection, Context.BIND_AUTO_CREATE); bindService(bindIntent, serviceConnection, Context.BIND_AUTO_CREATE);
} }
private void initializeScreenshotSecurity() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH &&
TextSecurePreferences.isScreenSecurityEnabled(this))
{
getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
} else {
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
}
}
private void initializeResources() { private void initializeResources() {
callScreen = (CallScreen)findViewById(R.id.callScreen); callScreen = (CallScreen)findViewById(R.id.callScreen);
state = STATE_IDLE; state = STATE_IDLE;