TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-23 08:27:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup Storage

Browse Source
This commit is contained in:
Andrew 2024-02-18 02:23:12 +10:30
parent 4ead21cf1a
commit 66dcae04f6
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt
View File

@ -241,7 +241,6 @@ open class Storage(
} }
override fun markConversationAsRead(threadId: Long, lastSeenTime: Long, force: Boolean) { override fun markConversationAsRead(threadId: Long, lastSeenTime: Long, force: Boolean) {
Log.d(TAG, "markConversationAsRead() called with: threadId = $threadId, lastSeenTime = $lastSeenTime, force = $force")
val threadDb = DatabaseComponent.get(context).threadDatabase() val threadDb = DatabaseComponent.get(context).threadDatabase()
getRecipientForThread(threadId)?.let { recipient -> getRecipientForThread(threadId)?.let { recipient ->
val currentLastRead = threadDb.getLastSeenAndHasSent(threadId).first() val currentLastRead = threadDb.getLastSeenAndHasSent(threadId).first()
@ -1340,9 +1339,8 @@ open class Storage(
threadDb.setDate(threadId, newDate) threadDb.setDate(threadId, newDate)
} }
override fun getLastLegacyRecipient(threadRecipient: String): String? { override fun getLastLegacyRecipient(threadRecipient: String): String? =
return DatabaseComponent.get(context).lokiAPIDatabase().getLastLegacySenderAddress(threadRecipient) DatabaseComponent.get(context).lokiAPIDatabase().getLastLegacySenderAddress(threadRecipient)
}
override fun setLastLegacyRecipient(threadRecipient: String, senderRecipient: String?) { override fun setLastLegacyRecipient(threadRecipient: String, senderRecipient: String?) {
DatabaseComponent.get(context).lokiAPIDatabase().setLastLegacySenderAddress(threadRecipient, senderRecipient) DatabaseComponent.get(context).lokiAPIDatabase().setLastLegacySenderAddress(threadRecipient, senderRecipient)
@ -1712,8 +1710,6 @@ open class Storage(
} }
override fun setExpirationConfiguration(config: ExpirationConfiguration) { override fun setExpirationConfiguration(config: ExpirationConfiguration) {
Log.d(TAG, "setExpirationConfiguration() called with: config = $config")
val recipient = getRecipientForThread(config.threadId) ?: return val recipient = getRecipientForThread(config.threadId) ?: return
val expirationDb = DatabaseComponent.get(context).expirationConfigurationDatabase() val expirationDb = DatabaseComponent.get(context).expirationConfigurationDatabase()
@ -1738,9 +1734,7 @@ open class Storage(
} else if (recipient.isContactRecipient) { } else if (recipient.isContactRecipient) {
val contacts = configFactory.contacts ?: return val contacts = configFactory.contacts ?: return
val contact = contacts.get(recipient.address.serialize())?.copy( val contact = contacts.get(recipient.address.serialize())?.copy(expiryMode = expiryMode) ?: return
expiryMode = expiryMode
) ?: return
contacts.set(contact) contacts.set(contact)
} }
expirationDb.setExpirationConfiguration( expirationDb.setExpirationConfiguration(
@ -1778,8 +1772,8 @@ open class Storage(
val lokiDb = DatabaseComponent.get(context).lokiAPIDatabase() val lokiDb = DatabaseComponent.get(context).lokiAPIDatabase()
val recipient = threadDb.getRecipientForThreadId(threadID) ?: return val recipient = threadDb.getRecipientForThreadId(threadID) ?: return
val recipientAddress = recipient.address.serialize() val recipientAddress = recipient.address.serialize()
val recipientDb = DatabaseComponent.get(context).recipientDatabase() DatabaseComponent.get(context).recipientDatabase()
recipientDb.setDisappearingState(recipient, disappearingState); .setDisappearingState(recipient, disappearingState);
val currentLegacyRecipient = lokiDb.getLastLegacySenderAddress(recipientAddress) val currentLegacyRecipient = lokiDb.getLastLegacySenderAddress(recipientAddress)
val currentExpiry = getExpirationConfiguration(threadID) val currentExpiry = getExpirationConfiguration(threadID)
if (disappearingState == DisappearingState.LEGACY if (disappearingState == DisappearingState.LEGACY