mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-04 02:28:18 +00:00
Code Issues Releases Wiki Activity

Report spam similar

Browse source
This commit is contained in:
M66B 2025-01-09 10:55:10 +01:00
parent 4a04357d73
commit ff305ddd93
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -468,6 +468,11 @@ public interface DaoMessage {
" AND (:to IS NULL OR received IS NULL OR received < :to)")
List<TupleThreadInfo> getThreadInfo(long account, List<String> msgids, Long from, Long to);
@Query("SELECT * FROM message" +
" WHERE folder = :folder" +
" AND sender = :sender")
List<EntityMessage> getMessagesBySender(long folder, String sender);
@Query("SELECT * FROM message" +
" WHERE account = :account" +
" AND sender = :sender" +

11
app/src/main/java/eu/faircode/email/FragmentMessages.java
View file

@ -10956,9 +10956,18 @@ public class FragmentMessages extends FragmentBase
if (junk == null)
throw new IllegalArgumentException(context.getString(R.string.title_no_junk_folder));
if (!message.folder.equals(junk.id))
if (!message.folder.equals(junk.id)) {
EntityOperation.queue(context, message, EntityOperation.MOVE, junk.id, null, null, true);
if (!Helper.isPlayStoreInstall()) {
List<EntityMessage> similar = db.message().getMessagesBySender(message.folder, message.sender);
if (similar != null)
for (EntityMessage m : similar)
if (!message.id.equals(m.id))
EntityOperation.queue(context, m, EntityOperation.MOVE, junk.id, null, null, true);
}
}
if (block_domain) {
List<EntityRule> rules = EntityRule.blockSender(context, message, junk, block_domain);
for (EntityRule rule : rules) {