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

ReadReceipt implementation + small corrections

Browse Source
This commit is contained in:
Brice 2020-11-27 17:27:09 +11:00
parent 8f409faefc
commit 746df2240a
9 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libsession/src/main/java/org/session/libsession/messaging/messages/control/ReadReceipt.kt
View File

@ -1,17 +1,53 @@
package org.session.libsession.messaging.messages.control
import org.session.libsignal.libsignal.logging.Log
import org.session.libsignal.service.internal.push.SignalServiceProtos
class ReadReceipt() : ControlMessage() {
var timestamps: LongArray? = null
companion object {
fun fromProto(proto: SignalServiceProtos.Content): ExpirationTimerUpdate? {
TODO("Not yet implemented")
const val TAG = "ReadReceipt"
fun fromProto(proto: SignalServiceProtos.Content): ReadReceipt? {
val receiptProto = proto.receiptMessage ?: return null
if (receiptProto.type != SignalServiceProtos.ReceiptMessage.Type.READ) return null
val timestamps = receiptProto.timestampList
if (timestamps.isEmpty()) return null
return ReadReceipt(timestamps = timestamps.toLongArray())
}
}
//constructor
internal constructor(timestamps: LongArray?) : this() {
this.timestamps = timestamps
}
// validation
override fun isValid(): Boolean {
if (!super.isValid()) return false
val timestamps = timestamps ?: return false
if (timestamps.isNotEmpty()) { return true }
return false
}
override fun toProto(): SignalServiceProtos.Content? {
TODO("Not yet implemented")
val timestamps = timestamps ?: return null
if (timestamps == null) {
Log.w(ExpirationTimerUpdate.TAG, "Couldn't construct read receipt proto from: $this")
return null
}
val receiptProto = SignalServiceProtos.ReceiptMessage.newBuilder()
receiptProto.type = SignalServiceProtos.ReceiptMessage.Type.READ
receiptProto.addAllTimestamp(timestamps.asIterable())
val contentProto = SignalServiceProtos.Content.newBuilder()
try {
contentProto.receiptMessage = receiptProto.build()
return contentProto.build()
} catch (e: Exception) {
Log.w(ExpirationTimerUpdate.TAG, "Couldn't construct read receipt proto from: $this")
return null
}
}
}

2
libsession/src/main/java/org/session/libsession/messaging/messages/control/TypingIndicator.kt
View File

@ -5,7 +5,7 @@ import org.session.libsignal.service.internal.push.SignalServiceProtos
class TypingIndicator : ControlMessage() {
companion object {
fun fromProto(proto: SignalServiceProtos.Content): ExpirationTimerUpdate? {
fun fromProto(proto: SignalServiceProtos.Content): TypingIndicator? {
TODO("Not yet implemented")
}
}

2
libsession/src/main/java/org/session/libsession/messaging/messages/control/unused/NullMessage.kt
View File

@ -8,7 +8,7 @@ class NullMessage() : ControlMessage() {
companion object {
fun fromProto(proto: SignalServiceProtos.Content): ExpirationTimerUpdate? {
fun fromProto(proto: SignalServiceProtos.Content): NullMessage? {
TODO("Not yet implemented")
}
}

2
libsession/src/main/java/org/session/libsession/messaging/messages/control/unused/SessionRequest.kt
View File

@ -7,7 +7,7 @@ import org.session.libsignal.service.internal.push.SignalServiceProtos
class SessionRequest() : ControlMessage() {
companion object {
fun fromProto(proto: SignalServiceProtos.Content): ExpirationTimerUpdate? {
fun fromProto(proto: SignalServiceProtos.Content): SessionRequest? {
TODO("Not yet implemented")
}
}

2
libsession/src/main/java/org/session/libsession/messaging/messages/visible/Contact.kt
View File

@ -6,7 +6,7 @@ import org.session.libsignal.service.internal.push.SignalServiceProtos
internal class Contact : VisibleMessage() {
companion object {
fun fromProto(proto: SignalServiceProtos.Content): ExpirationTimerUpdate? {
fun fromProto(proto: SignalServiceProtos.Content): Contact? {
TODO("Not yet implemented")
}
}

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

@ -6,7 +6,7 @@ import org.session.libsignal.service.internal.push.SignalServiceProtos
internal class LinkPreview : VisibleMessage(){
companion object {
fun fromProto(proto: SignalServiceProtos.Content): ExpirationTimerUpdate? {
fun fromProto(proto: SignalServiceProtos.Content): LinkPreview? {
TODO("Not yet implemented")
}
}

2
libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt
View File

@ -6,7 +6,7 @@ import org.session.libsignal.service.internal.push.SignalServiceProtos
internal class Profile : VisibleMessage() {
companion object {
fun fromProto(proto: SignalServiceProtos.Content): ExpirationTimerUpdate? {
fun fromProto(proto: SignalServiceProtos.Content): Profile? {
TODO("Not yet implemented")
}
}

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

@ -6,7 +6,7 @@ import org.session.libsignal.service.internal.push.SignalServiceProtos
internal class Quote : VisibleMessage() {
companion object {
fun fromProto(proto: SignalServiceProtos.Content): ExpirationTimerUpdate? {
fun fromProto(proto: SignalServiceProtos.Content): Quote? {
TODO("Not yet implemented")
}
}

2
libsession/src/main/java/org/session/libsession/messaging/messages/visible/attachments/Attachment.kt
View File

@ -7,7 +7,7 @@ import org.session.libsignal.service.internal.push.SignalServiceProtos
internal class Attachment : VisibleMessage() {
companion object {
fun fromProto(proto: SignalServiceProtos.Content): ExpirationTimerUpdate? {
fun fromProto(proto: SignalServiceProtos.Content): Attachment? {
TODO("Not yet implemented")
}
}