Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-29 13:24:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Serialize notification processing

Browse Source
This commit is contained in:
M66B
2019-08-01 09:19:22 +02:00
parent 6f47a2e22c
commit e386a405ae
2 changed files with 25 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/src/main/java/eu/faircode/email/Core.java
View File

@@ -77,8 +77,6 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Properties;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Semaphore;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
@@ -121,9 +119,6 @@ class Core {
private static final long YIELD_DURATION = 200L; // milliseconds
private static final long MIN_HIDE = 60 * 1000L; // milliseconds
private static final ExecutorService executor =
Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory);
static void processOperations(
Context context,
EntityAccount account, EntityFolder folder,
@@ -1918,6 +1913,8 @@ class Core {
}
static void notifyMessages(Context context, List<TupleMessageEx> messages) {
if (messages == null)
messages = new ArrayList<>();
Log.i("Notify messages=" + messages.size());
NotificationManager nm = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
@@ -2018,27 +2015,11 @@ class Core {
}
if (remove.size() + add.size() > 0) {
final DB db = DB.getInstance(context);
executor.submit(new Runnable() {
@Override
public void run() {
try {
db.beginTransaction();
for (long id : remove)
db.message().setMessageNotifying(Math.abs(id), 0);
for (long id : add)
db.message().setMessageNotifying(Math.abs(id), (int) Math.signum(id));
db.setTransactionSuccessful();
} catch (Throwable ex) {
Log.e(ex);
} finally {
db.endTransaction();
}
}
});
DB db = DB.getInstance(context);
for (long id : remove)
db.message().setMessageNotifying(Math.abs(id), 0);
for (long id : add)
db.message().setMessageNotifying(Math.abs(id), (int) Math.signum(id));
}
}
}

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

@@ -168,19 +168,25 @@ public class ServiceSynchronize extends ServiceBase {
});
db.message().liveUnseenNotify().observe(cowner, new Observer<List<TupleMessageEx>>() {
private ExecutorService executor =
Executors.newSingleThreadExecutor(Helper.backgroundThreadFactory);
@Override
public void onChanged(List<TupleMessageEx> messages) {
try {
if (messages == null)
messages = new ArrayList<>();
Core.notifyMessages(ServiceSynchronize.this, messages);
} catch (SecurityException ex) {
Log.w(ex);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ServiceSynchronize.this);
prefs.edit().remove("sound").apply();
} catch (Throwable ex) {
Log.e(ex);
}
public void onChanged(final List<TupleMessageEx> messages) {
executor.submit(new Runnable() {
@Override
public void run() {
try {
Core.notifyMessages(ServiceSynchronize.this, messages);
} catch (SecurityException ex) {
Log.w(ex);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ServiceSynchronize.this);
prefs.edit().remove("sound").apply();
} catch (Throwable ex) {
Log.e(ex);
}
}
});
}
});