Small improvements

This commit is contained in:
M66B
2019-09-23 22:07:22 +02:00
parent e93b23263f
commit f5389600a9
12 changed files with 46 additions and 30 deletions

View File

@@ -42,6 +42,7 @@ import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -172,7 +173,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
try {
db.beginTransaction();
String find = (TextUtils.isEmpty(query) ? null : query.toLowerCase());
String find = (TextUtils.isEmpty(query) ? null : query.toLowerCase(Locale.ROOT));
for (int i = state.index; i < state.messages.size() && found < pageSize && !state.destroyed; i++) {
state.index = i + 1;
@@ -204,17 +205,17 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
for (Address address : addresses) {
String email = ((InternetAddress) address).getAddress();
String name = ((InternetAddress) address).getPersonal();
if (email != null && email.toLowerCase().contains(find) ||
name != null && name.toLowerCase().contains(find))
if (email != null && email.toLowerCase(Locale.ROOT).contains(find) ||
name != null && name.toLowerCase(Locale.ROOT).contains(find))
match = true;
}
if (!match && message.subject != null)
match = message.subject.toLowerCase().contains(find);
match = message.subject.toLowerCase(Locale.ROOT).contains(find);
if (!match && message.keywords != null && message.keywords.length > 0)
for (String keyword : message.keywords)
if (keyword.toLowerCase().contains(find)) {
if (keyword.toLowerCase(Locale.ROOT).contains(find)) {
match = true;
break;
}
@@ -222,7 +223,7 @@ public class BoundaryCallbackMessages extends PagedList.BoundaryCallback<TupleMe
if (!match && message.content) {
try {
String body = Helper.readText(message.getFile(context));
match = body.toLowerCase().contains(find);
match = body.toLowerCase(Locale.ROOT).contains(find);
} catch (IOException ex) {
Log.e(ex);
}