mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Do not cache locale in each conversation object. 

Fixes #9751
fork-5.53.8
Fumiaki Yoshimatsu 2020-06-18 09:40:23 -04:00 zatwierdzone przez Greyson Parrelli
rodzic b262efc24c
commit 66f2668326
3 zmienionych plików z 6 dodań i 19 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListAdapter.java
Wyświetl plik

@ -141,7 +141,7 @@ class ConversationListAdapter extends PagedListAdapter<Conversation, RecyclerVie
casted.getConversationListItem().bind(conversation.getThreadRecord(),
glideRequests,
conversation.getLocale(),
Locale.getDefault(),
typingSet,
getBatchSelectionIds(),
batchMode);

7
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListDataSource.java
Wyświetl plik

@ -20,7 +20,6 @@ import org.thoughtcrime.securesms.util.paging.SizeFixResult;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.concurrent.Executor;
abstract class ConversationListDataSource extends PositionalDataSource<Conversation> {
@ -60,14 +59,13 @@ abstract class ConversationListDataSource extends PositionalDataSource<Conversat
long start = System.currentTimeMillis();
List<Conversation> conversations = new ArrayList<>(params.requestedLoadSize);
Locale locale = Locale.getDefault();
int totalCount = getTotalCount();
int effectiveCount = params.requestedStartPosition;
try (ThreadDatabase.Reader reader = threadDatabase.readerFor(getCursor(params.requestedStartPosition, params.requestedLoadSize))) {
ThreadRecord record;
while ((record = reader.getNext()) != null && effectiveCount < totalCount && !isInvalid()) {
conversations.add(new Conversation(record, locale));
conversations.add(new Conversation(record));
effectiveCount++;
}
}
@ -86,12 +84,11 @@ abstract class ConversationListDataSource extends PositionalDataSource<Conversat
long start = System.currentTimeMillis();
List<Conversation> conversations = new ArrayList<>(params.loadSize);
Locale locale = Locale.getDefault();
try (ThreadDatabase.Reader reader = threadDatabase.readerFor(getCursor(params.startPosition, params.loadSize))) {
ThreadRecord record;
while ((record = reader.getNext()) != null && !isInvalid()) {
conversations.add(new Conversation(record, locale));
conversations.add(new Conversation(record));
}
}

16
app/src/main/java/org/thoughtcrime/securesms/conversationlist/model/Conversation.java
Wyświetl plik

@ -4,37 +4,27 @@ import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.database.model.ThreadRecord;
import java.util.Locale;
import java.util.Objects;
public class Conversation {
private final ThreadRecord threadRecord;
private final Locale locale;
public Conversation(@NonNull ThreadRecord threadRecord, @NonNull Locale locale) {
public Conversation(@NonNull ThreadRecord threadRecord) {
this.threadRecord = threadRecord;
this.locale = locale;
}
public @NonNull ThreadRecord getThreadRecord() {
return threadRecord;
}
public @NonNull Locale getLocale() {
return locale;
}
@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
Conversation that = (Conversation) o;
return threadRecord.equals(that.threadRecord) &&
locale.equals(that.locale);
return threadRecord.equals(that.threadRecord);
}
@Override
public int hashCode() {
return Objects.hash(threadRecord, locale);
return threadRecord.hashCode();
}
}