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

SignalServiceAttachment classes renamed to SessionServiceAttachment to avoid confusion

Browse Source
This commit is contained in:
Brice 2020-12-17 14:36:32 +11:00
parent 26b2ead673
commit c286efae9d
3 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SignalServiceAttachment.kt → libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachment.kt
View File

@ -5,7 +5,7 @@ import org.session.libsignal.libsignal.util.guava.Optional
import org.session.libsignal.service.api.messages.SignalServiceAttachment import org.session.libsignal.service.api.messages.SignalServiceAttachment
import java.io.InputStream import java.io.InputStream
abstract class SignalServiceAttachment protected constructor(val contentType: String?) { abstract class SessionServiceAttachment protected constructor(val contentType: String?) {
var attachmentId: Long = 0 var attachmentId: Long = 0
var isGif: Boolean = false var isGif: Boolean = false
@ -17,12 +17,12 @@ abstract class SignalServiceAttachment protected constructor(val contentType: St
abstract fun isStream(): Boolean abstract fun isStream(): Boolean
abstract fun isPointer(): Boolean abstract fun isPointer(): Boolean
fun asStream(): SignalServiceAttachmentStream { fun asStream(): SessionServiceAttachmentStream {
return this as SignalServiceAttachmentStream return this as SessionServiceAttachmentStream
} }
fun asPointer(): SignalServiceAttachmentPointer { fun asPointer(): SessionServiceAttachmentPointer {
return this as SignalServiceAttachmentPointer return this as SessionServiceAttachmentPointer
} }
fun shouldHaveImageSize(): Boolean { fun shouldHaveImageSize(): Boolean {
@ -84,11 +84,11 @@ abstract class SignalServiceAttachment protected constructor(val contentType: St
return this return this
} }
fun build(): SignalServiceAttachmentStream { fun build(): SessionServiceAttachmentStream {
requireNotNull(inputStream) { "Must specify stream!" } requireNotNull(inputStream) { "Must specify stream!" }
requireNotNull(contentType) { "No content type specified!" } requireNotNull(contentType) { "No content type specified!" }
require(length != 0L) { "No length specified!" } require(length != 0L) { "No length specified!" }
return SignalServiceAttachmentStream(inputStream, contentType, length, Optional.fromNullable(fileName), voiceNote, Optional.absent(), width, height, Optional.fromNullable(caption), listener) return SessionServiceAttachmentStream(inputStream, contentType, length, Optional.fromNullable(fileName), voiceNote, Optional.absent(), width, height, Optional.fromNullable(caption), listener)
} }
} }

11
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SignalServiceAttachmentPointer.kt → libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentPointer.kt
View File

@ -6,7 +6,6 @@
package org.session.libsession.messaging.sending_receiving.attachments package org.session.libsession.messaging.sending_receiving.attachments
import org.session.libsignal.libsignal.util.guava.Optional import org.session.libsignal.libsignal.util.guava.Optional
import org.session.libsignal.service.api.messages.SignalServiceAttachment
/** /**
* Represents a received SignalServiceAttachment "handle." This * Represents a received SignalServiceAttachment "handle." This
@ -15,11 +14,11 @@ import org.session.libsignal.service.api.messages.SignalServiceAttachment
* *
* @author Moxie Marlinspike * @author Moxie Marlinspike
*/ */
class SignalServiceAttachmentPointer(val id: Long, contentType: String?, val key: ByteArray?, class SessionServiceAttachmentPointer(val id: Long, contentType: String?, key: ByteArray?,
val size: Optional<Int>, val preview: Optional<ByteArray>, val size: Optional<Int>, val preview: Optional<ByteArray>,
val width: Int, val height: Int, val width: Int, val height: Int,
val digest: Optional<ByteArray>, val fileName: Optional<String>, val digest: Optional<ByteArray>, val fileName: Optional<String>,
val voiceNote: Boolean, val caption: Optional<String>, val url: String) : SignalServiceAttachment(contentType) { val voiceNote: Boolean, val caption: Optional<String>, url: String) : SessionServiceAttachment(contentType) {
override fun isStream(): Boolean { override fun isStream(): Boolean {
return false return false
} }

2
libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SignalServiceAttachmentStream.kt → libsession/src/main/java/org/session/libsession/messaging/sending_receiving/attachments/SessionServiceAttachmentStream.kt
View File

@ -16,7 +16,7 @@ import kotlin.math.round
/** /**
* Represents a local SignalServiceAttachment to be sent. * Represents a local SignalServiceAttachment to be sent.
*/ */
class SignalServiceAttachmentStream(val inputStream: InputStream?, contentType: String?, val length: Long, val fileName: Optional<String?>?, val voiceNote: Boolean, val preview: Optional<ByteArray?>, val width: Int, val height: Int, val caption: Optional<String?>, val listener: SAttachment.ProgressListener?) : SignalServiceAttachment(contentType) { class SessionServiceAttachmentStream(val inputStream: InputStream?, contentType: String?, val length: Long, val fileName: Optional<String?>?, val voiceNote: Boolean, val preview: Optional<ByteArray?>, val width: Int, val height: Int, val caption: Optional<String?>, val listener: SAttachment.ProgressListener?) : SessionServiceAttachment(contentType) {
constructor(inputStream: InputStream?, contentType: String?, length: Long, fileName: Optional<String?>?, voiceNote: Boolean, listener: SAttachment.ProgressListener?) : this(inputStream, contentType, length, fileName, voiceNote, Optional.absent<ByteArray?>(), 0, 0, Optional.absent<String?>(), listener) {} constructor(inputStream: InputStream?, contentType: String?, length: Long, fileName: Optional<String?>?, voiceNote: Boolean, listener: SAttachment.ProgressListener?) : this(inputStream, contentType, length, fileName, voiceNote, Optional.absent<ByteArray?>(), 0, 0, Optional.absent<String?>(), listener) {}