Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-06 17:13:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow keywords for read only folders

Browse Source
This commit is contained in:
M66B
2021-11-13 16:20:00 +01:00
parent e5686c02fa
commit 9edafa09a3
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@@ -1945,7 +1945,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean trash = (move || outbox || debug ||
message.accountProtocol == EntityAccount.TYPE_POP);
boolean inbox = (move && hasInbox && (inArchive || inTrash || inJunk));
boolean keywords = (!message.folderReadOnly && message.uid != null &&
boolean keywords = (message.uid != null &&
message.accountProtocol == EntityAccount.TYPE_IMAP);
boolean labels = (data.isGmail && move && !inTrash && !inJunk && !outbox);
boolean seen = (message.uid != null ||
@@ -4738,7 +4738,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
popupMenu.getMenu().findItem(R.id.menu_create_rule).setVisible(!message.folderReadOnly);
popupMenu.getMenu().findItem(R.id.menu_manage_keywords)
.setEnabled(message.uid != null && !message.folderReadOnly)
.setEnabled(message.uid != null)
.setVisible(message.accountProtocol == EntityAccount.TYPE_IMAP);
popupMenu.getMenu().findItem(R.id.menu_search_in_text).setEnabled(message.content && !full);

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

@@ -921,14 +921,9 @@ class Core {
if (message.uid == null)
throw new IllegalArgumentException("keyword/uid");
if (!ifolder.getPermanentFlags().contains(Flags.Flag.USER)) {
if (MessageHelper.FLAG_FORWARDED.equals(keyword) && false) {
JSONArray janswered = new JSONArray();
janswered.put(true);
onAnswered(context, janswered, folder, message, ifolder);
}
if (folder.read_only ||
!ifolder.getPermanentFlags().contains(Flags.Flag.USER))
return;
}
Message imessage = ifolder.getMessageByUID(message.uid);
if (imessage == null)
@@ -3995,6 +3990,7 @@ class Core {
}
if (!Helper.equal(message.keywords, keywords) &&
!folder.read_only &&
ifolder.getPermanentFlags().contains(Flags.Flag.USER)) {
update = true;
message.keywords = keywords;