msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Added basic new email notification

Browse Source
pull/12/merge
M66B 7 years ago
parent b66ec74f98
commit 210cf6ee20
4 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File

10
app/src/main/java/eu/faircode/email/DaoAccount.java
Unescape View File

@ -49,8 +49,14 @@ public interface DaoAccount {
LiveData<EntityAccount> liveFirstAccount(); LiveData<EntityAccount> liveFirstAccount();
@Query("SELECT" + @Query("SELECT" +
" (SELECT COUNT(*) FROM account WHERE synchronize) AS accounts," + " (SELECT COUNT(*) FROM account WHERE synchronize) AS accounts" +
" (SELECT COUNT(*) FROM operation JOIN message ON message.id = operation.message JOIN account ON account.id = message.account WHERE synchronize) AS operations") ", (SELECT COUNT(*) FROM operation" +
" JOIN message ON message.id = operation.message" +
" JOIN account ON account.id = message.account" +
" WHERE synchronize) AS operations" +
", (SELECT COUNT(*) FROM message" +
" JOIN folder ON folder.id = message.folder" +
" WHERE NOT ui_seen AND folder.type = '" + EntityFolder.TYPE_INBOX + "') AS unseen")
LiveData<TupleAccountStats> liveStats(); LiveData<TupleAccountStats> liveStats();
@Insert(onConflict = OnConflictStrategy.REPLACE) @Insert(onConflict = OnConflictStrategy.REPLACE)

28
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
Unescape View File

@ -120,7 +120,7 @@ public class ServiceSynchronize extends LifecycleService {
public void onCreate() { public void onCreate() {
Log.i(Helper.TAG, "Service create"); Log.i(Helper.TAG, "Service create");
super.onCreate(); super.onCreate();
startForeground(NOTIFICATION_SYNCHRONIZE, getNotification(0, -1).build()); startForeground(NOTIFICATION_SYNCHRONIZE, getNotification(0, -1, 0).build());
// Listen for network changes // Listen for network changes
ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE); ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
@ -134,7 +134,7 @@ public class ServiceSynchronize extends LifecycleService {
public void onChanged(@Nullable TupleAccountStats stats) { public void onChanged(@Nullable TupleAccountStats stats) {
if (stats != null) { if (stats != null) {
NotificationManager nm = getSystemService(NotificationManager.class); NotificationManager nm = getSystemService(NotificationManager.class);
nm.notify(NOTIFICATION_SYNCHRONIZE, getNotification(stats.accounts, stats.operations).build()); nm.notify(NOTIFICATION_SYNCHRONIZE, getNotification(stats.accounts, stats.operations, stats.unseen).build());
} }
} }
}); });
@ -165,7 +165,7 @@ public class ServiceSynchronize extends LifecycleService {
return START_STICKY; return START_STICKY;
} }
private Notification.Builder getNotification(int acounts, int operations) { private Notification.Builder getNotification(int accounts, int operations, int unseen) {
// Build pending intent // Build pending intent
Intent intent = new Intent(this, ActivityView.class); Intent intent = new Intent(this, ActivityView.class);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@ -175,24 +175,22 @@ public class ServiceSynchronize extends LifecycleService {
// Build notification // Build notification
Notification.Builder builder; Notification.Builder builder;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
builder = new Notification.Builder(this, "service"); builder = new Notification.Builder(this, unseen == 0 ? "service" : "notification");
else else
builder = new Notification.Builder(this); builder = new Notification.Builder(this);
builder builder
.setSmallIcon(R.drawable.baseline_mail_outline_24) .setSmallIcon(R.drawable.baseline_mail_outline_24)
.setContentTitle(getString(R.string.title_synchronizing, acounts)) .setContentTitle(getString(R.string.title_notification_synchronizing, accounts))
.setContentText(getString(R.string.title_operations, operations)) .setContentText(getString(R.string.title_notification_unseen, unseen))
.setContentIntent(pi) .setContentIntent(pi)
.setStyle(new Notification.BigTextStyle().setSummaryText(getString(R.string.title_operations, operations)))
.setAutoCancel(false) .setAutoCancel(false)
.setShowWhen(false) .setShowWhen(unseen > 0)
.setPriority(Notification.PRIORITY_MIN) .setPriority(unseen == 0 ? Notification.PRIORITY_MIN : Notification.PRIORITY_DEFAULT)
.setCategory(Notification.CATEGORY_STATUS) .setCategory(Notification.CATEGORY_STATUS)
.setVisibility(Notification.VISIBILITY_SECRET); .setVisibility(Notification.VISIBILITY_SECRET);
if (operations >= 0)
builder.setContentText(getString(R.string.title_operations, operations));
return builder; return builder;
} }
@ -212,7 +210,7 @@ public class ServiceSynchronize extends LifecycleService {
builder builder
.setSmallIcon(android.R.drawable.stat_notify_error) .setSmallIcon(android.R.drawable.stat_notify_error)
.setContentTitle(getString(R.string.title_failed, action)) .setContentTitle(getString(R.string.title_notification_failed, action))
.setContentText(Helper.formatThrowable(ex)) .setContentText(Helper.formatThrowable(ex))
.setContentIntent(pi) .setContentIntent(pi)
.setAutoCancel(false) .setAutoCancel(false)
@ -1148,6 +1146,12 @@ public class ServiceSynchronize extends LifecycleService {
service.setSound(null, Notification.AUDIO_ATTRIBUTES_DEFAULT); service.setSound(null, Notification.AUDIO_ATTRIBUTES_DEFAULT);
nm.createNotificationChannel(service); nm.createNotificationChannel(service);
NotificationChannel notification = new NotificationChannel(
"notification",
context.getString(R.string.channel_notification),
NotificationManager.IMPORTANCE_DEFAULT);
nm.createNotificationChannel(notification);
NotificationChannel error = new NotificationChannel( NotificationChannel error = new NotificationChannel(
"error", "error",
context.getString(R.string.channel_error), context.getString(R.string.channel_error),

1
app/src/main/java/eu/faircode/email/TupleAccountStats.java
Unescape View File

@ -22,4 +22,5 @@ package eu.faircode.email;
public class TupleAccountStats { public class TupleAccountStats {
public Integer accounts; public Integer accounts;
public Integer operations; public Integer operations;
public Integer unseen;
} }

8
app/src/main/res/values/strings.xml
Unescape View File

@ -2,11 +2,13 @@
<string name="app_name">Safe email</string> <string name="app_name">Safe email</string>
<string name="channel_service">Service</string> <string name="channel_service">Service</string>
<string name="channel_notification">Notifications</string>
<string name="channel_error">Errors</string> <string name="channel_error">Errors</string>
<string name="title_synchronizing">Synchronizing %1$d account(s)</string> <string name="title_notification_synchronizing">Synchronizing %1$d account(s)</string>
<string name="title_operations">%1$d operation(s) pending</string> <string name="title_notification_operations">%1$d operation(s) pending</string>
<string name="title_failed">\'%1$s\' failed</string> <string name="title_notification_unseen">%1$d new message(s)</string>
<string name="title_notification_failed">\'%1$s\' failed</string>
<string name="menu_folders">Folders</string> <string name="menu_folders">Folders</string>
<string name="menu_setup">Setup</string> <string name="menu_setup">Setup</string>

Write Preview
Loading…
Cancel
Save