mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2024-12-25 17:27:00 +00:00
Code Issues Releases Wiki Activity

Favorite folder from email: skip disabled folders

Browse source
This commit is contained in:
M66B 2023-03-26 21:23:56 +02:00
parent af73c89994
commit e6f3560305
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/eu/faircode/email/FragmentDialogFolder.java
View file

@ -60,6 +60,7 @@ import org.json.JSONException;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@ -338,6 +339,9 @@ public class FragmentDialogFolder extends FragmentDialogBase {
long[] disabled = args.getLongArray("disabled");
long[] messages = args.getLongArray("messages");
if (disabled == null)
disabled = new long[0];
List<EntityFolder> favorites = new ArrayList<>();
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
@ -348,6 +352,7 @@ public class FragmentDialogFolder extends FragmentDialogBase {
Map<Long, Integer> frequency = new HashMap<>();
if (suggest_received &&
messages != null && messages.length < 100) {
List<Long> list = Helper.fromLongArray(disabled);
for (Long id : messages) {
EntityMessage message = db.message().getMessage(id);
if (message != null && message.from != null && message.from[0] != null) {
@ -355,7 +360,9 @@ public class FragmentDialogFolder extends FragmentDialogBase {
if (!TextUtils.isEmpty(email)) {
EntityContact contact =
db.contact().getContact(message.account, EntityContact.TYPE_FROM, email);
if (contact != null && contact.folder != null) {
if (contact != null &&
contact.folder != null &&
!list.contains(contact.folder)) {
Integer freq = frequency.get(contact.folder);
freq = (freq == null ? 1 : freq + 1);
frequency.put(contact.folder, freq);