feat: Contact pairing

app/schemas/tech.relaycorp.letro.storage.LetroDatabase/1.json

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "f727ada9d0ee39552687eb25fef6f248",
+    "identityHash": "d5edc6419007841d2365ac43dd8af292",
     "entities": [
       {
         "tableName": "account",
@@ -38,7 +38,7 @@
       },
       {
         "tableName": "contacts",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `ownerVeraId` TEXT NOT NULL, `contactVeraId` TEXT NOT NULL, `alias` TEXT, `contactEndpointId` TEXT, `status` TEXT NOT NULL, FOREIGN KEY(`ownerVeraId`) REFERENCES `account`(`veraId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `ownerVeraId` TEXT NOT NULL, `contactVeraId` TEXT NOT NULL, `alias` TEXT, `contactEndpointId` TEXT, `status` INTEGER NOT NULL, FOREIGN KEY(`ownerVeraId`) REFERENCES `account`(`veraId`) ON UPDATE NO ACTION ON DELETE CASCADE )",
         "fields": [
           {
             "fieldPath": "id",
@@ -73,7 +73,7 @@
           {
             "fieldPath": "status",
             "columnName": "status",
-            "affinity": "TEXT",
+            "affinity": "INTEGER",
             "notNull": true
           }
         ],
@@ -112,7 +112,7 @@
     "views": [],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'f727ada9d0ee39552687eb25fef6f248')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd5edc6419007841d2365ac43dd8af292')"
     ]
   }
 }

app/src/main/java/tech/relaycorp/letro/account/storage/AccountRepository.kt

@@ -4,6 +4,7 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.launch
 import tech.relaycorp.letro.account.model.Account
 import javax.inject.Inject
@@ -21,7 +22,7 @@ class AccountRepositoryImpl @Inject constructor(
 
     private val databaseScope: CoroutineScope = CoroutineScope(Dispatchers.IO)
     private val _allAccounts = MutableSharedFlow<List<Account>>()
-    private val _currentAccount = MutableSharedFlow<Account?>()
+    private val _currentAccount = MutableStateFlow<Account?>(null)
     override val currentAccount: Flow<Account?>
         get() = _currentAccount
 

app/src/main/java/tech/relaycorp/letro/awala/AwalaManager.kt

@@ -1,6 +1,7 @@
 package tech.relaycorp.letro.awala
 
 import android.content.Context
+import android.util.Base64
 import android.util.Log
 import androidx.annotation.RawRes
 import dagger.hilt.android.qualifiers.ApplicationContext
@@ -9,9 +10,6 @@ import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.receiveAsFlow
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.newSingleThreadContext
 import kotlinx.coroutines.withContext
@@ -24,31 +22,34 @@ import tech.relaycorp.awaladroid.endpoint.PublicThirdPartyEndpoint
 import tech.relaycorp.awaladroid.endpoint.ThirdPartyEndpoint
 import tech.relaycorp.awaladroid.messaging.OutgoingMessage
 import tech.relaycorp.letro.R
-import tech.relaycorp.letro.awala.message.AwalaIncomingMessage
 import tech.relaycorp.letro.awala.message.AwalaOutgoingMessage
 import tech.relaycorp.letro.awala.message.MessageRecipient
 import tech.relaycorp.letro.awala.message.MessageType
-import tech.relaycorp.letro.awala.parser.AwalaMessageParser
+import tech.relaycorp.letro.awala.processor.AwalaMessageProcessor
 import tech.relaycorp.letro.ui.navigation.Route
 import tech.relaycorp.letro.utils.awala.loadNonNullFirstPartyEndpoint
 import tech.relaycorp.letro.utils.awala.loadNonNullThirdPartyEndpoint
 import java.util.concurrent.atomic.AtomicBoolean
 import javax.inject.Inject
 
 interface AwalaManager {
-    val incomingMessages: Flow<AwalaIncomingMessage<*>>
     suspend fun sendMessage(
         outgoingMessage: AwalaOutgoingMessage,
         recipient: MessageRecipient,
     )
     suspend fun isAwalaInstalled(currentScreen: Route): Boolean
+    suspend fun authorizeUsers(
+        // TODO: after MVP handle several first party endpoints
+        thirdPartyPublicKey: ByteArray,
+    )
+    suspend fun getFirstPartyPublicKey(): String
 }
 
 @OptIn(ExperimentalCoroutinesApi::class)
 class AwalaManagerImpl @Inject constructor(
     private val awalaRepository: AwalaRepository,
     @ApplicationContext private val context: Context,
-    private val parser: AwalaMessageParser,
+    private val processor: AwalaMessageProcessor,
 ) : AwalaManager {
 
     private val awalaScope = CoroutineScope(Dispatchers.IO)
@@ -59,10 +60,6 @@ class AwalaManagerImpl @Inject constructor(
     @OptIn(DelicateCoroutinesApi::class)
     private val messageReceivingThreadContext = newSingleThreadContext("AwalaManagerMessageReceiverThread")
 
-    private val _incomingMessages = Channel<AwalaIncomingMessage<*>>()
-    override val incomingMessages: Flow<AwalaIncomingMessage<*>>
-        get() = _incomingMessages.receiveAsFlow()
-
     private var isAwalaSetUp = AtomicBoolean(false)
     private var awalaSetupJob: Job? = null
 
@@ -72,7 +69,6 @@ class AwalaManagerImpl @Inject constructor(
     private var isReceivingMessages = false
 
     private var firstPartyEndpoint: FirstPartyEndpoint? = null
-
     private var thirdPartyServerEndpoint: ThirdPartyEndpoint? = null
 
     init {
@@ -125,6 +121,27 @@ class AwalaManagerImpl @Inject constructor(
         return isInstalled
     }
 
+    override suspend fun authorizeUsers(thirdPartyPublicKey: ByteArray) {
+        withContext(awalaThreadContext) {
+            val firstPartyEndpoint = loadFirstPartyEndpoint()
+            val auth = firstPartyEndpoint.authorizeIndefinitely(thirdPartyPublicKey)
+            sendMessage(
+                outgoingMessage = AwalaOutgoingMessage(
+                    type = MessageType.ContactPairingAuthorization,
+                    content = auth,
+                ),
+                recipient = MessageRecipient.Server(),
+            )
+        }
+    }
+
+    override suspend fun getFirstPartyPublicKey(): String {
+        return withContext(awalaThreadContext) {
+            val firstPartyEndpoint = loadFirstPartyEndpoint()
+            Base64.encodeToString(firstPartyEndpoint.publicKey.encoded, Base64.NO_WRAP)
+        }
+    }
+
     private suspend fun loadFirstPartyEndpoint(): FirstPartyEndpoint {
         return withContext(awalaThreadContext) {
             val firstPartyEndpointNodeId = awalaRepository.getServerFirstPartyEndpointNodeId()
@@ -167,10 +184,9 @@ class AwalaManagerImpl @Inject constructor(
 
             Log.i(TAG, "start receiving messages...")
             GatewayClient.receiveMessages().collect { message ->
-                val type = MessageType.from(message.type)
-                val parsedMessage = parser.parse(type, message.content)
-                    .also { Log.i(TAG, "Receive message: ($it)") }
-                _incomingMessages.send(parsedMessage)
+                Log.i(TAG, "Receive message: ${message.type}: ($message)")
+                processor.process(message, this@AwalaManagerImpl)
+                Log.i(TAG, "Message processed")
                 message.ack()
             }
         }
@@ -262,8 +278,8 @@ class AwalaManagerImpl @Inject constructor(
         }
     }
 
-    private companion object {
-        private const val TAG = "AwalaManager"
+    companion object {
+        const val TAG = "AwalaManager"
     }
 }
 

app/src/main/java/tech/relaycorp/letro/awala/message/MessageType.kt

@@ -1,5 +1,8 @@
 package tech.relaycorp.letro.awala.message
 
+import android.util.Log
+import tech.relaycorp.letro.awala.AwalaManagerImpl
+
 sealed class MessageType(val value: String) {
     object AccountCreationRequest : MessageType("application/vnd.relaycorp.letro.account-creation-request")
     object AccountCreationCompleted : MessageType("application/vnd.relaycorp.letro.account-creation-completed-tmp")
@@ -18,7 +21,10 @@ sealed class MessageType(val value: String) {
                 ContactPairingRequest.value -> ContactPairingRequest
                 ContactPairingMatch.value -> ContactPairingMatch
                 ContactPairingAuthorization.value -> ContactPairingAuthorization
-                else -> Unknown
+                else -> {
+                    Log.e(AwalaManagerImpl.TAG, "Unknown message type $type")
+                    Unknown
+                }
             }
         }
     }

app/src/main/java/tech/relaycorp/letro/awala/parser/AwalaMessageParser.kt

@@ -1,16 +1,7 @@
 package tech.relaycorp.letro.awala.parser
 
 import tech.relaycorp.letro.awala.message.AwalaIncomingMessage
-import tech.relaycorp.letro.awala.message.MessageType
 
 interface AwalaMessageParser {
-    fun parse(type: MessageType, content: ByteArray): AwalaIncomingMessage<*>
-}
-
-class AwalaMessageParserImpl constructor(
-    private val parsers: Map<MessageType, AwalaMessageParser>,
-) : AwalaMessageParser {
-    override fun parse(type: MessageType, content: ByteArray): AwalaIncomingMessage<*> {
-        return parsers[type]?.parse(type, content) ?: throw IllegalStateException("No parser for messageType: $type")
-    }
+    fun parse(content: ByteArray): AwalaIncomingMessage<*>
 }

app/src/main/java/tech/relaycorp/letro/awala/processor/AwalaMessageProcessor.kt

@@ -0,0 +1,19 @@
+package tech.relaycorp.letro.awala.processor
+
+import tech.relaycorp.awaladroid.messaging.IncomingMessage
+import tech.relaycorp.letro.awala.AwalaManager
+import tech.relaycorp.letro.awala.message.MessageType
+
+interface AwalaMessageProcessor {
+    suspend fun process(message: IncomingMessage, awalaManager: AwalaManager)
+}
+
+class AwalaMessageProcessorImpl constructor(
+    private val processors: Map<MessageType, AwalaMessageProcessor>,
+) : AwalaMessageProcessor {
+
+    override suspend fun process(message: IncomingMessage, awalaManager: AwalaManager) {
+        val type = MessageType.from(message.type)
+        processors[type]!!.process(message, awalaManager)
+    }
+}

app/src/main/java/tech/relaycorp/letro/awala/processor/UnknownMessageProcessor.kt

@@ -0,0 +1,14 @@
+package tech.relaycorp.letro.awala.processor
+
+import android.util.Log
+import tech.relaycorp.awaladroid.messaging.IncomingMessage
+import tech.relaycorp.letro.awala.AwalaManager
+import tech.relaycorp.letro.awala.AwalaManagerImpl
+import javax.inject.Inject
+
+class UnknownMessageProcessor @Inject constructor() : AwalaMessageProcessor {
+
+    override suspend fun process(message: IncomingMessage, awalaManager: AwalaManager) {
+        Log.w(AwalaManagerImpl.TAG, "Unknown message processor for type: ${message.type}")
+    }
+}

app/src/main/java/tech/relaycorp/letro/contacts/model/Contact.kt

@@ -1,10 +1,16 @@
 package tech.relaycorp.letro.contacts.model
 
+import androidx.annotation.IntDef
 import androidx.room.Entity
 import androidx.room.ForeignKey
 import androidx.room.Index
 import androidx.room.PrimaryKey
 import tech.relaycorp.letro.account.model.Account
+import tech.relaycorp.letro.contacts.model.ContactPairingStatus.Companion.AUTHORIZATION_SENT
+import tech.relaycorp.letro.contacts.model.ContactPairingStatus.Companion.COMPLETED
+import tech.relaycorp.letro.contacts.model.ContactPairingStatus.Companion.MATCH
+import tech.relaycorp.letro.contacts.model.ContactPairingStatus.Companion.REQUEST_SENT
+import tech.relaycorp.letro.contacts.model.ContactPairingStatus.Companion.UNPAIRED
 
 const val TABLE_NAME_CONTACTS = "contacts"
 
@@ -22,18 +28,21 @@ const val TABLE_NAME_CONTACTS = "contacts"
 )
 data class Contact(
     @PrimaryKey(autoGenerate = true)
-    val id: Long,
+    val id: Long = 0L,
     val ownerVeraId: String,
     val contactVeraId: String,
     val alias: String? = null,
     val contactEndpointId: String? = null,
-    val status: ContactPairingStatus = ContactPairingStatus.Unpaired,
+    @ContactPairingStatus val status: Int = UNPAIRED,
 )
 
-sealed interface ContactPairingStatus {
-    object Unpaired : ContactPairingStatus
-    object RequestSent : ContactPairingStatus
-    object Match : ContactPairingStatus
-    object AuthorizationSent : ContactPairingStatus
-    object Complete : ContactPairingStatus
+@IntDef(UNPAIRED, REQUEST_SENT, MATCH, AUTHORIZATION_SENT, COMPLETED)
+annotation class ContactPairingStatus {
+    companion object {
+        const val UNPAIRED = 0
+        const val REQUEST_SENT = 1
+        const val MATCH = 2
+        const val AUTHORIZATION_SENT = 3
+        const val COMPLETED = 4
+    }
 }

app/src/main/java/tech/relaycorp/letro/contacts/storage/ContactsDao.kt

@@ -14,6 +14,12 @@ interface ContactsDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insert(contact: Contact): Long
 
+    @Query("SELECT * FROM $TABLE_NAME_CONTACTS WHERE ownerVeraId = :ownerVeraId AND contactVeraId = :contactVeraId")
+    suspend fun getContact(
+        ownerVeraId: String,
+        contactVeraId: String,
+    ): Contact?
+
     @Update
     suspend fun update(contact: Contact)