mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-21 00:59:49 +01:00
Update to libsignal 0.86.1
This commit is contained in:
@@ -16,7 +16,6 @@ import org.signal.core.util.requireLong
|
||||
import org.signal.core.util.select
|
||||
import org.signal.core.util.update
|
||||
import org.signal.core.util.withinTransaction
|
||||
import org.signal.libsignal.protocol.util.Pair
|
||||
import org.thoughtcrime.securesms.recipients.RecipientId
|
||||
|
||||
class GroupReceiptTable(context: Context?, databaseHelper: SignalDatabase?) : DatabaseTable(context, databaseHelper), RecipientIdDatabaseReference {
|
||||
@@ -86,12 +85,12 @@ class GroupReceiptTable(context: Context?, databaseHelper: SignalDatabase?) : Da
|
||||
val mmsMatchPrefix = "$MMS_ID = $mmsId AND"
|
||||
val unidentifiedQueries = SqlUtil.buildCollectionQuery(
|
||||
column = RECIPIENT_ID,
|
||||
values = results.filter { it.second() }.map { it.first().serialize() },
|
||||
values = results.filter { it.second }.map { it.first.serialize() },
|
||||
prefix = mmsMatchPrefix
|
||||
)
|
||||
val identifiedQueries = SqlUtil.buildCollectionQuery(
|
||||
column = RECIPIENT_ID,
|
||||
values = results.filterNot { it.second() }.map { it.first().serialize() },
|
||||
values = results.filterNot { it.second }.map { it.first.serialize() },
|
||||
prefix = mmsMatchPrefix
|
||||
)
|
||||
writableDatabase.withinTransaction { db ->
|
||||
|
||||
@@ -64,7 +64,6 @@ import org.signal.core.util.toSingleLine
|
||||
import org.signal.core.util.update
|
||||
import org.signal.core.util.withinTransaction
|
||||
import org.signal.libsignal.protocol.IdentityKey
|
||||
import org.signal.libsignal.protocol.util.Pair
|
||||
import org.thoughtcrime.securesms.attachments.Attachment
|
||||
import org.thoughtcrime.securesms.attachments.AttachmentId
|
||||
import org.thoughtcrime.securesms.attachments.DatabaseAttachment
|
||||
@@ -4295,12 +4294,12 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
|
||||
do {
|
||||
pair = getGroupAddedBy(threadId, lastQuitChecked)
|
||||
|
||||
if (pair.first() != null) {
|
||||
return pair.first()
|
||||
if (pair.first != null) {
|
||||
return pair.first
|
||||
} else {
|
||||
lastQuitChecked = pair.second()
|
||||
lastQuitChecked = pair.second
|
||||
}
|
||||
} while (pair.second() != -1L)
|
||||
} while (pair.second != -1L)
|
||||
|
||||
return null
|
||||
}
|
||||
@@ -4925,7 +4924,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
|
||||
}
|
||||
|
||||
for (expiringMessage in expiringMessages) {
|
||||
AppDependencies.expiringMessageManager.scheduleDeletion(expiringMessage.first(), true, proposedExpireStarted, expiringMessage.second())
|
||||
AppDependencies.expiringMessageManager.scheduleDeletion(expiringMessage.first, true, proposedExpireStarted, expiringMessage.second)
|
||||
}
|
||||
|
||||
for (threadId in updatedThreads) {
|
||||
|
||||
@@ -45,8 +45,8 @@ data class StickerPackParams(
|
||||
return (StickerUrl.parseActionUri(uri) ?: StickerUrl.parseShareLink(uri.toString()))
|
||||
.map { parseResult ->
|
||||
StickerPackParams(
|
||||
id = StickerPackId(parseResult.first()),
|
||||
key = StickerPackKey(parseResult.second())
|
||||
id = StickerPackId(parseResult.first),
|
||||
key = StickerPackKey(parseResult.second)
|
||||
)
|
||||
}.orNull()
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user