empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Convert ThreadDatabase to kotlin.

Browse source
This commit is contained in:
Greyson Parrelli 2022-10-28 10:57:01 -04:00 • committed by Cody Henthorne
parent 4bbe01cbc3
commit 3e3296da5b
6 changed files with 1769 additions and 1964 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/androidTest/java/org/thoughtcrime/securesms/database/ThreadDatabaseTest_pinned.kt
View file

@ -36,7 +36,7 @@ class ThreadDatabaseTest_pinned {
SignalDatabase.mms.deleteMessage(messageId)
// THEN
val pinned = SignalDatabase.threads.pinnedThreadIds
val pinned = SignalDatabase.threads.getPinnedThreadIds()
assertTrue(threadId in pinned)
}
@ -51,7 +51,7 @@ class ThreadDatabaseTest_pinned {
SignalDatabase.mms.deleteMessage(messageId)
// THEN
val unarchivedCount = SignalDatabase.threads.unarchivedConversationListCount
val unarchivedCount = SignalDatabase.threads.getUnarchivedConversationListCount()
assertEquals(1, unarchivedCount)
}

4
app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.kt
View file

@ -3181,7 +3181,7 @@ open class RecipientDatabase(context: Context, databaseHelper: SignalDatabase) :
val recipientsWithinInteractionThreshold: MutableSet<RecipientId> = LinkedHashSet()
threadDatabase.readerFor(threadDatabase.getRecentPushConversationList(-1, false)).use { reader ->
var record: ThreadRecord? = reader.next
var record: ThreadRecord? = reader.getNext()
while (record != null && record.date > lastInteractionThreshold) {
val recipient = Recipient.resolved(record.recipient.id)
@ -3190,7 +3190,7 @@ open class RecipientDatabase(context: Context, databaseHelper: SignalDatabase) :
} else {
recipientsWithinInteractionThreshold.add(recipient.id)
}
record = reader.next
record = reader.getNext()
}
}

1950
app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java
View file

File diff suppressed because it is too large Load diff

1763
app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.kt Normal file
View file

File diff suppressed because it is too large Load diff

4
app/src/main/java/org/thoughtcrime/securesms/stories/tabs/ConversationListTabRepository.kt
View file

@ -17,9 +17,9 @@ class ConversationListTabRepository {
fun getNumberOfUnreadConversations(): Observable<Long> {
return Observable.create<Long> {
fun refresh() {
it.onNext(SignalDatabase.threads.unreadThreadCount)
it.onNext(SignalDatabase.threads.getUnreadThreadCount())
val ids = SignalDatabase.threads.unreadThreadIdList
val ids = SignalDatabase.threads.getUnreadThreadIdList()
Log.d(TAG, "Unread threads: { $ids }")
}

8
core-util/src/main/java/org/signal/core/util/CursorUtil.java
View file

@ -104,12 +104,4 @@ public final class CursorUtil {
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;
}
}
}