Remove incomplete SyncedExpiry implementation
charles
1 year ago
parent
18ff597811
commit
1ba8f9f80d
@ -1,58 +0,0 @@
|
||||
package org.session.libsession.messaging.jobs
|
||||
|
||||
import org.session.libsession.messaging.MessagingModuleConfiguration
|
||||
import org.session.libsession.messaging.messages.ExpirationConfiguration
|
||||
import org.session.libsession.messaging.utilities.Data
|
||||
|
||||
class DisappearingMessagesJob(
|
||||
val messageIds: List<Long> = emptyList(),
|
||||
val startedAtMs: Long = 0,
|
||||
val threadId: Long = 0
|
||||
) : Job {
|
||||
|
||||
override var delegate: JobDelegate? = null
|
||||
override var id: String? = null
|
||||
override var failureCount: Int = 0
|
||||
override val maxFailureCount: Int = 1
|
||||
|
||||
override fun execute() {
|
||||
if (!ExpirationConfiguration.isNewConfigEnabled) return
|
||||
try {
|
||||
val ids = MessagingModuleConfiguration.shared.storage.getExpiringMessages(messageIds).map { it.first }
|
||||
if (ids.isNotEmpty()) {
|
||||
JobQueue.shared.add(SyncedExpiriesJob(ids, startedAtMs, threadId))
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
delegate?.handleJobFailed(this, e)
|
||||
return
|
||||
}
|
||||
delegate?.handleJobSucceeded(this)
|
||||
}
|
||||
|
||||
override fun serialize(): Data = Data.Builder()
|
||||
.putLongArray(MESSAGE_IDS, messageIds.toLongArray())
|
||||
.putLong(STARTED_AT_MS, startedAtMs)
|
||||
.putLong(THREAD_ID, threadId)
|
||||
.build()
|
||||
|
||||
override fun getFactoryKey(): String = KEY
|
||||
|
||||
class Factory : Job.Factory<DisappearingMessagesJob> {
|
||||
override fun create(data: Data): DisappearingMessagesJob {
|
||||
return DisappearingMessagesJob(
|
||||
data.getLongArray(MESSAGE_IDS).toList(),
|
||||
data.getLong(STARTED_AT_MS),
|
||||
data.getLong(THREAD_ID)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
const val KEY = "DisappearingMessagesJob"
|
||||
|
||||
private const val MESSAGE_IDS = "messageIds"
|
||||
private const val STARTED_AT_MS = "startedAtMs"
|
||||
private const val THREAD_ID = "threadId"
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,84 +0,0 @@
|
||||
package org.session.libsession.messaging.jobs
|
||||
|
||||
import org.session.libsession.messaging.MessagingModuleConfiguration
|
||||
import org.session.libsession.messaging.messages.ExpirationConfiguration
|
||||
import org.session.libsession.messaging.messages.control.SyncedExpiriesMessage
|
||||
import org.session.libsession.messaging.messages.control.SyncedExpiry
|
||||
import org.session.libsession.messaging.sending_receiving.MessageSender
|
||||
import org.session.libsession.messaging.utilities.Data
|
||||
import org.session.libsession.snode.SnodeAPI
|
||||
import org.session.libsession.utilities.Address
|
||||
|
||||
class SyncedExpiriesJob(
|
||||
val messageIds: List<Long> = emptyList(),
|
||||
val startedAtMs: Long = 0,
|
||||
val threadId: Long = 0
|
||||
) : Job {
|
||||
|
||||
override var delegate: JobDelegate? = null
|
||||
override var id: String? = null
|
||||
override var failureCount: Int = 0
|
||||
override val maxFailureCount: Int = 1
|
||||
|
||||
override fun execute() {
|
||||
if (!ExpirationConfiguration.isNewConfigEnabled) return
|
||||
val module = MessagingModuleConfiguration.shared
|
||||
val userPublicKey = module.storage.getUserPublicKey() ?: return
|
||||
try {
|
||||
val messageIdsWithNoServerHashByExpiresIn = mutableMapOf<Long, List<Long>>()
|
||||
module.storage.getExpiringMessages(messageIds).groupBy { it.second }.forEach { (expiresInSeconds, messageIds) ->
|
||||
val serverHashesByMessageIds = module.messageDataProvider.getServerHashForMessages(messageIds.map { it.first })
|
||||
val messageIdsWithNoHash = serverHashesByMessageIds.filter { it.second == null }.map { it.first }
|
||||
if (messageIdsWithNoHash.isNotEmpty()) {
|
||||
messageIdsWithNoServerHashByExpiresIn[expiresInSeconds] = messageIdsWithNoHash
|
||||
}
|
||||
val serverHashes = serverHashesByMessageIds.mapNotNull { it.second }
|
||||
if (serverHashes.isEmpty()) return
|
||||
val expirationTimestamp = startedAtMs + expiresInSeconds * 1000
|
||||
val syncTarget = ""
|
||||
val syncedExpiriesMessage = SyncedExpiriesMessage()
|
||||
syncedExpiriesMessage.conversationExpiries = mapOf(
|
||||
syncTarget to serverHashes.map { serverHash -> SyncedExpiry(serverHash, expirationTimestamp) }
|
||||
)
|
||||
MessageSender.send(syncedExpiriesMessage, Address.fromSerialized(userPublicKey))
|
||||
SnodeAPI.updateExpiry(expirationTimestamp, serverHashes)
|
||||
}
|
||||
if (messageIdsWithNoServerHashByExpiresIn.isNotEmpty()) {
|
||||
JobQueue.shared.add(
|
||||
SyncedExpiriesJob(messageIdsWithNoServerHashByExpiresIn.flatMap { it.value }, startedAtMs, threadId)
|
||||
)
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
delegate?.handleJobFailed(this, e)
|
||||
return
|
||||
}
|
||||
delegate?.handleJobSucceeded(this)
|
||||
}
|
||||
|
||||
override fun serialize(): Data = Data.Builder()
|
||||
.putLongArray(MESSAGE_IDS, messageIds.toLongArray())
|
||||
.putLong(STARTED_AT_MS, startedAtMs)
|
||||
.putLong(THREAD_ID, threadId)
|
||||
.build()
|
||||
|
||||
override fun getFactoryKey(): String = KEY
|
||||
|
||||
class Factory : Job.Factory<SyncedExpiriesJob> {
|
||||
override fun create(data: Data): SyncedExpiriesJob {
|
||||
return SyncedExpiriesJob(
|
||||
data.getLongArray(MESSAGE_IDS).toList(),
|
||||
data.getLong(STARTED_AT_MS),
|
||||
data.getLong(THREAD_ID)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
const val KEY = "DisappearingMessagesJob"
|
||||
|
||||
private const val MESSAGE_IDS = "messageIds"
|
||||
private const val STARTED_AT_MS = "startedAtMs"
|
||||
private const val THREAD_ID = "threadId"
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,61 +0,0 @@
|
||||
package org.session.libsession.messaging.messages.control
|
||||
|
||||
import org.session.libsignal.protos.SignalServiceProtos
|
||||
import org.session.libsignal.protos.SignalServiceProtos.SyncedExpiries.SyncedConversationExpiries
|
||||
import org.session.libsignal.utilities.Log
|
||||
|
||||
class SyncedExpiriesMessage(): ControlMessage() {
|
||||
var conversationExpiries: Map<String, List<SyncedExpiry>> = emptyMap()
|
||||
|
||||
override val isSelfSendValid: Boolean = true
|
||||
|
||||
// region Validation
|
||||
override fun isValid(): Boolean {
|
||||
if (!super.isValid()) return false
|
||||
return conversationExpiries.isNotEmpty()
|
||||
}
|
||||
// endregion
|
||||
|
||||
companion object {
|
||||
const val TAG = "SyncedExpiriesMessage"
|
||||
|
||||
fun fromProto(proto: SignalServiceProtos.Content): SyncedExpiriesMessage? {
|
||||
val syncedExpiriesProto = if (proto.hasSyncedExpiries()) proto.syncedExpiries else return null
|
||||
val conversationExpiries = syncedExpiriesProto.conversationExpiriesList.associate {
|
||||
it.syncTarget to it.expiriesList.map { syncedExpiry -> SyncedExpiry.fromProto(syncedExpiry) }
|
||||
}
|
||||
return SyncedExpiriesMessage(conversationExpiries)
|
||||
}
|
||||
}
|
||||
|
||||
constructor(conversationExpiries: Map<String, List<SyncedExpiry>>) : this() {
|
||||
this.conversationExpiries = conversationExpiries
|
||||
}
|
||||
|
||||
override fun toProto(): SignalServiceProtos.Content? {
|
||||
val conversationExpiries = conversationExpiries
|
||||
if (conversationExpiries.isEmpty()) {
|
||||
Log.w(TAG, "Couldn't construct synced expiries proto from: $this")
|
||||
return null
|
||||
}
|
||||
val conversationExpiriesProto = conversationExpiries.map { (syncTarget, syncedExpiries) ->
|
||||
val expiriesProto = syncedExpiries.map(SyncedExpiry::toProto)
|
||||
val syncedConversationExpiriesProto = SyncedConversationExpiries.newBuilder()
|
||||
syncedConversationExpiriesProto.syncTarget = syncTarget
|
||||
syncedConversationExpiriesProto.addAllExpiries(expiriesProto)
|
||||
syncedConversationExpiriesProto.build()
|
||||
}
|
||||
val syncedExpiriesProto = SignalServiceProtos.SyncedExpiries.newBuilder()
|
||||
syncedExpiriesProto.addAllConversationExpiries(conversationExpiriesProto)
|
||||
val contentProto = SignalServiceProtos.Content.newBuilder()
|
||||
return try {
|
||||
contentProto.syncedExpiries = syncedExpiriesProto.build()
|
||||
setExpirationConfigurationIfNeeded(contentProto)
|
||||
contentProto.build()
|
||||
} catch (e: Exception) {
|
||||
Log.w(TAG, "Couldn't construct synced expiries proto from: $this")
|
||||
null
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,35 +0,0 @@
|
||||
package org.session.libsession.messaging.messages.control
|
||||
|
||||
import org.session.libsignal.protos.SignalServiceProtos.SyncedExpiries
|
||||
import org.session.libsignal.utilities.Log
|
||||
|
||||
class SyncedExpiry(
|
||||
var serverHash: String? = null,
|
||||
var expirationTimestamp: Long? = null
|
||||
) {
|
||||
|
||||
fun toProto(): SyncedExpiries.SyncedConversationExpiries.SyncedExpiry? {
|
||||
val syncedExpiryProto = SyncedExpiries.SyncedConversationExpiries.SyncedExpiry.newBuilder()
|
||||
serverHash?.let { syncedExpiryProto.serverHash = it }
|
||||
expirationTimestamp?.let { syncedExpiryProto.expirationTimestamp = it }
|
||||
return try {
|
||||
syncedExpiryProto.build()
|
||||
} catch (e: Exception) {
|
||||
Log.w(TAG, "Couldn't construct synced expiry proto from: $this")
|
||||
null
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
const val TAG = "SyncedExpiry"
|
||||
|
||||
@JvmStatic
|
||||
fun fromProto(proto: SyncedExpiries.SyncedConversationExpiries.SyncedExpiry): SyncedExpiry {
|
||||
val result = SyncedExpiry()
|
||||
result.serverHash = if (proto.hasServerHash()) proto.serverHash else null
|
||||
result.expirationTimestamp = if (proto.hasServerHash()) proto.expirationTimestamp else null
|
||||
return SyncedExpiry()
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue