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/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
@@ -37,6 +38,11 @@ interface AwalaManager {
         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)
@@ -63,7 +69,6 @@ class AwalaManagerImpl @Inject constructor(
     private var isReceivingMessages = false
 
     private var firstPartyEndpoint: FirstPartyEndpoint? = null
-
     private var thirdPartyServerEndpoint: ThirdPartyEndpoint? = null
 
     init {
@@ -116,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()
@@ -159,7 +185,7 @@ class AwalaManagerImpl @Inject constructor(
             Log.i(TAG, "start receiving messages...")
             GatewayClient.receiveMessages().collect { message ->
                 Log.i(TAG, "Receive message: ${message.type}: ($message)")
-                processor.process(message)
+                processor.process(message, this@AwalaManagerImpl)
                 Log.i(TAG, "Message processed")
                 message.ack()
             }

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/UnknownMessageParser.kt

@@ -1,22 +0,0 @@
-package tech.relaycorp.letro.awala.parser
-
-import tech.relaycorp.letro.awala.message.AwalaIncomingMessage
-import tech.relaycorp.letro.awala.message.MessageType
-import javax.inject.Inject
-
-interface UnknownMessageParser : AwalaMessageParser
-
-class UnknownMessageParserImpl @Inject constructor() : UnknownMessageParser {
-
-    override fun parse(content: ByteArray): AwalaIncomingMessage<*> {
-        return UnknownIncomingMessage(
-            content = content.decodeToString(),
-        )
-    }
-}
-
-data class UnknownIncomingMessage(
-    override val content: String,
-) : AwalaIncomingMessage<String> {
-    override val type: MessageType = MessageType.Unknown
-}

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

@@ -1,18 +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)
+    suspend fun process(message: IncomingMessage, awalaManager: AwalaManager)
 }
 
 class AwalaMessageProcessorImpl constructor(
     private val processors: Map<MessageType, AwalaMessageProcessor>,
 ) : AwalaMessageProcessor {
 
-    override suspend fun process(message: IncomingMessage) {
+    override suspend fun process(message: IncomingMessage, awalaManager: AwalaManager) {
         val type = MessageType.from(message.type)
-        processors[type]!!.process(message)
+        processors[type]!!.process(message, awalaManager)
     }
 }

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

@@ -2,12 +2,13 @@ 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) {
+    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)
 

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

@@ -9,23 +9,31 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import tech.relaycorp.letro.account.model.Account
 import tech.relaycorp.letro.account.storage.AccountRepository
+import tech.relaycorp.letro.awala.AwalaManager
+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.contacts.model.Contact
 import tech.relaycorp.letro.contacts.model.ContactPairingStatus
 import javax.inject.Inject
 
 interface ContactsRepository {
     val isPairedContactsExist: Flow<Boolean>
     fun getContacts(ownerVeraId: String): Flow<List<Contact>>
+
+    fun addNewContact(contact: Contact)
 }
 
 class ContactsRepositoryImpl @Inject constructor(
     private val contactsDao: ContactsDao,
     private val accountRepository: AccountRepository,
+    private val awalaManager: AwalaManager,
 ) : ContactsRepository {
 
     private val scope = CoroutineScope(Dispatchers.IO)
     private val contacts = MutableStateFlow<List<Contact>>(emptyList())
 
+    private var currentAccount: Account? = null
     private val _isPairedContactsExist: MutableStateFlow<Boolean> = MutableStateFlow(false)
     override val isPairedContactsExist: StateFlow<Boolean>
         get() = _isPairedContactsExist
@@ -35,6 +43,7 @@ class ContactsRepositoryImpl @Inject constructor(
             contactsDao.getAll().collect {
                 contacts.emit(it)
                 startCollectAccountFlow()
+                updatePairedContactExist(currentAccount)
             }
         }
     }
@@ -44,9 +53,42 @@ class ContactsRepositoryImpl @Inject constructor(
             .map { it.filter { it.ownerVeraId == ownerVeraId } }
     }
 
+    override fun addNewContact(contact: Contact) {
+        scope.launch {
+            val existingContact = contactsDao.getContact(
+                ownerVeraId = contact.ownerVeraId,
+                contactVeraId = contact.contactVeraId,
+            )
+
+            if (existingContact == null || existingContact.status <= ContactPairingStatus.REQUEST_SENT) {
+                if (existingContact == null) {
+                    contactsDao.insert(
+                        contact.copy(
+                            status = ContactPairingStatus.REQUEST_SENT,
+                        ),
+                    )
+                } else {
+                    contactsDao.update(
+                        contact.copy(
+                            status = ContactPairingStatus.REQUEST_SENT,
+                        ),
+                    )
+                }
+                awalaManager.sendMessage(
+                    outgoingMessage = AwalaOutgoingMessage(
+                        type = MessageType.ContactPairingRequest,
+                        content = "${contact.ownerVeraId},${contact.contactVeraId},${awalaManager.getFirstPartyPublicKey()}".toByteArray(),
+                    ),
+                    recipient = MessageRecipient.Server(),
+                )
+            }
+        }
+    }
+
     private fun startCollectAccountFlow() {
         scope.launch {
             accountRepository.currentAccount.collect {
+                currentAccount = it
                 updatePairedContactExist(it)
             }
         }
@@ -61,8 +103,7 @@ class ContactsRepositoryImpl @Inject constructor(
             contacts
                 .value
                 .any {
-                    it.ownerVeraId == account.veraId &&
-                        it.status == ContactPairingStatus.Complete
+                    it.ownerVeraId == account.veraId && it.status == ContactPairingStatus.COMPLETED
                 },
         )
     }