gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-11 06:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Switch the place where we check for timeout

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-08-07 12:41:12 +02:00
parent 63db659079
commit ef7cf64c02
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/com/nextcloud/talk/activities/BaseActivity.java
View File

@ -64,11 +64,6 @@ public class BaseActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
NextcloudTalkApplication.getSharedApplication().getComponentApplication().inject(this); NextcloudTalkApplication.getSharedApplication().getComponentApplication().inject(this);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
if (appPreferences.getIsScreenLocked()) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
SecurityUtils.createKey(appPreferences.getScreenLockTimeout());
}
}
} }
@Override @Override
@ -79,6 +74,12 @@ public class BaseActivity extends AppCompatActivity {
} else { } else {
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE); getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
} }
if (appPreferences.getIsScreenLocked()) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
SecurityUtils.createKey(appPreferences.getScreenLockTimeout());
}
}
} }
public void showCertificateDialog(X509Certificate cert, MagicTrustManager magicTrustManager, public void showCertificateDialog(X509Certificate cert, MagicTrustManager magicTrustManager,