mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-26 01:36:55 +00:00
Code Issues Releases Wiki Activity

Redact notifications when PIN too

Browse source
This commit is contained in:
M66B 2020-07-28 21:26:48 +02:00
parent 5d9519ef6d
commit 191ff6c929
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/Core.java
View file

@ -3238,10 +3238,12 @@ class Core {
boolean notify_preview_only = prefs.getBoolean("notify_preview_only", false);
boolean wearable_preview = prefs.getBoolean("wearable_preview", false);
boolean biometrics = prefs.getBoolean("biometrics", false);
String pin = prefs.getString("pin", null);
boolean biometric_notify = prefs.getBoolean("biometrics_notify", false);
boolean pro = ActivityBilling.isPro(context);
if (biometrics && !biometric_notify)
boolean redacted = ((biometrics || !TextUtils.isEmpty(pin)) && !biometric_notify);
if (redacted)
notify_summary = true;
Log.i("Notify messages=" + messages.size() +
@ -3338,7 +3340,7 @@ class Core {
List<NotificationCompat.Builder> notifications = getNotificationUnseen(context,
group, groupMessages.get(group),
notify_summary, new_messages,
biometrics && !biometric_notify);
redacted);
Log.i("Notify group=" + group + " count=" + notifications.size() +
" added=" + add.size() + " removed=" + remove.size());
@ -3540,7 +3542,7 @@ class Core {
if (notify_preview)
if (redacted)
builder.setContentText(context.getString(R.string.title_setup_biometrics));
builder.setContentText(context.getString(R.string.title_notification_redacted));
else {
DateFormat DTF = Helper.getDateTimeInstance(context, SimpleDateFormat.SHORT, SimpleDateFormat.SHORT);
StringBuilder sb = new StringBuilder();

2
app/src/main/res/values/strings.xml
View file

@ -103,6 +103,8 @@
<string name="title_notification_sending_left">Attempts left: %1$d</string>
<string name="title_notification_sending_failed">Sending to %1$s failed</string>
<string name="title_notification_redacted">Redacted: biometric or PIN authentication enabled</string>
<string name="title_of">%1$s/%2$s</string>
<string name="title_name_count">%1$s (%2$s)</string>
<string name="title_name_plus">%1$s +%2$d</string>