mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added notifying ignore state

This commit is contained in:
M66B 2021-01-27 15:48:49 +01:00
parent 303c4a4eca
commit b4f37fca7c
3 changed files with 56 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2964,6 +2964,7 @@ class Core {
try {
db.beginTransaction();
message.notifying = EntityMessage.NOTIFYING_IGNORE;
message.id = db.message().insertMessage(message);
Log.i(folder.name + " added id=" + message.id + " uid=" + message.uid);
@ -2979,7 +2980,7 @@ class Core {
runRules(context, imessage, account, folder, message, rules);
if (download && !message.ui_hide &&
MessageClassifier.isEnabled(context) && folder.auto_classify_source)
db.message().setMessageUiHide(message.id, true);
db.message().setMessageUiHide(message.id, true); // keep local value
db.setTransactionSuccessful();
} catch (SQLiteConstraintException ex) {
@ -2996,48 +2997,52 @@ class Core {
db.endTransaction();
}
if (message.received > account.created)
updateContactInfo(context, folder, message);
try {
if (message.received > account.created)
updateContactInfo(context, folder, message);
// Download small messages inline
if (download && !message.ui_hide) {
long maxSize;
if (state == null || state.networkState.isUnmetered())
maxSize = MessageHelper.SMALL_MESSAGE_SIZE;
else {
maxSize = prefs.getInt("download", MessageHelper.DEFAULT_DOWNLOAD_SIZE);
if (maxSize == 0 || maxSize > MessageHelper.SMALL_MESSAGE_SIZE)
// Download small messages inline
if (download && !message.ui_hide) {
long maxSize;
if (state == null || state.networkState.isUnmetered())
maxSize = MessageHelper.SMALL_MESSAGE_SIZE;
}
if ((message.size != null && message.size < maxSize) ||
(MessageClassifier.isEnabled(context)) && folder.auto_classify_source)
try {
String body = parts.getHtml(context);
File file = message.getFile(context);
Helper.writeText(file, body);
String text = HtmlHelper.getFullText(body);
message.preview = HtmlHelper.getPreview(text);
message.language = HtmlHelper.getLanguage(context, message.subject, text);
db.message().setMessageContent(message.id,
true,
message.language,
parts.isPlainOnly(),
message.preview,
parts.getWarnings(message.warning));
MessageClassifier.classify(message, folder, null, context);
if (stats != null && body != null)
stats.content += body.length();
Log.i(folder.name + " inline downloaded message id=" + message.id +
" size=" + message.size + "/" + (body == null ? null : body.length()));
if (TextUtils.isEmpty(body) && parts.hasBody())
reportEmptyMessage(context, state, account, istore);
} finally {
if (!message.ui_hide)
db.message().setMessageUiHide(message.id, false);
else {
maxSize = prefs.getInt("download", MessageHelper.DEFAULT_DOWNLOAD_SIZE);
if (maxSize == 0 || maxSize > MessageHelper.SMALL_MESSAGE_SIZE)
maxSize = MessageHelper.SMALL_MESSAGE_SIZE;
}
if ((message.size != null && message.size < maxSize) ||
(MessageClassifier.isEnabled(context)) && folder.auto_classify_source)
try {
String body = parts.getHtml(context);
File file = message.getFile(context);
Helper.writeText(file, body);
String text = HtmlHelper.getFullText(body);
message.preview = HtmlHelper.getPreview(text);
message.language = HtmlHelper.getLanguage(context, message.subject, text);
db.message().setMessageContent(message.id,
true,
message.language,
parts.isPlainOnly(),
message.preview,
parts.getWarnings(message.warning));
MessageClassifier.classify(message, folder, null, context);
if (stats != null && body != null)
stats.content += body.length();
Log.i(folder.name + " inline downloaded message id=" + message.id +
" size=" + message.size + "/" + (body == null ? null : body.length()));
if (TextUtils.isEmpty(body) && parts.hasBody())
reportEmptyMessage(context, state, account, istore);
} finally {
if (!message.ui_hide)
db.message().setMessageUiHide(message.id, false);
}
}
} finally {
db.message().setMessageNotifying(message.id, 0);
}
reportNewMessage(context, account, folder, message);
@ -3559,6 +3564,11 @@ class Core {
// Current
for (TupleMessageEx message : messages) {
if (message.notifying == EntityMessage.NOTIFYING_IGNORE) {
Log.e("Notify ignore");
continue;
}
// Check if notification channel enabled
if (message.notifying == 0 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && pro) {
String channelId = message.getNotificationChannelId();

5
app/src/main/java/eu/faircode/email/DaoMessage.java
View File

@ -475,7 +475,8 @@ public interface DaoMessage {
" WHERE account.`synchronize`" +
" AND folder.notify" +
" AND (account.created IS NULL OR message.received > account.created OR message.sent > account.created)" +
" AND (notifying <> 0 OR NOT (message.ui_seen OR message.ui_hide))" +
" AND message.notifying <> " + EntityMessage.NOTIFYING_IGNORE +
" AND (message.notifying <> 0 OR NOT (message.ui_seen OR message.ui_hide))" +
" ORDER BY message.received DESC")
LiveData<List<TupleMessageEx>> liveUnseenNotify();
@ -487,6 +488,7 @@ public interface DaoMessage {
" WHERE (:account IS NULL OR account.id = :account)" +
" AND account.`synchronize`" +
" AND folder.notify" +
" AND message.notifying <> " + EntityMessage.NOTIFYING_IGNORE +
" AND NOT (message.ui_seen OR message.ui_hide)" +
" GROUP BY account.id" +
" ORDER BY account.id")
@ -499,6 +501,7 @@ public interface DaoMessage {
" WHERE (:account IS NULL OR account.id = :account)" +
" AND account.`synchronize`" +
" AND folder.notify" +
" AND message.notifying <> " + EntityMessage.NOTIFYING_IGNORE +
" AND NOT (message.ui_seen OR message.ui_hide)")
TupleMessageStats getWidgetUnseen(Long account);

2
app/src/main/java/eu/faircode/email/EntityMessage.java
View File

@ -89,6 +89,8 @@ import static androidx.room.ForeignKey.SET_NULL;
public class EntityMessage implements Serializable {
static final String TABLE_NAME = "message";
static final int NOTIFYING_IGNORE = -2;
static final Integer ENCRYPT_NONE = 0;
static final Integer PGP_SIGNENCRYPT = 1;
static final Integer PGP_SIGNONLY = 2;