Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 09:20:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix l10n when searching for "Note to Self".

Browse Source
This commit is contained in:
Rashad Sookram
2022-01-26 16:23:12 -05:00
committed by Cody Henthorne
parent 33f4bb0000
commit 125ff83bac
8 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java
View File

@@ -10,9 +10,9 @@ import androidx.annotation.Nullable;
import com.annimon.stream.Stream;
import org.signal.core.util.concurrent.LatestPrioritizedSerialExecutor;
import org.signal.core.util.concurrent.SignalExecutors;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.contacts.ContactRepository;
import org.thoughtcrime.securesms.database.GroupDatabase;
import org.thoughtcrime.securesms.database.MentionDatabase;
@@ -32,7 +32,6 @@ import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.util.CursorUtil;
import org.thoughtcrime.securesms.util.FtsUtil;
import org.thoughtcrime.securesms.util.Util;
import org.signal.core.util.concurrent.LatestPrioritizedSerialExecutor;
import org.thoughtcrime.securesms.util.concurrent.SerialExecutor;
import java.util.ArrayList;
@@ -56,6 +55,7 @@ public class SearchRepository {
private static final String TAG = Log.tag(SearchRepository.class);
private final Context context;
private final String noteToSelfTitle;
private final SearchDatabase searchDatabase;
private final ContactRepository contactRepository;
private final ThreadDatabase threadDatabase;
@@ -66,14 +66,15 @@ public class SearchRepository {
private final LatestPrioritizedSerialExecutor searchExecutor;
private final Executor serialExecutor;
public SearchRepository() {
public SearchRepository(@NonNull String noteToSelfTitle) {
this.context = ApplicationDependencies.getApplication().getApplicationContext();
this.noteToSelfTitle = noteToSelfTitle;
this.searchDatabase = SignalDatabase.messageSearch();
this.threadDatabase = SignalDatabase.threads();
this.recipientDatabase = SignalDatabase.recipients();
this.mentionDatabase = SignalDatabase.mentions();
this.mmsDatabase = SignalDatabase.mms();
this.contactRepository = new ContactRepository(context);
this.contactRepository = new ContactRepository(context, noteToSelfTitle);
this.searchExecutor = new LatestPrioritizedSerialExecutor(SignalExecutors.BOUNDED);
this.serialExecutor = new SerialExecutor(SignalExecutors.BOUNDED);
}
@@ -173,7 +174,7 @@ public class SearchRepository {
}
}
if (context.getString(R.string.note_to_self).toLowerCase().contains(query.toLowerCase())) {
if (noteToSelfTitle.toLowerCase().contains(query.toLowerCase())) {
recipientIds.add(Recipient.self().getId());
}