Merge remote-tracking branch 'upstream/dev' into origin/refactor-sending

# Conflicts:
#	app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt

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

@@ -37,6 +37,11 @@ import org.thoughtcrime.securesms.loki.utilities.OpenGroupUtilities
 import org.thoughtcrime.securesms.loki.utilities.get
 import org.thoughtcrime.securesms.loki.utilities.getString
 import org.thoughtcrime.securesms.mms.PartAuthority
+import org.session.libsession.messaging.messages.signal.IncomingGroupMessage
+import org.session.libsession.messaging.messages.signal.IncomingTextMessage
+import org.session.libsession.messaging.messages.signal.OutgoingTextMessage
+import org.session.libsession.utilities.preferences.ProfileKeyUtil
+import org.session.libsignal.service.loki.utilities.prettifiedDescription
 
 class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper), StorageProtocol {
     override fun getUserPublicKey(): String? {
@@ -361,6 +366,11 @@ class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context,
             val smsDatabase = DatabaseFactory.getSmsDatabase(context)
             smsDatabase.markAsSentFailed(messageRecord.getId())
         }
+        if (error.localizedMessage != null) {
+            DatabaseFactory.getLokiMessageDatabase(context).setErrorMessage(messageRecord.getId(), error.localizedMessage!!)
+        } else {
+            DatabaseFactory.getLokiMessageDatabase(context).setErrorMessage(messageRecord.getId(), error.javaClass.simpleName)
+        }
     }
 
     override fun getGroup(groupID: String): GroupRecord? {

app/src/main/java/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt

@@ -30,6 +30,7 @@ import org.session.libsession.messaging.sending_receiving.MessageSender
 import org.greenrobot.eventbus.EventBus
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
+import org.session.libsession.messaging.jobs.JobQueue
 import org.session.libsession.utilities.*
 import org.session.libsignal.service.loki.utilities.mentions.MentionsManager
 import org.session.libsignal.service.loki.utilities.toHexString
@@ -139,6 +140,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity(),
         if (userPublicKey != null) {
             MentionsManager.configureIfNeeded(userPublicKey, threadDB, userDB)
             application.publicChatManager.startPollersIfNeeded()
+            JobQueue.shared.resumePendingJobs()
         }
         IP2Country.configureIfNeeded(this)
         application.registerForFCMIfNeeded(false)

app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionJobDatabase.kt

@@ -12,11 +12,11 @@ import org.thoughtcrime.securesms.loki.utilities.*
 class SessionJobDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper) {
 
     companion object {
-        private val sessionJobTable = "session_job_database"
+        private const val sessionJobTable = "session_job_database"
-        val jobID = "job_id"
+        const val jobID = "job_id"
-        val jobType = "job_type"
+        const val jobType = "job_type"
-        val failureCount = "failure_count"
+        const val failureCount = "failure_count"
-        val serializedData = "serialized_data"
+        const val serializedData = "serialized_data"
         @JvmStatic val createSessionJobTableCommand = "CREATE TABLE $sessionJobTable ($jobID INTEGER PRIMARY KEY, $jobType STRING, $failureCount INTEGER DEFAULT 0, $serializedData TEXT);"
     }
 
@@ -85,10 +85,7 @@ class SessionJobDatabase(context: Context, helper: SQLCipherOpenHelper) : Databa
     }
 }
 
-class SessionJobHelper() {
+object SessionJobHelper {
-
+    val dataSerializer: Data.Serializer = JsonDataSerializer()
-    companion object {
+    val sessionJobInstantiator: SessionJobInstantiator = SessionJobInstantiator(SessionJobManagerFactories.getSessionJobFactories())
-        val dataSerializer: Data.Serializer = JsonDataSerializer()
-        val sessionJobInstantiator: SessionJobInstantiator = SessionJobInstantiator(SessionJobManagerFactories.getSessionJobFactories())
-    }
 }

app/src/main/java/org/thoughtcrime/securesms/sskenvironment/DataExtractionNotificationManager.kt

@@ -0,0 +1,4 @@
+package org.thoughtcrime.securesms.sskenvironment
+
+class DataExtractionNotificationManager {
+}

libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt

@@ -19,7 +19,7 @@ class AttachmentDownloadJob(val attachmentID: Long, val databaseMessageID: Long)
     private val MAX_ATTACHMENT_SIZE = 10 * 1024 * 1024
 
     // Error
-    internal sealed class Error(val description: String) : Exception() {
+    internal sealed class Error(val description: String) : Exception(description) {
         object NoAttachment : Error("No such attachment.")
     }
 

libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt

@@ -24,7 +24,7 @@ class AttachmentUploadJob(val attachmentID: Long, val threadID: String, val mess
     override var failureCount: Int = 0
 
     // Error
-    internal sealed class Error(val description: String) : Exception() {
+    internal sealed class Error(val description: String) : Exception(description) {
         object NoAttachment : Error("No such attachment.")
     }
 

libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt

@@ -55,7 +55,7 @@ class ClosedGroupControlMessage() : ControlMessage() {
         class MemberLeft() : Kind()
         class EncryptionKeyPairRequest(): Kind()
 
-        val description: String = run {
+        val description: String =
             when(this) {
                 is New -> "new"
                 is Update -> "update"
@@ -66,7 +66,6 @@ class ClosedGroupControlMessage() : ControlMessage() {
                 is MemberLeft -> "memberLeft"
                 is EncryptionKeyPairRequest -> "encryptionKeyPairRequest"
             }
-        }
     }
 
     companion object {

libsession/src/main/java/org/session/libsession/messaging/messages/control/DataExtractionNotification.kt

@@ -0,0 +1,79 @@
+package org.session.libsession.messaging.messages.control
+
+import com.google.protobuf.ByteString
+import org.session.libsignal.libsignal.ecc.ECKeyPair
+import org.session.libsignal.service.internal.push.SignalServiceProtos
+import org.session.libsignal.utilities.logging.Log
+import java.lang.Exception
+
+class DataExtractionNotification(): ControlMessage() {
+    var kind: Kind? = null
+
+    // Kind enum
+    sealed class Kind {
+        class Screenshot() : Kind()
+        class MediaSaved(val timestanp: Long) : Kind()
+
+        val description: String =
+            when(this) {
+                is Screenshot -> "screenshot"
+                is MediaSaved -> "mediaSaved"
+            }
+    }
+
+    companion object {
+        const val TAG = "DataExtractionNotification"
+
+        fun fromProto(proto: SignalServiceProtos.Content): DataExtractionNotification? {
+            val dataExtractionNotification = proto.dataExtractionNotification ?: return null
+            val kind: Kind = when(dataExtractionNotification.type) {
+                SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT -> Kind.Screenshot()
+                SignalServiceProtos.DataExtractionNotification.Type.MEDIA_SAVED -> {
+                    val timestamp = if (dataExtractionNotification.hasTimestamp()) dataExtractionNotification.timestamp else return null
+                    Kind.MediaSaved(timestamp)
+                }
+            }
+            return DataExtractionNotification(kind)
+        }
+    }
+
+    //constructor
+    internal constructor(kind: Kind) : this() {
+        this.kind = kind
+    }
+
+    // MARK: Validation
+    override fun isValid(): Boolean {
+        if (!super.isValid()) return false
+        val kind = kind ?: return false
+        return when(kind) {
+            is Kind.Screenshot -> true
+            is Kind.MediaSaved -> kind.timestanp > 0
+        }
+    }
+
+    override fun toProto(): SignalServiceProtos.Content? {
+        val kind = kind
+        if (kind == null) {
+            Log.w(TAG, "Couldn't construct data extraction notification proto from: $this")
+            return null
+        }
+        try {
+            val dataExtractionNotification = SignalServiceProtos.DataExtractionNotification.newBuilder()
+            when(kind) {
+                is Kind.Screenshot -> dataExtractionNotification.type = SignalServiceProtos.DataExtractionNotification.Type.SCREENSHOT
+                is Kind.MediaSaved -> {
+                    dataExtractionNotification.type = SignalServiceProtos.DataExtractionNotification.Type.MEDIA_SAVED
+                    dataExtractionNotification.timestamp = kind.timestanp
+                }
+            }
+            val contentProto = SignalServiceProtos.Content.newBuilder()
+            contentProto.dataExtractionNotification = dataExtractionNotification.build()
+            return contentProto.build()
+        } catch (e: Exception) {
+            Log.w(TAG, "Couldn't construct data extraction notification proto from: $this")
+            return null
+        }
+    }
+
+}

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

@@ -35,7 +35,7 @@ class ReadReceipt() : ControlMessage() {
     override fun toProto(): SignalServiceProtos.Content? {
         val timestamps = timestamps
         if (timestamps == null) {
-            Log.w(ExpirationTimerUpdate.TAG, "Couldn't construct read receipt proto from: $this")
+            Log.w(TAG, "Couldn't construct read receipt proto from: $this")
             return null
         }
         val receiptProto = SignalServiceProtos.ReceiptMessage.newBuilder()
@@ -46,7 +46,7 @@ class ReadReceipt() : ControlMessage() {
             contentProto.receiptMessage = receiptProto.build()
             return contentProto.build()
         } catch (e: Exception) {
-            Log.w(ExpirationTimerUpdate.TAG, "Couldn't construct read receipt proto from: $this")
+            Log.w(TAG, "Couldn't construct read receipt proto from: $this")
             return null
         }
     }

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageReceiver.kt

@@ -12,7 +12,7 @@ object MessageReceiver {
 
     private val lastEncryptionKeyPairRequest = mutableMapOf<String, Long>()
 
-    internal sealed class Error(val description: String) : Exception() {
+    internal sealed class Error(val description: String) : Exception(description) {
         object DuplicateMessage: Error("Duplicate message.")
         object InvalidMessage: Error("Invalid message.")
         object UnknownMessage: Error("Unknown message type.")
@@ -109,6 +109,7 @@ object MessageReceiver {
         val message: Message = ReadReceipt.fromProto(proto) ?:
                                TypingIndicator.fromProto(proto) ?:
                                ClosedGroupControlMessage.fromProto(proto) ?:
+                               DataExtractionNotification.fromProto(proto) ?:
                                ExpirationTimerUpdate.fromProto(proto) ?:
                                ConfigurationMessage.fromProto(proto) ?:
                                VisibleMessage.fromProto(proto) ?: throw Error.UnknownMessage

libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt

@@ -35,7 +35,7 @@ import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel as S
 object MessageSender {
 
     // Error
-    sealed class Error(val description: String) : Exception() {
+    sealed class Error(val description: String) : Exception(description) {
         object InvalidMessage : Error("Invalid message.")
         object ProtoConversionFailed : Error("Couldn't convert message to proto.")
         object ProofOfWorkCalculationFailed : Error("Proof of work calculation failed.")
@@ -50,6 +50,9 @@ object MessageSender {
         object NoPrivateKey : Error("Couldn't find a private key associated with the given group public key.")
         object InvalidClosedGroupUpdate : Error("Invalid group update.")
 
+        // Precondition
+        class PreconditionFailure(val reason: String): Error(reason)
+
         internal val isRetryable: Boolean = when (this) {
             is InvalidMessage -> false
             is ProtoConversionFailed -> false
@@ -73,7 +76,6 @@ object MessageSender {
         val promise = deferred.promise
         val storage = MessagingConfiguration.shared.storage
         val userPublicKey = storage.getUserPublicKey()
-        val preconditionFailure = Exception("Destination should not be open groups!")
         // Set the timestamp, sender and recipient
         message.sentTimestamp ?: run { message.sentTimestamp = System.currentTimeMillis() } /* Visible messages will already have their sent timestamp set */
         message.sender = userPublicKey
@@ -90,7 +92,7 @@ object MessageSender {
             when (destination) {
                 is Destination.Contact -> message.recipient = destination.publicKey
                 is Destination.ClosedGroup -> message.recipient = destination.groupPublicKey
-                is Destination.OpenGroup -> throw preconditionFailure
+                is Destination.OpenGroup -> throw Error.PreconditionFailure("Destination should not be open groups!")
             }
             // Validate the message
             if (!message.isValid()) { throw Error.InvalidMessage }
@@ -128,7 +130,7 @@ object MessageSender {
                     val encryptionKeyPair = MessagingConfiguration.shared.storage.getLatestClosedGroupEncryptionKeyPair(destination.groupPublicKey)!!
                     ciphertext = MessageSenderEncryption.encryptWithSessionProtocol(plaintext, encryptionKeyPair.hexEncodedPublicKey)
                 }
-                is Destination.OpenGroup -> throw preconditionFailure
+                is Destination.OpenGroup -> throw Error.PreconditionFailure("Destination should not be open groups!")
             }
             // Wrap the result
             val kind: SignalServiceProtos.Envelope.Type
@@ -142,7 +144,7 @@ object MessageSender {
                     kind = SignalServiceProtos.Envelope.Type.CLOSED_GROUP_CIPHERTEXT
                     senderPublicKey = destination.groupPublicKey
                 }
-                is Destination.OpenGroup -> throw preconditionFailure
+                is Destination.OpenGroup -> throw Error.PreconditionFailure("Destination should not be open groups!")
             }
             val wrappedMessage = MessageWrapper.wrap(kind, message.sentTimestamp!!, senderPublicKey, ciphertext)
             // Calculate proof of work
@@ -199,34 +201,31 @@ object MessageSender {
     private fun sendToOpenGroupDestination(destination: Destination, message: Message): Promise<Unit, Exception> {
         val deferred = deferred<Unit, Exception>()
         val storage = MessagingConfiguration.shared.storage
-        val preconditionFailure = Exception("Destination should not be contacts or closed groups!")
         message.sentTimestamp ?: run { message.sentTimestamp = System.currentTimeMillis() }
         message.sender = storage.getUserPublicKey()
+        // Set the failure handler (need it here already for precondition failure handling)
+        fun handleFailure(error: Exception) {
+            handleFailedMessageSend(message, error)
+            deferred.reject(error)
+        }
         try {
             val server: String
             val channel: Long
             when (destination) {
-                is Destination.Contact -> throw preconditionFailure
+                is Destination.Contact -> throw Error.PreconditionFailure("Destination should not be contacts!")
-                is Destination.ClosedGroup -> throw preconditionFailure
+                is Destination.ClosedGroup -> throw Error.PreconditionFailure("Destination should not be closed groups!")
                 is Destination.OpenGroup -> {
                     message.recipient = "${destination.server}.${destination.channel}"
                     server = destination.server
                     channel = destination.channel
                 }
             }
-            // Set the failure handler (need it here already for precondition failure handling)
-            fun handleFailure(error: Exception) {
-                handleFailedMessageSend(message, error)
-                deferred.reject(error)
-            }
             // Validate the message
             if (message !is VisibleMessage || !message.isValid()) {
-                handleFailure(Error.InvalidMessage)
                 throw Error.InvalidMessage
             }
             // Convert the message to an open group message
             val openGroupMessage = OpenGroupMessage.from(message, server) ?: kotlin.run {
-                handleFailure(Error.InvalidMessage)
                 throw Error.InvalidMessage
             }
             // Send the result
@@ -238,7 +237,7 @@ object MessageSender {
                 handleFailure(it)
             }
         } catch (exception: Exception) {
-            deferred.reject(exception)
+            handleFailure(exception)
         }
         return deferred.promise
     }
@@ -246,7 +245,8 @@ object MessageSender {
     // Result Handling
     fun handleSuccessfulMessageSend(message: Message, destination: Destination, isSyncMessage: Boolean = false) {
         val storage = MessagingConfiguration.shared.storage
-        val messageId = storage.getMessageIdInDatabase(message.sentTimestamp!!, message.sender!!) ?: return
+        val userPublicKey = storage.getUserPublicKey()!!
+        val messageId = storage.getMessageIdInDatabase(message.sentTimestamp!!, message.sender?:userPublicKey) ?: return
         // Ignore future self-sends
         storage.addReceivedMessageTimestamp(message.sentTimestamp!!)
         // Track the open group server message ID
@@ -254,17 +254,16 @@ object MessageSender {
             storage.setOpenGroupServerMessageID(messageId, message.openGroupServerMessageID!!)
         }
         // Mark the message as sent
-        storage.markAsSent(message.sentTimestamp!!, message.sender!!)
+        storage.markAsSent(message.sentTimestamp!!, message.sender?:userPublicKey)
-        storage.markUnidentified(message.sentTimestamp!!, message.sender!!)
+        storage.markUnidentified(message.sentTimestamp!!, message.sender?:userPublicKey)
         // Start the disappearing messages timer if needed
         if (message is VisibleMessage && !isSyncMessage) {
-            SSKEnvironment.shared.messageExpirationManager.startAnyExpiration(message.sentTimestamp!!, message.sender!!)
+            SSKEnvironment.shared.messageExpirationManager.startAnyExpiration(message.sentTimestamp!!, message.sender?:userPublicKey)
         }
         // Sync the message if:
         // • it's a visible message
         // • the destination was a contact
         // • we didn't sync it already
-        val userPublicKey = storage.getUserPublicKey()!!
         if (destination is Destination.Contact && !isSyncMessage) {
             if (message is VisibleMessage) { message.syncTarget = destination.publicKey }
             if (message is ExpirationTimerUpdate) { message.syncTarget = destination.publicKey }
@@ -274,7 +273,8 @@ object MessageSender {
 
     fun handleFailedMessageSend(message: Message, error: Exception) {
         val storage = MessagingConfiguration.shared.storage
-        storage.setErrorMessage(message.sentTimestamp!!, message.sender!!, error)
+        val userPublicKey = storage.getUserPublicKey()!!
+        storage.setErrorMessage(message.sentTimestamp!!, message.sender?:userPublicKey, error)
     }
 
     // Convenience

libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt

@@ -42,7 +42,7 @@ open class DotNetAPI {
     internal enum class HTTPVerb { GET, PUT, POST, DELETE, PATCH }
 
     // Error
-    internal sealed class Error(val description: String) : Exception() {
+    internal sealed class Error(val description: String) : Exception(description) {
         object Generic : Error("An error occurred.")
         object InvalidURL : Error("Invalid URL.")
         object ParsingFailed : Error("Invalid file server response.")

libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt

@@ -10,7 +10,7 @@ import java.security.SecureRandom
 object MessageWrapper {
 
     // region Types
-    sealed class Error(val description: String) : Exception() {
+    sealed class Error(val description: String) : Exception(description) {
         object FailedToWrapData : Error("Failed to wrap data.")
         object FailedToWrapMessageInEnvelope : Error("Failed to wrap message in envelope.")
         object FailedToWrapEnvelopeInWebSocketMessage : Error("Failed to wrap envelope in web socket message.")

libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt

@@ -45,7 +45,7 @@ object SnodeAPI {
     internal var powDifficulty = 1
 
     // Error
-    internal sealed class Error(val description: String) : Exception() {
+    internal sealed class Error(val description: String) : Exception(description) {
         object Generic : Error("An error occurred.")
         object ClockOutOfSync : Error("The user's clock is out of sync with the service node network.")
         object RandomSnodePoolUpdatingFailed : Error("Failed to update random service node pool.")

libsignal/protobuf/SignalService.proto

@@ -36,10 +36,11 @@ message TypingMessage {
 }
 
 message Content {
-  optional DataMessage          dataMessage          = 1;
+  optional DataMessage                dataMessage          = 1;
-  optional ReceiptMessage       receiptMessage       = 5;
+  optional ReceiptMessage             receiptMessage       = 5;
-  optional TypingMessage        typingMessage        = 6;
+  optional TypingMessage              typingMessage        = 6;
-  optional ConfigurationMessage configurationMessage = 7;
+  optional ConfigurationMessage       configurationMessage = 7;
+  optional DataExtractionNotification dataExtractionNotification = 82;
 }
 
 message ClosedGroupCiphertextMessageWrapper {
@@ -56,6 +57,18 @@ message KeyPair {
   required bytes privateKey = 2;
 }
 
+message DataExtractionNotification {
+
+  enum Type {
+    SCREENSHOT  = 1;
+    MEDIA_SAVED = 2; // timestamp
+  }
+
+  // @required
+  required Type   type      = 1;
+  optional uint64 timestamp = 2;
+}
+
 message DataMessage {
 
   enum Flags {

libsignal/src/main/java/org/session/libsignal/service/loki/crypto/MnemonicCodec.kt

@@ -50,7 +50,7 @@ class MnemonicCodec(private val loadFileContents: (String) -> String) {
         }
     }
 
-    sealed class DecodingError(val description: String) : Exception() {
+    sealed class DecodingError(val description: String) : Exception(description) {
         object Generic : DecodingError("Something went wrong. Please check your mnemonic and try again.")
         object InputTooShort : DecodingError("Looks like you didn't enter enough words. Please check your mnemonic and try again.")
         object MissingLastWord : DecodingError("You seem to be missing the last word of your mnemonic. Please check what you entered and try again.")