Revert "Revert "core: rework incognito mode - set per connection (#2838)""

This reverts commit b003d659e4.

src/Simplex/Chat/Store/Direct.hs

@@ -17,6 +17,7 @@ module Simplex.Chat.Store.Direct
     getPendingContactConnection,
     deletePendingContactConnection,
     createDirectConnection,
+    createIncognitoProfile,
     createConnReqConnection,
     getProfileById,
     getConnReqContactXContactId,
@@ -33,6 +34,8 @@ module Simplex.Chat.Store.Direct
     updateContactUserPreferences,
     updateContactAlias,
     updateContactConnectionAlias,
+    updatePCCIncognito,
+    deletePCCIncognitoProfile,
     updateContactUsed,
     updateContactUnreadChat,
     updateGroupUnreadChat,
@@ -171,6 +174,11 @@ createDirectConnection db User {userId} acId cReq pccConnStatus incognitoProfile
   pccConnId <- insertedRowId db
   pure PendingContactConnection {pccConnId, pccAgentConnId = AgentConnId acId, pccConnStatus, viaContactUri = False, viaUserContactLink = Nothing, groupLinkId = Nothing, customUserProfileId, connReqInv = Just cReq, localAlias = "", createdAt, updatedAt = createdAt}
 
+createIncognitoProfile :: DB.Connection -> User -> Profile -> IO Int64
+createIncognitoProfile db User {userId} p = do
+  createdAt <- getCurrentTime
+  createIncognitoProfile_ db userId createdAt p
+
 createIncognitoProfile_ :: DB.Connection -> UserId -> UTCTime -> Profile -> IO Int64
 createIncognitoProfile_ db userId createdAt Profile {displayName, fullName, image} = do
   DB.execute
@@ -307,7 +315,30 @@ updateContactConnectionAlias db userId conn localAlias = do
       WHERE user_id = ? AND connection_id = ?
     |]
     (localAlias, updatedAt, userId, pccConnId conn)
-  pure (conn :: PendingContactConnection) {localAlias}
+  pure (conn :: PendingContactConnection) {localAlias, updatedAt}
+
+updatePCCIncognito :: DB.Connection -> User -> PendingContactConnection -> Maybe ProfileId -> IO PendingContactConnection
+updatePCCIncognito db User {userId} conn customUserProfileId = do
+  updatedAt <- getCurrentTime
+  DB.execute
+    db
+    [sql|
+      UPDATE connections
+      SET custom_user_profile_id = ?, updated_at = ?
+      WHERE user_id = ? AND connection_id = ?
+    |]
+    (customUserProfileId, updatedAt, userId, pccConnId conn)
+  pure (conn :: PendingContactConnection) {customUserProfileId, updatedAt}
+
+deletePCCIncognitoProfile :: DB.Connection -> User -> ProfileId -> IO ()
+deletePCCIncognitoProfile db User {userId} profileId =
+  DB.execute
+    db
+    [sql|
+      DELETE FROM contact_profiles
+      WHERE user_id = ? AND contact_profile_id = ? AND incognito = 1
+    |]
+    (userId, profileId)
 
 updateContactUsed :: DB.Connection -> User -> Contact -> IO ()
 updateContactUsed db User {userId} Contact {contactId} = do

src/Simplex/Chat/Store/Profiles.hs

@@ -397,14 +397,14 @@ data UserContactLink = UserContactLink
 instance ToJSON UserContactLink where toEncoding = J.genericToEncoding J.defaultOptions
 
 data AutoAccept = AutoAccept
-  { acceptIncognito :: Bool,
+  { acceptIncognito :: IncognitoEnabled,
     autoReply :: Maybe MsgContent
   }
   deriving (Show, Generic)
 
 instance ToJSON AutoAccept where toEncoding = J.genericToEncoding J.defaultOptions
 
-toUserContactLink :: (ConnReqContact, Bool, Bool, Maybe MsgContent) -> UserContactLink
+toUserContactLink :: (ConnReqContact, Bool, IncognitoEnabled, Maybe MsgContent) -> UserContactLink
 toUserContactLink (connReq, autoAccept, acceptIncognito, autoReply) =
   UserContactLink connReq $
     if autoAccept then Just AutoAccept {acceptIncognito, autoReply} else Nothing
@@ -452,9 +452,6 @@ updateUserAddressAutoAccept db user@User {userId} autoAccept = do
       Just AutoAccept {acceptIncognito, autoReply} -> (True, acceptIncognito, autoReply)
       _ -> (False, False, Nothing)
 
-
-
-
 getProtocolServers :: forall p. ProtocolTypeI p => DB.Connection -> User -> IO [ServerCfg p]
 getProtocolServers db User {userId} =
   map toServerCfg

src/Simplex/Chat/Store/Shared.hs

@@ -203,7 +203,7 @@ createContact_ db userId connId Profile {displayName, fullName, image, contactLi
     pure $ Right (ldn, contactId, profileId)
 
 deleteUnusedIncognitoProfileById_ :: DB.Connection -> User -> ProfileId -> IO ()
-deleteUnusedIncognitoProfileById_ db User {userId} profile_id =
+deleteUnusedIncognitoProfileById_ db User {userId} profileId =
   DB.executeNamed
     db
     [sql|
@@ -218,7 +218,7 @@ deleteUnusedIncognitoProfileById_ db User {userId} profile_id =
           WHERE user_id = :user_id AND member_profile_id = :profile_id LIMIT 1
         )
     |]
-    [":user_id" := userId, ":profile_id" := profile_id]
+    [":user_id" := userId, ":profile_id" := profileId]
 
 type ContactRow = (ContactId, ProfileId, ContactName, Maybe Int64, ContactName, Text, Maybe ImageData, Maybe ConnReqContact, LocalAlias, Bool) :. (Maybe Bool, Maybe Bool, Bool, Maybe Preferences, Preferences, UTCTime, UTCTime, Maybe UTCTime)