Clean

src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt

@@ -21,6 +21,7 @@ object ClosedGroupsProtocol {
     @JvmStatic
     fun shouldIgnoreContentMessage(context: Context, conversation: Recipient, groupID: String?, content: SignalServiceContent): Boolean {
         if (!conversation.address.isClosedGroup || groupID == null) { return false }
+        // A closed group's members should never include slave devices
         val senderPublicKey = content.sender
         val senderMasterPublicKey = MultiDeviceProtocol.shared.getMasterDevice(senderPublicKey)
         val publicKeyToCheckFor = senderMasterPublicKey ?: senderPublicKey

src/org/thoughtcrime/securesms/loki/protocol/MultiDeviceOpenGroupUpdateJob.kt

@@ -34,7 +34,7 @@ class MultiDeviceOpenGroupUpdateJob private constructor(parameters: Parameters)
 
     override fun getFactoryKey(): String { return KEY }
 
-    override fun serialize(): Data { return Data.EMPTY } // TODO: Should we implement this?
+    override fun serialize(): Data { return Data.EMPTY }
 
     @Throws(Exception::class)
     public override fun onRun() {

src/org/thoughtcrime/securesms/loki/protocol/PushEphemeralMessageSendJob.kt

@@ -31,7 +31,6 @@ class PushEphemeralMessageSendJob private constructor(parameters: Parameters, pr
         message)
 
     override fun serialize(): Data {
-        // TODO: Is this correct?
         return Data.Builder()
             .putString(KEY_MESSAGE, message.serialize())
             .build()
@@ -41,23 +40,17 @@ class PushEphemeralMessageSendJob private constructor(parameters: Parameters, pr
 
     public override fun onRun() {
         val recipient = message.get<String?>("recipient", null) ?: throw IllegalStateException()
-        val dataMessage = SignalServiceDataMessage.newBuilder()
+        val dataMessage = SignalServiceDataMessage.newBuilder().withTimestamp(System.currentTimeMillis())
-            .withTimestamp(System.currentTimeMillis())
-            .withBody(message.get<String?>("body", null))
         // Attach a pre key bundle if needed
         if (message.get("friendRequest", false)) {
             val bundle = DatabaseFactory.getLokiPreKeyBundleDatabase(context).generatePreKeyBundle(recipient)
             dataMessage.withPreKeyBundle(bundle).asFriendRequest(true)
         }
-        // Set flags if needed
+        // Set flags if needed (these are mutually exclusive)
-        if (message.get("unpairingRequest", false)) {
+        when {
-            dataMessage.asUnlinkingRequest(true)
+            message.get("unpairingRequest", false) -> dataMessage.asUnlinkingRequest(true)
-        }
+            message.get("sessionRestore", false) -> dataMessage.asSessionRestorationRequest(true)
-        if (message.get("sessionRestore", false)) {
+            message.get("sessionRequest", false) -> dataMessage.asSessionRequest(true)
-            dataMessage.asSessionRestorationRequest(true)
-        }
-        if (message.get("sessionRequest", false)) {
-            dataMessage.asSessionRequest(true)
         }
         // Send the message
         val messageSender = ApplicationContext.getInstance(context).communicationModule.provideSignalMessageSender()