mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-02 13:14:39 +00:00
Code Issues Releases Wiki Activity

Revert "Prevent NPE"

Browse source 
This reverts commit 7cf2194df5.
This commit is contained in:
M66B 2022-10-24 21:51:32 +02:00
parent 90a63ef168
commit 1ba8cff55b
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/Core.java
View file

@ -3437,8 +3437,7 @@ class Core {
db.folder().setFolderSyncState(folder.id, "syncing"); db.folder().setFolderSyncState(folder.id, "syncing");
Flags flags = ifolder.getPermanentFlags(); String[] userFlags = ifolder.getPermanentFlags().getUserFlags();
String[] userFlags = (flags == null ? null : flags.getUserFlags());
if (userFlags != null && userFlags.length > 0) { if (userFlags != null && userFlags.length > 0) {
List<String> keywords = new ArrayList<>(Arrays.asList(userFlags)); List<String> keywords = new ArrayList<>(Arrays.asList(userFlags));
Collections.sort(keywords); Collections.sort(keywords);
@ -3540,11 +3539,12 @@ class Core {
: new ReceivedDateTerm(ComparisonTerm.GE, new Date(sync_time)); : new ReceivedDateTerm(ComparisonTerm.GE, new Date(sync_time));
SearchTerm searchTerm = dateTerm; SearchTerm searchTerm = dateTerm;
Flags flags = ifolder.getPermanentFlags();
if (sync_nodate && !account.isOutlook()) if (sync_nodate && !account.isOutlook())
searchTerm = new OrTerm(searchTerm, new ReceivedDateTerm(ComparisonTerm.LT, new Date(365 * 24 * 3600 * 1000L))); searchTerm = new OrTerm(searchTerm, new ReceivedDateTerm(ComparisonTerm.LT, new Date(365 * 24 * 3600 * 1000L)));
if (sync_unseen && flags != null && flags.contains(Flags.Flag.SEEN)) if (sync_unseen && flags.contains(Flags.Flag.SEEN))
searchTerm = new OrTerm(searchTerm, new FlagTerm(new Flags(Flags.Flag.SEEN), false)); searchTerm = new OrTerm(searchTerm, new FlagTerm(new Flags(Flags.Flag.SEEN), false));
if (sync_flagged && flags != null && flags.contains(Flags.Flag.FLAGGED)) if (sync_flagged && flags.contains(Flags.Flag.FLAGGED))
searchTerm = new OrTerm(searchTerm, new FlagTerm(new Flags(Flags.Flag.FLAGGED), true)); searchTerm = new OrTerm(searchTerm, new FlagTerm(new Flags(Flags.Flag.FLAGGED), true));
search = SystemClock.elapsedRealtime(); search = SystemClock.elapsedRealtime();