oxen-io/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2023-12-14 02:53:01 +01:00
Code Issues 1 Projects Releases Wiki Activity

clean

Browse source
This commit is contained in:
Ryan ZHAO 2020-12-10 15:31:14 +11:00
parent ce4f7a6eff
commit c3552bfded
5 changed files with 9 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libsession/src/main/java/org/session/libsession/messaging/messages/visible/LinkPreview.kt
View file

@ -1,8 +1,6 @@
package org.session.libsession.messaging.messages.visible package org.session.libsession.messaging.messages.visible
import android.content.Context import org.session.libsession.messaging.MessagingConfiguration
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
@ -46,7 +44,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 = Configuration.shared.messageDataProvider.getAttachment(attachmentID) val attachmentProto = MessagingConfiguration.shared.messageDataProvider.getAttachment(attachmentID)
attachmentProto?.let { linkPreviewProto.image = attachmentProto.toProto() } attachmentProto?.let { linkPreviewProto.image = attachmentProto.toProto() }
} }
// Build // Build

4
libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt
View file

@ -2,7 +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.libsession.messaging.MessagingConfiguration
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
@ -48,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, Configuration.shared.messageDataProvider) addAttachmentsIfNeeded(quoteProto, MessagingConfiguration.shared.messageDataProvider)
// Build // Build
try { try {
return quoteProto.build() return quoteProto.build()

7
libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt
View file

@ -2,8 +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.messaging.MessagingConfiguration
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
@ -52,7 +51,7 @@ class VisibleMessage : Message() {
return false return false
} }
fun toProto(): SignalServiceProtos.Content? { override fun toProto(): SignalServiceProtos.Content? {
val proto = SignalServiceProtos.Content.newBuilder() val proto = SignalServiceProtos.Content.newBuilder()
var attachmentIDs = this.attachmentIDs var attachmentIDs = this.attachmentIDs
val dataMessage: SignalServiceProtos.DataMessage.Builder val dataMessage: SignalServiceProtos.DataMessage.Builder
@ -91,7 +90,7 @@ class VisibleMessage : Message() {
} }
} }
//Attachments //Attachments
val attachments = attachmentIDs.mapNotNull { Configuration.shared.messageDataProvider.getAttachment(it) } val attachments = attachmentIDs.mapNotNull { MessagingConfiguration.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

4
libsession/src/main/java/org/session/libsession/messaging/opengroups/OpenGroupMessage.kt
View file

@ -1,6 +1,6 @@
package org.session.libsession.messaging.opengroups package org.session.libsession.messaging.opengroups
import org.session.libsession.messaging.Configuration import org.session.libsession.messaging.MessagingConfiguration
import org.session.libsession.messaging.messages.visible.VisibleMessage import org.session.libsession.messaging.messages.visible.VisibleMessage
import org.session.libsignal.libsignal.logging.Log import org.session.libsignal.libsignal.logging.Log
import org.session.libsignal.service.internal.util.Hex import org.session.libsignal.service.internal.util.Hex
@ -24,7 +24,7 @@ public data class OpenGroupMessage(
// region Settings // region Settings
companion object { companion object {
fun from(message: VisibleMessage, server: String): OpenGroupMessage? { fun from(message: VisibleMessage, server: String): OpenGroupMessage? {
val storage = Configuration.shared.storage val storage = MessagingConfiguration.shared.storage
val userPublicKey = storage.getUserPublicKey() ?: return null val userPublicKey = storage.getUserPublicKey() ?: return null
// Validation // Validation
if (!message.isValid()) { return null } // Should be valid at this point if (!message.isValid()) { return null } // Should be valid at this point

14
libsession/src/main/java/org/session/libsession/snode/Configuration.kt
View file

@ -1,14 +0,0 @@
package org.session.libsession.snode
import org.session.libsignal.service.loki.utilities.Broadcaster
class Configuration(val storage: SnodeStorageProtocol, val broadcaster: Broadcaster) {
companion object {
lateinit var shared: Configuration
fun configure(storage: SnodeStorageProtocol, broadcaster: Broadcaster) {
if (Companion::shared.isInitialized) { return }
shared = Configuration(storage, broadcaster)
}
}
}