Session Pro Backend Integration 2

Session.xcodeproj/project.pbxproj

@@ -3321,16 +3321,6 @@
 			path = SessionNetworkScreen;
 			sourceTree = "<group>";
 		};
-		94805EC42EB8156A0055EBBC /* SessionPro */ = {
-			isa = PBXGroup;
-			children = (
-				948615C02ED7D39B000A5666 /* SessionProSettingsViewModel.swift */,
-				948615C12ED7D39B000A5666 /* SessionProSettingsViewModel+Database.swift */,
-				94805EC22EB48EC40055EBBC /* SessionProPaymentScreenContent.swift */,
-			);
-			path = SessionPro;
-			sourceTree = "<group>";
-		};
 		94CD96282E1B855E0097754D /* Input View */ = {
 			isa = PBXGroup;
 			children = (
@@ -4182,7 +4172,6 @@
 		C3C2A6F125539DE700C340D1 /* SessionMessagingKit */ = {
 			isa = PBXGroup;
 			children = (
-				94805EC42EB8156A0055EBBC /* SessionPro */,
 				C3C2A7802553AA6300C340D1 /* Protos */,
 				C3C2A70A25539DF900C340D1 /* Meta */,
 				B8DE1FB226C22F1F0079C9CE /* Calls */,
@@ -5436,6 +5425,9 @@
 				FDAA36C42EB474B50040603E /* Types */,
 				FD1F3CF42ED69B5B00E536D5 /* Utilities */,
 				94B6BAF52E30A88800E718BB /* SessionProManager.swift */,
+				948615C02ED7D39B000A5666 /* SessionProSettingsViewModel.swift */,
+				948615C12ED7D39B000A5666 /* SessionProSettingsViewModel+Database.swift */,
+				94805EC22EB48EC40055EBBC /* SessionProPaymentScreenContent.swift */,
 			);
 			path = SessionPro;
 			sourceTree = "<group>";

Session/Home/HomeViewModel.swift

@@ -551,7 +551,13 @@ public class HomeViewModel: NavigatableStateHolder {
                 self?.transitionToScreen(viewController)
             },
             presenting: { [weak self, dependencies] modal in
-                dependencies[defaults: .standard, key: .hasShownProExpiringCTA] = true
+                switch info.variant {
+                    case .expiring(timeLeft: .some):
+                        dependencies[defaults: .standard, key: .hasShownProExpiringCTA] = true
+                    case .expiring(timeLeft: .none):
+                        dependencies[defaults: .standard, key: .hasShownProExpiredCTA] = true
+                    default: return
+                }
                 self?.transitionToScreen(modal, transitionType: .present)
             }
         )

Session/Onboarding/LandingScreen.swift

@@ -178,26 +178,14 @@ struct LandingScreen: View {
     }
 
     private func openLegalUrl() {
-        let modal: ConfirmationModal = ConfirmationModal(
-            info: ConfirmationModal.Info(
-                title: "urlOpen".localized(),
-                body: .text("urlOpenBrowser".localized()),
-                confirmTitle: "onboardingTos".localized(),
-                confirmStyle: .textPrimary,
-                cancelTitle: "onboardingPrivacy".localized(),
-                cancelStyle: .textPrimary,
-                hasCloseButton: true,
-                onConfirm: { _ in
-                    // TODO: [PRO] Update this to use the double url modal
-                    if let url: URL = URL(string: Constants.urls.termsOfService) {
-                        UIApplication.shared.open(url)
-                    }
-                },
-                onCancel: { modal in
-                    if let url: URL = URL(string: Constants.urls.privacyPolicy) {
-                        UIApplication.shared.open(url)
-                    }
-                    modal.close()
+        let modal: ModalHostingViewController = ModalHostingViewController(
+            modal: MutipleLinksModal(
+                links: [
+                    Constants.urls.termsOfService,
+                    Constants.urls.privacyPolicy
+                ],
+                openURL: { url in
+                    UIApplication.shared.open(url)
                 }
             )
         )

Session/Settings/DeveloperSettings/DeveloperSettingsProViewModel.swift

@@ -1055,7 +1055,7 @@ class DeveloperSettingsProViewModel: SessionTableViewModel, NavigatableStateHold
 
             await dependencies.notify(
                 key: .proRevocationListUpdated,
-                value: Array<Network.SessionPro.RevocationItem>()
+                value: Array<RevocationItem>()
             )
         }
         catch {

Session/Settings/SettingsViewModel.swift

@@ -476,6 +476,10 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl
                             tintColor: .sessionButton_text
                         ),
                         onTap: { [weak viewModel, dependencies = viewModel.dependencies] in
+                            Task.detached(priority: .userInitiated) {
+                                try? await dependencies[singleton: .sessionProManager].refreshProState()
+                            }
+
                             let viewController: SessionListHostingViewController = SessionListHostingViewController(
                                 viewModel: SessionProSettingsViewModel(using: dependencies),
                                 customizedNavigationBackground: .clear

SessionMessagingKit/Crypto/Crypto+LibSession.swift

@@ -403,12 +403,12 @@ public extension Crypto.Generator {
             id: "sessionProMasterKeyPair",
             args: []
         ) { dependencies in
-            let cEd25519SecretKey: [UInt8] = dependencies[cache: .general].ed25519SecretKey
+            let cEd25519Seed: [UInt8] = dependencies[cache: .general].ed25519Seed
             var cMasterSecretKey: [UInt8] = [UInt8](repeating: 0, count: 64)
 
-            guard !cEd25519SecretKey.isEmpty else { throw CryptoError.missingUserSecretKey }
+            guard !cEd25519Seed.isEmpty else { throw CryptoError.missingUserSecretKey }
 
-            guard session_ed25519_pro_privkey_for_ed25519_seed(cEd25519SecretKey, &cMasterSecretKey) else {
+            guard session_ed25519_pro_privkey_for_ed25519_seed(cEd25519Seed, &cMasterSecretKey) else {
                 throw CryptoError.keyGenerationFailed
             }
 

SessionMessagingKit/Sending & Receiving/MessageSender+Convenience.swift

@@ -268,6 +268,18 @@ extension MessageSender {
                                 )
                             }
                         }
+
+                        switch destination {
+                            case .syncMessage: break
+                            default:
+                                // Update pro stats here
+                                if message.proMessageFeatures?.contains(.largerCharacterLimit) == true {
+                                    db[.longerMessagesSentCounter] = (db[.longerMessagesSentCounter] ?? 0) + 1
+                                }
+                                if message.proProfileFeatures?.contains(.proBadge) == true {
+                                    db[.proBadgesSentCounter] = (db[.proBadgesSentCounter] ?? 0) + 1
+                                }
+                        }
                     }
             }
         }