Tt/feature/restore changes

sphinx/activity/main/activitymain/src/main/java/chat/sphinx/activitymain/navigation/navigators/primary/OnBoardConnectingNavigatorImpl.kt

@@ -5,11 +5,9 @@ import chat.sphinx.activitymain.navigation.drivers.PrimaryNavigationDriver
 import chat.sphinx.dashboard.navigation.ToDashboardScreen
 import chat.sphinx.onboard.navigation.ToOnBoardScreen
 import chat.sphinx.onboard_common.model.OnBoardStep
-import chat.sphinx.onboard_connect.navigation.OnBoardConnectNavigator
 import chat.sphinx.onboard_connected.navigation.ToOnBoardConnectedScreen
 import chat.sphinx.onboard_connecting.navigation.OnBoardConnectingNavigator
 import chat.sphinx.onboard_desktop.navigation.ToOnBoardDesktopScreen
-import chat.sphinx.onboard_lightning.navigation.ToOnBoardLightningScreen
 import chat.sphinx.onboard_name.navigation.ToOnBoardNameScreen
 import javax.inject.Inject
 
@@ -31,6 +29,12 @@ internal class OnBoardConnectingNavigatorImpl @Inject constructor(
         )
     }
 
+    override suspend fun toOnBoardDesktopScreen() {
+        navigationDriver.submitNavigationRequest(
+            ToOnBoardDesktopScreen(popUpToId = R.id.main_primary_nav_graph)
+        )
+    }
+
     override suspend fun toDashboardScreen() {
         navigationDriver.submitNavigationRequest(
             ToDashboardScreen(

sphinx/activity/main/activitymain/src/main/java/chat/sphinx/activitymain/navigation/navigators/primary/OnBoardDesktopNavigatorImpl.kt

@@ -13,9 +13,9 @@ internal class OnBoardDesktopNavigatorImpl @Inject constructor(
     navigationDriver: PrimaryNavigationDriver
 ): OnBoardDesktopNavigator(navigationDriver) {
 
-    override suspend fun toOnBoardReadyScreen(onBoardStep4: OnBoardStep.Step4_Ready) {
+    override suspend fun toOnBoardReadyScreen() {
         navigationDriver.submitNavigationRequest(
-            ToOnBoardReadyScreen(popUpToId = R.id.main_primary_nav_graph, onBoardStep4)
+            ToOnBoardReadyScreen(popUpToId = R.id.main_primary_nav_graph)
         )
     }
 

sphinx/activity/main/activitymain/src/main/java/chat/sphinx/activitymain/navigation/navigators/primary/OnBoardPictureNavigatorImpl.kt

@@ -2,19 +2,17 @@ package chat.sphinx.activitymain.navigation.navigators.primary
 
 import chat.sphinx.activitymain.R
 import chat.sphinx.activitymain.navigation.drivers.PrimaryNavigationDriver
-import chat.sphinx.onboard_common.model.OnBoardStep
 import chat.sphinx.onboard_desktop.navigation.ToOnBoardDesktopScreen
 import chat.sphinx.onboard_picture.navigation.OnBoardPictureNavigator
-import chat.sphinx.onboard_ready.navigation.ToOnBoardReadyScreen
 import javax.inject.Inject
 
 internal class OnBoardPictureNavigatorImpl @Inject constructor(
     navigationDriver: PrimaryNavigationDriver
 ): OnBoardPictureNavigator(navigationDriver)
 {
-    override suspend fun toOnBoardDesktopScreen(onBoardStep4: OnBoardStep.Step4_Ready) {
+    override suspend fun toOnBoardDesktopScreen() {
         navigationDriver.submitNavigationRequest(
-            ToOnBoardDesktopScreen(popUpToId = R.id.main_primary_nav_graph, onBoardStep4)
+            ToOnBoardDesktopScreen(popUpToId = R.id.main_primary_nav_graph)
         )
     }
 }

sphinx/activity/main/activitymain/src/main/java/chat/sphinx/activitymain/navigation/navigators/primary/SplashNavigatorImpl.kt

@@ -56,9 +56,9 @@ internal class SplashNavigatorImpl @Inject constructor(
         )
     }
 
-    override suspend fun toOnBoardReadyScreen(onBoardStep4: OnBoardStep.Step4_Ready) {
+    override suspend fun toOnBoardReadyScreen() {
         navigationDriver.submitNavigationRequest(
-            ToOnBoardReadyScreen(popUpToId = R.id.main_primary_nav_graph, onBoardStep = onBoardStep4)
+            ToOnBoardReadyScreen(popUpToId = R.id.main_primary_nav_graph)
         )
     }
 }

sphinx/application/data/concepts/concept-connect-manager/src/main/java/chat/sphinx/example/concept_connect_manager/ConnectManager.kt

@@ -22,6 +22,8 @@ abstract class ConnectManager {
     abstract val restoreStateFlow: StateFlow<RestoreState?>
     abstract val msgsCountsState: MutableStateFlow<MsgsCounts?>
 
+    abstract fun setOwnerInfo(ownerInfo: OwnerInfo)
+
     // Account Management Methods
     abstract fun createAccount()
     abstract fun restoreAccount(
@@ -174,7 +176,7 @@ interface ConnectManagerListener {
 
     // Account Management Callbacks
     fun onUpdateUserState(userState: String)
-    fun onMnemonicWords(words: String)
+    fun onMnemonicWords(words: String, isRestore: Boolean)
     fun onOwnerRegistered(
         okKey: String,
         routeHint: String,

sphinx/application/data/concepts/concept-coredb/src/main/sqldelight/chat/sphinx/concept_coredb/SphinxDatabase.sq

@@ -547,7 +547,8 @@ WHERE id = ?;
 contactUpdateOwnerInfo:
 UPDATE contactDbo
 SET alias = :alias,
-    photo_url = : photo_url
+    private_photo = :private_photo,
+    tip_amount = :tip_amount
 WHERE owner = 1;
 
 contactUpdateOwnerDeviceId:

sphinx/application/data/concepts/repositories/concept-repository-message/src/main/java/chat/sphinx/concept_repository_message/MessageRepository.kt

@@ -136,6 +136,7 @@ interface MessageRepository {
     suspend fun upsertMqttMessage(
         msg: Msg,
         msgSender: MsgSender,
+        contactTribePubKey: String,
         msgType: MessageType,
         msgUuid: MessageUUID,
         msgIndex: MessageId,

sphinx/application/data/features/feature-connect-manager/src/main/java/chat/sphinx/feature_connect_manager/ConnectManagerImpl.kt

@@ -150,6 +150,10 @@ class ConnectManagerImpl: ConnectManager()
         MutableStateFlow(null)
     }
 
+    override fun setOwnerInfo(ownerInfo: OwnerInfo) {
+        _ownerInfoStateFlow.value = ownerInfo
+    }
+
     private var mixerIp: String?
         get() = _mixerIp?.let {
             if (isProductionEnvironment()) {
@@ -1155,7 +1159,10 @@ class ConnectManagerImpl: ConnectManager()
                 seed = mnemonicToSeed(words)
 
                 notifyListeners {
-                    onMnemonicWords(words)
+                    onMnemonicWords(
+                        words,
+                        restoreMnemonic != null
+                    )
                 }
             } catch (e: Exception) {
             }

sphinx/application/data/features/feature-repository/src/main/java/chat/sphinx/feature_repository/SphinxRepository.kt

@@ -697,13 +697,18 @@ abstract class SphinxRepository(
     override fun onUpdateUserState(userState: String) {
         userStateFlow.value = userState
     }
-    override fun onMnemonicWords(words: String) {
+    override fun onMnemonicWords(
+        words: String,
+        isRestore: Boolean
+    ) {
         applicationScope.launch(io) {
             words.toWalletMnemonic()?.let {
                 walletDataHandler.persistWalletMnemonic(it)
             }
         }
-        connectionManagerState.value = OwnerRegistrationState.MnemonicWords(words)
+        if (!isRestore) {
+            connectionManagerState.value = OwnerRegistrationState.MnemonicWords(words)
+        }
     }
     override fun onOwnerRegistered(
         okKey: String,
@@ -1103,7 +1108,7 @@ abstract class SphinxRepository(
     override fun updatePaidInvoices() {
         applicationScope.launch(io) {
             val queries = coreDB.getSphinxDatabaseQueries()
-            queries.messageGetAllPayments().executeAsList()?.forEach { message ->
+            queries.messageGetAllPayments().executeAsList().forEach { message ->
                 messageLock.withLock {
                     queries.messageUpdateInvoiceAsPaidByPaymentHash(message.payment_hash)
                 }
@@ -1132,21 +1137,10 @@ abstract class SphinxRepository(
 
                 val messageSender = msgSender.toMsgSender(moshi)
 
-                val contactInfo = if (fromMe == false) {
-                    messageSender
+                val contactTribePubKey = if (fromMe == true) {
+                    sentTo
                 } else {
-                    // Add
-                    MsgSender(
-                        sentTo,
-                        messageSender.route_hint,
-                        messageSender.alias,
-                        messageSender.photo_url,
-                        messageSender.person,
-                        messageSender.confirmed,
-                        messageSender.code,
-                        messageSender.host,
-                        messageSender.role
-                    )
+                    messageSender.pubkey
                 }
 
                 when (messageType) {
@@ -1175,7 +1169,7 @@ abstract class SphinxRepository(
                                 amount?.toSat()?.let { paidAmount ->
                                     sendMediaKeyOnPaidPurchase(
                                         message,
-                                        contactInfo,
+                                        messageSender,
                                         paidAmount
                                     )
                                 }
@@ -1208,7 +1202,8 @@ abstract class SphinxRepository(
 
                         upsertMqttMessage(
                             message,
-                            contactInfo,
+                            messageSender,
+                            contactTribePubKey,
                             messageType,
                             messageUuid,
                             messageId,
@@ -1514,6 +1509,7 @@ abstract class SphinxRepository(
     override suspend fun upsertMqttMessage(
         msg: Msg,
         msgSender: MsgSender,
+        contactTribePubKey: String,
         msgType: MessageType,
         msgUuid: MessageUUID,
         msgIndex: MessageId,
@@ -1529,8 +1525,9 @@ abstract class SphinxRepository(
         tag: TagMessage?
     ) {
         val queries = coreDB.getSphinxDatabaseQueries()
-        val contact = msgSender.pubkey.toLightningNodePubKey()?.let { getContactByPubKey(it).firstOrNull() }
-        val chatTribe = msgSender.pubkey.toChatUUID()?.let { getChatByUUID(it).firstOrNull() }
+        val contact = contactTribePubKey.toLightningNodePubKey()?.let { getContactByPubKey(it).firstOrNull() }
+        val owner = accountOwner.value
+        val chatTribe = contactTribePubKey.toChatUUID()?.let { getChatByUUID(it).firstOrNull() }
         var messageMedia: MessageMediaDbo? = null
         val isTribe = contact == null
 
@@ -1638,25 +1635,52 @@ abstract class SphinxRepository(
                 thread = null
             )
 
-            if (!fromMe) {
-                contact?.id?.let { contactId ->
+            contact?.id?.let { contactId ->
+                if (!fromMe) {
                     val lastMessageIndex = getLastMessage().firstOrNull()?.id?.value
                     val newMessageIndex = msgIndex.value
 
                     if (lastMessageIndex != null) {
                         if (lastMessageIndex < newMessageIndex) {
                             contactLock.withLock {
-                                msgSender.photo_url?.takeIf { it.isNotEmpty() && it != contact.photoUrl?.value }?.let {
-                                    queries.contactUpdatePhotoUrl(it.toPhotoUrl(), contactId)
-                                }
-                                msgSender.alias?.takeIf { it.isNotEmpty() && it != contact.alias?.value }?.let {
-                                    queries.contactUpdateAlias(it.toContactAlias(), contactId)
-                                }
+                                msgSender.photo_url?.takeIf { it.isNotEmpty() && it != contact.photoUrl?.value }
+                                    ?.let {
+                                        queries.contactUpdatePhotoUrl(it.toPhotoUrl(), contactId)
+                                    }
+                                msgSender.alias?.takeIf { it.isNotEmpty() && it != contact.alias?.value }
+                                    ?.let {
+                                        queries.contactUpdateAlias(it.toContactAlias(), contactId)
+                                    }
+                            }
+                        }
+                    }
+                } else {
+                    contactLock.withLock {
+                        if (owner != null) {
+                            if (owner.alias?.value == null) {
+                                msgSender.alias?.takeIf { it.isNotEmpty() && it != owner.alias?.value }
+                                    ?.let {
+                                        queries.contactUpdateAlias(it.toContactAlias(), owner.id)
+                                    }
+                            }
+
+                            if (owner.photoUrl?.value == null) {
+                                msgSender.photo_url?.takeIf { it.isNotEmpty() && it != owner.photoUrl?.value }
+                                    ?.let {
+                                        queries.contactUpdatePhotoUrl(it.toPhotoUrl(), owner.id)
+
+                                        connectManager.ownerInfoStateFlow.value?.let { ownerInfo ->
+                                            connectManager.setOwnerInfo(
+                                                ownerInfo.copy(picture = it)
+                                            )
+                                        }
+                                    }
                             }
                         }
                     }
                 }
             }
+
             if (msgType is MessageType.Payment) {
                 queries.messageUpdateInvoiceAsPaidByPaymentHash(
                     msg.paymentHash?.toLightningPaymentHash()
@@ -2358,50 +2382,27 @@ abstract class SphinxRepository(
     }
 
     override suspend fun updateOwner(
-        alias: String?, privatePhoto: PrivatePhoto?, tipAmount: Sat?
+        alias: String?,
+        privatePhoto: PrivatePhoto?,
+        tipAmount: Sat?
     ): Response<Any, ResponseError> {
         val queries = coreDB.getSphinxDatabaseQueries()
-        var response: Response<Any, ResponseError> = Response.Success(Any())
 
-        // TODO V2 updateOwner
-//        try {
-//            accountOwner.collect { owner ->
-//
-//                if (owner != null) {
-//                    networkQueryContact.updateContact(
-//                        owner.id,
-//                        PutContactDto(
-//                            alias = alias,
-//                            private_photo = privatePhoto?.isTrue(),
-//                            tip_amount = tipAmount?.value
-//                        )
-//                    ).collect { loadResponse ->
-//                        @Exhaustive
-//                        when (loadResponse) {
-//                            is LoadResponse.Loading -> {
-//                            }
-//                            is Response.Error -> {
-//                                response = loadResponse
-//                            }
-//                            is Response.Success -> {
-//                                contactLock.withLock {
-//                                    queries.transaction {
-//                                        upsertContact(loadResponse.value, queries)
-//                                    }
-//                                }
-//                                LOG.d(TAG, "Owner has been successfully updated")
-//                            }
-//                        }
-//                    }
-//
-//                    throw Exception()
-//                }
-//
-//            }
-//        } catch (e: Exception) {
-//        }
+        contactLock.withLock {
+            queries.contactUpdateOwnerInfo(
+                alias?.toContactAlias(),
+                privatePhoto ?: PrivatePhoto.False,
+                tipAmount
+            )
+        }
 
-        return response
+        connectManager.ownerInfoStateFlow.value?.let {
+            connectManager.setOwnerInfo(
+                it.copy(alias = alias)
+            )
+        }
+
+        return Response.Success(Any())
     }
 
     override suspend fun updateContact(
@@ -2585,6 +2586,12 @@ abstract class SphinxRepository(
                                     )
                                 }
                             }
+
+                            connectManager.ownerInfoStateFlow.value?.let {
+                                connectManager.setOwnerInfo(
+                                    it.copy(picture = newUrl.value)
+                                )
+                            }
                         } ?: throw IllegalStateException("Failed to retrieve account owner")
                     }
                 }

sphinx/screens/dashboard/dashboard/src/main/java/chat/sphinx/dashboard/ui/DashboardFragment.kt

@@ -10,6 +10,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import androidx.constraintlayout.motion.widget.MotionLayout
 import androidx.core.content.ContextCompat
+import androidx.core.view.isVisible
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.NavController
@@ -624,6 +625,11 @@ internal class DashboardFragment : MotionLayoutFragment<
                     } else {
                         viewModel.fetchDeletedMessagesOnDb()
                         root.gone
+
+                        if (response != null) {
+                            ///Did finish restore
+                            viewModel.finishSettingUpPersonalInfo()
+                        }
                     }
                 }
             }