TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-20 00:58:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

move messageDataProvider to configuration

Browse Source
This commit is contained in:
Ryan ZHAO 2020-12-07 15:32:48 +11:00
parent 2cdbbd1d23
commit e54a43a910
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libsession/src/main/java/org/session/libsession/messaging/Configuration.kt
View File

@ -1,22 +1,31 @@
package org.session.libsession.messaging package org.session.libsession.messaging
import org.session.libsession.database.MessageDataProvider
import org.session.libsignal.libsignal.loki.SessionResetProtocol import org.session.libsignal.libsignal.loki.SessionResetProtocol
import org.session.libsignal.libsignal.state.* import org.session.libsignal.libsignal.state.*
import org.session.libsignal.metadata.certificate.CertificateValidator import org.session.libsignal.metadata.certificate.CertificateValidator
import org.session.libsignal.service.loki.protocol.closedgroups.SharedSenderKeysDatabaseProtocol import org.session.libsignal.service.loki.protocol.closedgroups.SharedSenderKeysDatabaseProtocol
class Configuration(val storage: StorageProtocol, val signalStorage: SignalProtocolStore, val sskDatabase: SharedSenderKeysDatabaseProtocol, val sessionResetImp: SessionResetProtocol, val certificateValidator: CertificateValidator) { class Configuration(
val storage: StorageProtocol,
val signalStorage: SignalProtocolStore,
val sskDatabase: SharedSenderKeysDatabaseProtocol,
val messageDataProvider: MessageDataProvider,
val sessionResetImp: SessionResetProtocol,
val certificateValidator: CertificateValidator)
{
companion object { companion object {
lateinit var shared: Configuration lateinit var shared: Configuration
fun configure(storage: StorageProtocol, fun configure(storage: StorageProtocol,
signalStorage: SignalProtocolStore, signalStorage: SignalProtocolStore,
sskDatabase: SharedSenderKeysDatabaseProtocol, sskDatabase: SharedSenderKeysDatabaseProtocol,
messageDataProvider: MessageDataProvider,
sessionResetImp: SessionResetProtocol, sessionResetImp: SessionResetProtocol,
certificateValidator: CertificateValidator certificateValidator: CertificateValidator
) { ) {
if (Companion::shared.isInitialized) { return } if (Companion::shared.isInitialized) { return }
shared = Configuration(storage, signalStorage, sskDatabase, sessionResetImp, certificateValidator) shared = Configuration(storage, signalStorage, sskDatabase, messageDataProvider, sessionResetImp, certificateValidator)
} }
} }
} }

3
libsession/src/main/java/org/session/libsession/messaging/messages/visible/LinkPreview.kt
View File

@ -2,6 +2,7 @@ package org.session.libsession.messaging.messages.visible
import android.content.Context import android.content.Context
import org.session.libsession.database.MessageDataProvider import org.session.libsession.database.MessageDataProvider
import org.session.libsession.messaging.Configuration
import org.session.libsignal.libsignal.logging.Log import org.session.libsignal.libsignal.logging.Log
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.internal.push.SignalServiceProtos
@ -45,7 +46,7 @@ class LinkPreview() {
title?.let { linkPreviewProto.title = title } title?.let { linkPreviewProto.title = title }
val attachmentID = attachmentID val attachmentID = attachmentID
attachmentID?.let { attachmentID?.let {
val attachmentProto = messageDataProvider.getAttachment(attachmentID) val attachmentProto = Configuration.shared.messageDataProvider.getAttachment(attachmentID)
attachmentProto?.let { linkPreviewProto.image = attachmentProto.toProto() } attachmentProto?.let { linkPreviewProto.image = attachmentProto.toProto() }
} }
// Build // Build

3
libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt
View File

@ -2,6 +2,7 @@ package org.session.libsession.messaging.messages.visible
import com.goterl.lazycode.lazysodium.BuildConfig import com.goterl.lazycode.lazysodium.BuildConfig
import org.session.libsession.database.MessageDataProvider import org.session.libsession.database.MessageDataProvider
import org.session.libsession.messaging.Configuration
import org.session.libsignal.libsignal.logging.Log import org.session.libsignal.libsignal.logging.Log
import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.internal.push.SignalServiceProtos
@ -47,7 +48,7 @@ class Quote() {
quoteProto.id = timestamp quoteProto.id = timestamp
quoteProto.author = publicKey quoteProto.author = publicKey
text?.let { quoteProto.text = text } text?.let { quoteProto.text = text }
addAttachmentsIfNeeded(quoteProto, messageDataProvider) addAttachmentsIfNeeded(quoteProto, Configuration.shared.messageDataProvider)
// Build // Build
try { try {
return quoteProto.build() return quoteProto.build()

3
libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt
View File

@ -3,6 +3,7 @@ package org.session.libsession.messaging.messages.visible
import com.goterl.lazycode.lazysodium.BuildConfig import com.goterl.lazycode.lazysodium.BuildConfig
import org.session.libsession.database.MessageDataProvider import org.session.libsession.database.MessageDataProvider
import org.session.libsession.messaging.Configuration
import org.session.libsession.messaging.messages.Message import org.session.libsession.messaging.messages.Message
import org.session.libsignal.libsignal.logging.Log import org.session.libsignal.libsignal.logging.Log
@ -90,7 +91,7 @@ class VisibleMessage : Message() {
} }
} }
//Attachments //Attachments
val attachments = attachmentIDs.mapNotNull { messageDataProvider.getAttachment(it) } val attachments = attachmentIDs.mapNotNull { Configuration.shared.messageDataProvider.getAttachment(it) }
if (!attachments.all { it.isUploaded }) { if (!attachments.all { it.isUploaded }) {
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
//TODO equivalent to iOS's preconditionFailure //TODO equivalent to iOS's preconditionFailure