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

Fix various compiler warnings.

Browse Source
This commit is contained in:
Cody Henthorne
2022-12-12 15:21:09 -05:00
parent 819c9f61dc
commit c5b4f44ab8
26 changed files with 48 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/database/RecipientTable.kt
View File

@@ -2186,7 +2186,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
}
fun bulkUpdatedRegisteredStatus(registered: Map<RecipientId, ServiceId?>, unregistered: Collection<RecipientId>) {
writableDatabase.withinTransaction { db ->
writableDatabase.withinTransaction {
val registeredWithServiceId: Set<RecipientId> = getRegisteredWithServiceIds()
val needsMarkRegistered: Map<RecipientId, ServiceId?> = registered - registeredWithServiceId
@@ -2855,7 +2855,7 @@ open class RecipientTable(context: Context, databaseHelper: SignalDatabase) : Da
operations += PnpOperation.ChangeNumberInsert(
recipientId = data.byAciSid,
oldE164 = data.aciSidRecord.e164,
newE164 = e164!!
newE164 = e164
)
}
} else {

9
app/src/main/java/org/thoughtcrime/securesms/database/ThreadTable.kt
View File

@@ -15,6 +15,7 @@ import org.signal.core.util.delete
import org.signal.core.util.logging.Log
import org.signal.core.util.or
import org.signal.core.util.readToList
import org.signal.core.util.readToSingleLong
import org.signal.core.util.requireBoolean
import org.signal.core.util.requireInt
import org.signal.core.util.requireLong
@@ -1072,13 +1073,7 @@ class ThreadTable(context: Context, databaseHelper: SignalDatabase) : DatabaseTa
.from(TABLE_NAME)
.where("$RECIPIENT_ID = ?", recipientId)
.run()
.use { cursor ->
return if (cursor.moveToFirst()) {
cursor.requireLong(ID)
} else {
-1
}
}
.readToSingleLong(-1)
}
fun getOrCreateValidThreadId(recipient: Recipient, candidateId: Long): Long {

4
app/src/main/java/org/thoughtcrime/securesms/database/model/StoryViewState.kt
View File

@@ -19,7 +19,7 @@ enum class StoryViewState {
companion object {
@JvmStatic
fun getForRecipientId(recipientId: RecipientId): Observable<StoryViewState> {
if (recipientId.equals(Recipient.self().id)) {
if (recipientId == Recipient.self().id) {
return Observable.fromCallable {
SignalDatabase.recipients.getDistributionListRecipientIds()
}.flatMap { ids ->
@@ -27,7 +27,7 @@ enum class StoryViewState {
if (combined.isEmpty()) {
NONE
} else {
val results = combined.toList() as List<StoryViewState>
val results: List<StoryViewState> = combined.filterIsInstance<StoryViewState>()
when {
results.any { it == UNVIEWED } -> UNVIEWED
results.any { it == VIEWED } -> VIEWED