kopia lustrzana https://github.com/ryukoposting/Signal-Android
rodzic
6f46e9000b
commit
906441c90c
|
@ -36,7 +36,7 @@ class ThreadDatabaseTest_pinned {
|
||||||
SignalDatabase.mms.deleteMessage(messageId)
|
SignalDatabase.mms.deleteMessage(messageId)
|
||||||
|
|
||||||
// THEN
|
// THEN
|
||||||
val pinned = SignalDatabase.threads.getPinnedThreadIds()
|
val pinned = SignalDatabase.threads.pinnedThreadIds
|
||||||
assertTrue(threadId in pinned)
|
assertTrue(threadId in pinned)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -51,7 +51,7 @@ class ThreadDatabaseTest_pinned {
|
||||||
SignalDatabase.mms.deleteMessage(messageId)
|
SignalDatabase.mms.deleteMessage(messageId)
|
||||||
|
|
||||||
// THEN
|
// THEN
|
||||||
val unarchivedCount = SignalDatabase.threads.getUnarchivedConversationListCount()
|
val unarchivedCount = SignalDatabase.threads.unarchivedConversationListCount
|
||||||
assertEquals(1, unarchivedCount)
|
assertEquals(1, unarchivedCount)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -3162,7 +3162,7 @@ open class RecipientDatabase(context: Context, databaseHelper: SignalDatabase) :
|
||||||
val recipientsWithinInteractionThreshold: MutableSet<RecipientId> = LinkedHashSet()
|
val recipientsWithinInteractionThreshold: MutableSet<RecipientId> = LinkedHashSet()
|
||||||
|
|
||||||
threadDatabase.readerFor(threadDatabase.getRecentPushConversationList(-1, false)).use { reader ->
|
threadDatabase.readerFor(threadDatabase.getRecentPushConversationList(-1, false)).use { reader ->
|
||||||
var record: ThreadRecord? = reader.getNext()
|
var record: ThreadRecord? = reader.next
|
||||||
|
|
||||||
while (record != null && record.date > lastInteractionThreshold) {
|
while (record != null && record.date > lastInteractionThreshold) {
|
||||||
val recipient = Recipient.resolved(record.recipient.id)
|
val recipient = Recipient.resolved(record.recipient.id)
|
||||||
|
@ -3171,7 +3171,7 @@ open class RecipientDatabase(context: Context, databaseHelper: SignalDatabase) :
|
||||||
} else {
|
} else {
|
||||||
recipientsWithinInteractionThreshold.add(recipient.id)
|
recipientsWithinInteractionThreshold.add(recipient.id)
|
||||||
}
|
}
|
||||||
record = reader.getNext()
|
record = reader.next
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Plik diff jest za duży
Load Diff
Plik diff jest za duży
Load Diff
|
@ -17,9 +17,9 @@ class ConversationListTabRepository {
|
||||||
fun getNumberOfUnreadConversations(): Observable<Long> {
|
fun getNumberOfUnreadConversations(): Observable<Long> {
|
||||||
return Observable.create<Long> {
|
return Observable.create<Long> {
|
||||||
fun refresh() {
|
fun refresh() {
|
||||||
it.onNext(SignalDatabase.threads.getUnreadThreadCount())
|
it.onNext(SignalDatabase.threads.unreadThreadCount)
|
||||||
|
|
||||||
val ids = SignalDatabase.threads.getUnreadThreadIdList()
|
val ids = SignalDatabase.threads.unreadThreadIdList
|
||||||
Log.d(TAG, "Unread threads: { $ids }")
|
Log.d(TAG, "Unread threads: { $ids }")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -104,4 +104,12 @@ public final class CursorUtil {
|
||||||
|
|
||||||
return row.toString();
|
return row.toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static @Nullable <T> T getAggregateOrDefault(@NonNull Cursor cursor, @Nullable T defaultValue, @NonNull Function<Integer, T> cursorColumnFn) {
|
||||||
|
if (cursor.moveToFirst()) {
|
||||||
|
return cursorColumnFn.apply(0);
|
||||||
|
} else {
|
||||||
|
return defaultValue;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Ładowanie…
Reference in New Issue