Glue some things together again

src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt

@@ -32,8 +32,9 @@ import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.ThreadDatabase
 import org.thoughtcrime.securesms.database.model.ThreadRecord
 import org.thoughtcrime.securesms.loki.dialogs.PNModeBottomSheet
-import org.thoughtcrime.securesms.loki.utilities.getColorWithID
 import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocol
+import org.thoughtcrime.securesms.loki.protocol.LokiSessionResetImplementation
+import org.thoughtcrime.securesms.loki.utilities.getColorWithID
 import org.thoughtcrime.securesms.loki.utilities.push
 import org.thoughtcrime.securesms.loki.utilities.show
 import org.thoughtcrime.securesms.loki.views.ConversationView
@@ -43,6 +44,11 @@ import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.notifications.MessageNotifier
 import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.whispersystems.signalservice.loki.protocol.friendrequests.FriendRequestProtocol
+import org.whispersystems.signalservice.loki.protocol.mentions.MentionsManager
+import org.whispersystems.signalservice.loki.protocol.meta.SessionMetaProtocol
+import org.whispersystems.signalservice.loki.protocol.sessionmanagement.SessionManagementProtocol
+import org.whispersystems.signalservice.loki.protocol.syncmessages.SyncMessagesProtocol
 import kotlin.math.abs
 
 class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListener, SeedReminderViewDelegate, NewConversationButtonSetViewDelegate {
@@ -143,13 +149,21 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
             val adapter = recyclerView.adapter as HomeAdapter
             adapter.typingThreadIDs = threadIDs ?: setOf()
         })
-        // Set up public chats and RSS feeds if needed
-        if (TextSecurePreferences.getLocalNumber(this) != null) {
+        // Set up remaining components if needed
+        val userPublicKey = TextSecurePreferences.getLocalNumber(this)
+        if (userPublicKey != null) {
             val application = ApplicationContext.getInstance(this)
-            application.createDefaultPublicChatsIfNeeded()
-            application.createRSSFeedsIfNeeded()
+            val apiDB = DatabaseFactory.getLokiAPIDatabase(this)
+            val threadDB = DatabaseFactory.getLokiThreadDatabase(this)
+            val userDB = DatabaseFactory.getLokiUserDatabase(this)
+            val sessionResetImpl = LokiSessionResetImplementation(this)
+            FriendRequestProtocol.configureIfNeeded(apiDB, userPublicKey)
+            MentionsManager.configureIfNeeded(userPublicKey, threadDB, userDB)
+            SessionMetaProtocol.configureIfNeeded(apiDB, userPublicKey)
+            org.whispersystems.signalservice.loki.protocol.multidevice.MultiDeviceProtocol.configureIfNeeded(apiDB)
+            SessionManagementProtocol.configureIfNeeded(sessionResetImpl, threadDB, application)
+            SyncMessagesProtocol.configureIfNeeded(apiDB, userPublicKey)
             application.lokiPublicChatManager.startPollersIfNeeded()
-            application.startRSSFeedPollersIfNeeded()
         }
     }
 

src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt

@@ -12,7 +12,6 @@ import kotlinx.android.synthetic.main.activity_pn_mode.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.BaseActionBarActivity
-import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.loki.utilities.setUpActionBarSessionLogo
 import org.thoughtcrime.securesms.loki.utilities.show
 import org.thoughtcrime.securesms.util.TextSecurePreferences
@@ -92,13 +91,6 @@ class PNModeActivity : BaseActionBarActivity() {
         val application = ApplicationContext.getInstance(this)
         application.setUpStorageAPIIfNeeded()
         application.setUpP2PAPIIfNeeded()
-        val publicChatAPI = ApplicationContext.getInstance(this).lokiPublicChatAPI
-        if (publicChatAPI != null) {
-            // TODO: This won't be necessary anymore when we don't auto-join the Loki Public Chat anymore
-            application.createDefaultPublicChatsIfNeeded()
-            val servers = DatabaseFactory.getLokiThreadDatabase(this).getAllPublicChatServers()
-            servers.forEach { publicChatAPI.setDisplayName(displayName, it) }
-        }
         application.registerForFCMIfNeeded(true)
         val intent = Intent(this, HomeActivity::class.java)
         intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK

src/org/thoughtcrime/securesms/loki/api/LokiPublicChatPoller.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import android.os.Handler
 import android.util.Log
 import nl.komponents.kovenant.Promise
+import nl.komponents.kovenant.functional.bind
 import nl.komponents.kovenant.then
 import org.thoughtcrime.securesms.ApplicationContext
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil
@@ -11,6 +12,7 @@ import org.thoughtcrime.securesms.database.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.jobs.PushDecryptJob
 import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob
+import org.thoughtcrime.securesms.loki.utilities.successBackground
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.libsignal.util.guava.Optional
@@ -21,12 +23,11 @@ import org.whispersystems.signalservice.api.messages.SignalServiceGroup
 import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage
 import org.whispersystems.signalservice.api.push.SignalServiceAddress
 import org.whispersystems.signalservice.loki.api.fileserver.LokiFileServerAPI
-import org.whispersystems.signalservice.loki.protocol.multidevice.LokiDeviceLinkUtilities
 import org.whispersystems.signalservice.loki.api.opengroups.LokiPublicChat
 import org.whispersystems.signalservice.loki.api.opengroups.LokiPublicChatAPI
 import org.whispersystems.signalservice.loki.api.opengroups.LokiPublicChatMessage
+import org.whispersystems.signalservice.loki.protocol.multidevice.MultiDeviceProtocol
 import org.whispersystems.signalservice.loki.protocol.todo.LokiThreadFriendRequestStatus
-import org.whispersystems.signalservice.loki.utilities.successBackground
 import java.security.MessageDigest
 import java.util.*
 
@@ -157,7 +158,7 @@ class LokiPublicChatPoller(private val context: Context, private val group: Loki
     fun pollForNewMessages() {
         fun processIncomingMessage(message: LokiPublicChatMessage) {
             // If the sender of the current message is not a slave device, set the display name in the database
-            val masterHexEncodedPublicKey = LokiDeviceLinkUtilities.getMasterHexEncodedPublicKey(message.hexEncodedPublicKey).get()
+            val masterHexEncodedPublicKey = MultiDeviceProtocol.shared.getMasterDevice(message.hexEncodedPublicKey)
             if (masterHexEncodedPublicKey == null) {
                 val senderDisplayName = "${message.displayName} (...${message.hexEncodedPublicKey.takeLast(8)})"
                 DatabaseFactory.getLokiUserDatabase(context).setServerDisplayName(group.id, message.hexEncodedPublicKey, senderDisplayName)
@@ -216,16 +217,13 @@ class LokiPublicChatPoller(private val context: Context, private val group: Loki
                 }
             }
         }
-        var userDevices = setOf<String>()
+        val userDevices = MultiDeviceProtocol.shared.getAllLinkedDevices(userHexEncodedPublicKey)
         var uniqueDevices = setOf<String>()
         val userPrivateKey = IdentityKeyUtil.getIdentityKeyPair(context).privateKey.serialize()
-        val database = DatabaseFactory.getLokiAPIDatabase(context)
-        LokiFileServerAPI.configure(false, userHexEncodedPublicKey, userPrivateKey, database)
+        val apiDB = DatabaseFactory.getLokiAPIDatabase(context)
+        LokiFileServerAPI.configure(false, userHexEncodedPublicKey, userPrivateKey, apiDB)
         // Kovenant propagates a context to chained promises, so LokiPublicChatAPI.sharedContext should be used for all of the below
-        LokiDeviceLinkUtilities.getAllLinkedDeviceHexEncodedPublicKeys(userHexEncodedPublicKey).bind(LokiPublicChatAPI.sharedContext) { devices ->
-            userDevices = devices
-            api.getMessages(group.channel, group.server)
-        }.bind(LokiPublicChatAPI.sharedContext) { messages ->
+        api.getMessages(group.channel, group.server).bind(LokiPublicChatAPI.sharedContext) { messages ->
             if (messages.isNotEmpty()) {
                 if (messages.count() == 1) {
                     Log.d("Loki", "Fetched 1 new message.")
@@ -243,7 +241,7 @@ class LokiPublicChatPoller(private val context: Context, private val group: Loki
         }.successBackground {
             val newDisplayNameUpdatees = uniqueDevices.mapNotNull {
                 // This will return null if the current device is a master device
-                LokiDeviceLinkUtilities.getMasterHexEncodedPublicKey(it).get()
+                MultiDeviceProtocol.shared.getMasterDevice(it)
             }.toSet()
             // Fetch the display names of the master devices
             displayNameUpdatees = displayNameUpdatees.union(newDisplayNameUpdatees)

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

@@ -125,6 +125,7 @@ object FriendRequestProtocol {
         return false
     }
 
+    @JvmStatic
     fun getLastMessageID(context: Context, threadID: Long): Long? {
         val db = DatabaseFactory.getSmsDatabase(context)
         val messageCount = db.getMessageCountForThread(threadID)

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

@@ -15,6 +15,7 @@ import org.thoughtcrime.securesms.sms.OutgoingTextMessage
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.libsignal.loki.LokiSessionResetStatus
 import org.whispersystems.signalservice.api.messages.SignalServiceContent
+import org.whispersystems.signalservice.loki.protocol.multidevice.MultiDeviceProtocol
 import org.whispersystems.signalservice.loki.protocol.todo.LokiThreadFriendRequestStatus
 
 object SessionManagementProtocol {
@@ -94,7 +95,11 @@ object SessionManagementProtocol {
     }
 
     @JvmStatic
-    private fun isSessionRequest(content: SignalServiceContent): Boolean {
-        return content.dataMessage.isPresent && content.dataMessage.get().isSessionRequest
+    fun triggerSessionRestorationUI(context: Context, publicKey: String) {
+        val masterDevicePublicKey = MultiDeviceProtocol.shared.getMasterDevice(publicKey) ?: publicKey
+        val masterDeviceAsRecipient = recipient(context, masterDevicePublicKey)
+        if (masterDeviceAsRecipient.isGroupRecipient) { return }
+        val threadID = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(masterDeviceAsRecipient)
+        DatabaseFactory.getLokiThreadDatabase(context).addSessionRestoreDevice(threadID, publicKey)
     }
 }

src/org/thoughtcrime/securesms/loki/shelved/LokiRSSFeedPoller.kt

@@ -8,6 +8,7 @@ import com.prof.rssparser.engine.XMLParser
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.Runnable
 import org.thoughtcrime.securesms.jobs.PushDecryptJob
+import org.thoughtcrime.securesms.loki.utilities.successBackground
 import org.whispersystems.libsignal.util.guava.Optional
 import org.whispersystems.signalservice.api.messages.SignalServiceContent
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage
@@ -15,7 +16,6 @@ import org.whispersystems.signalservice.api.messages.SignalServiceGroup
 import org.whispersystems.signalservice.api.push.SignalServiceAddress
 import org.whispersystems.signalservice.loki.api.rssfeeds.LokiRSSFeed
 import org.whispersystems.signalservice.loki.api.rssfeeds.LokiRSSFeedProxy
-import org.whispersystems.signalservice.loki.utilities.successBackground
 import java.text.SimpleDateFormat
 import java.util.regex.Pattern
 

src/org/thoughtcrime/securesms/loki/utilities/PromiseUtilities.kt

@@ -0,0 +1,15 @@
+package org.thoughtcrime.securesms.loki.utilities
+
+import android.util.Log
+import nl.komponents.kovenant.Promise
+
+fun <V, E> Promise<V, E>.successBackground(callback: (value: V) -> Unit): Promise<V, E> {
+    Thread {
+        try {
+            callback(get())
+        } catch (e: Exception) {
+            Log.d("Loki", "Failed to execute task in background: ${e.message}.")
+        }
+    }.start()
+    return this
+}