Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-11 19:43:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removed close on autolock/nav

Browse Source
This commit is contained in:
M66B
2022-01-15 15:31:11 +01:00
parent 3c55af0552
commit 9fcd007b5a
2 changed files with 16 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/java/eu/faircode/email/ActivityBase.java
View File

@@ -370,26 +370,24 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
if (this.getClass().equals(ActivityMain.class))
return;
if (Helper.shouldAuthenticate(this, !auth)) {
lock();
if (!Helper.shouldAuthenticate(this, !auth))
return;
if (auth) {
if (this instanceof ActivityWidget ||
this instanceof ActivityWidgetSync ||
this instanceof ActivityWidgetUnified) {
Toast.makeText(this, R.string.title_notification_redacted, Toast.LENGTH_LONG).show();
} else {
Intent intent = getIntent();
processStreams(intent);
Intent main = new Intent(this, ActivityMain.class)
.putExtra("intent", intent);
main.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
startActivity(main);
}
lock();
if (auth) {
if (this instanceof ActivityWidget ||
this instanceof ActivityWidgetSync ||
this instanceof ActivityWidgetUnified) {
Toast.makeText(this, R.string.title_notification_redacted, Toast.LENGTH_LONG).show();
} else {
Intent intent = getIntent();
processStreams(intent);
Intent main = new Intent(this, ActivityMain.class)
.putExtra("intent", intent);
main.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
startActivity(main);
}
} else {
if (!auth && Helper.shouldAutoLockNav(this))
getMainHandler().postDelayed(autoLockNav, Helper.AUTOLOCK_GRACE * 1000L);
}
}
@@ -399,18 +397,6 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
finishAffinity();
}
private final Runnable autoLockNav = new Runnable() {
@Override
public void run() {
try {
if (Helper.willAuthenticate(ActivityBase.this))
lock();
} catch (Throwable ex) {
Log.e(ex);
}
}
};
private void processStreams(Intent intent) {
intent.setClipData(null);

16
app/src/main/java/eu/faircode/email/Helper.java
View File

@@ -2012,14 +2012,6 @@ public class Helper {
return false;
}
static boolean willAuthenticate(Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
long now = new Date().getTime();
long last_authentication = prefs.getLong("last_authentication", 0);
long biometrics_timeout = prefs.getInt("biometrics_timeout", 2) * 60 * 1000L;
return (last_authentication + biometrics_timeout < now);
}
static boolean shouldAutoLock(Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean biometrics = prefs.getBoolean("biometrics", false);
@@ -2028,14 +2020,6 @@ public class Helper {
return (autolock && (biometrics || !TextUtils.isEmpty(pin)));
}
static boolean shouldAutoLockNav(Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean biometrics = prefs.getBoolean("biometrics", false);
String pin = prefs.getString("pin", null);
boolean autolock_nav = prefs.getBoolean("autolock_nav", false);
return (autolock_nav && (biometrics || !TextUtils.isEmpty(pin)));
}
static void authenticate(final FragmentActivity activity, final LifecycleOwner owner,
Boolean enabled, final
Runnable authenticated, final Runnable cancelled) {