Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-02 19:10:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Take threading into account when searching

Browse Source
This commit is contained in:
M66B
2019-11-09 19:46:12 +01:00
parent 4049ad137b
commit 026fd10347
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/eu/faircode/email/BoundaryCallbackMessages.java
View File

@@ -163,6 +163,9 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
private int load_device(State state) {
DB db = DB.getInstance(context);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean threading = prefs.getBoolean("threading", true);
Boolean seen = null;
Boolean flagged = null;
Boolean snoozed = null;
@@ -229,7 +232,10 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
if (match.matched != null && match.matched) {
found++;
db.message().setMessageFound(match.account, match.thread);
if (threading)
db.message().setMessageFound(match.account, match.thread);
else
db.message().setMessageFound(match.id);
}
}
}
@@ -249,6 +255,10 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
private int load_server(State state) throws MessagingException, IOException {
DB db = DB.getInstance(context);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean threading = prefs.getBoolean("threading", true);
boolean debug = (prefs.getBoolean("debug", false) || BuildConfig.BETA_RELEASE);
final EntityFolder browsable = db.folder().getBrowsableFolder(folder, query != null);
if (browsable == null)
return 0;
@@ -263,9 +273,6 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
if (!ConnectionHelper.getNetworkState(context).isSuitable())
throw new IllegalStateException(context.getString(R.string.title_no_internet));
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean debug = (prefs.getBoolean("debug", false) || BuildConfig.BETA_RELEASE);
Log.i("Boundary server connecting account=" + account.name);
state.iservice = new MailService(context, account.getProtocol(), account.realm, account.insecure, false, debug);
state.iservice.setPartialFetch(account.partial_fetch);
@@ -473,7 +480,10 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
found++;
}
if (message != null)
db.message().setMessageFound(message.account, message.thread);
if (threading)
db.message().setMessageFound(message.account, message.thread);
else
db.message().setMessageFound(message.id);
} catch (MessageRemovedException ex) {
Log.w(browsable.name + " boundary server", ex);
} catch (FolderClosedException ex) {