From 71823c9fae8e1bd16c48b1c0af5fb15f32078955 Mon Sep 17 00:00:00 2001
From: otsmr <git@tsmr.eu>
Date: Sat, 8 Nov 2025 18:14:16 +0100
Subject: [PATCH] fixing ios release issues

---
 ios/Podfile.lock                              |  4 +-
 .../xcshareddata/xcschemes/Runner.xcscheme    |  2 +-
 .../notifications/pushkeys.notifications.dart | 63 +++++++++++--------
 pubspec.lock                                  | 15 ++---
 pubspec.yaml                                  | 10 ++-
 5 files changed, 57 insertions(+), 37 deletions(-)

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index ecb8d62..32c6051 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -241,7 +241,7 @@ PODS:
     - sqlite3/perf-threadsafe
     - sqlite3/rtree
     - sqlite3/session
-  - SwiftProtobuf (1.32.0)
+  - SwiftProtobuf (1.33.1)
   - url_launcher_ios (0.0.1):
     - Flutter
   - video_player_avfoundation (0.0.1):
@@ -421,7 +421,7 @@ SPEC CHECKSUMS:
   sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
   sqlite3: 73513155ec6979715d3904ef53a8d68892d4032b
   sqlite3_flutter_libs: 83f8e9f5b6554077f1d93119fe20ebaa5f3a9ef1
-  SwiftProtobuf: 81e341191afbddd64aa031bd12862dccfab2f639
+  SwiftProtobuf: 533a18409c3ca3a6156b2b1e46afd0f69e751aba
   url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
   video_player_avfoundation: dd410b52df6d2466a42d28550e33e4146928280a
 
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index e3773d4..fa4cdb6 100644
--- a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -52,7 +52,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
diff --git a/lib/src/services/notifications/pushkeys.notifications.dart b/lib/src/services/notifications/pushkeys.notifications.dart
index b02ab0f..613db6a 100644
--- a/lib/src/services/notifications/pushkeys.notifications.dart
+++ b/lib/src/services/notifications/pushkeys.notifications.dart
@@ -362,36 +362,49 @@ Future<Uint8List?> encryptPushNotification(
 
 Future<List<PushUser>> getPushKeys(String storageKey) async {
   const storage = FlutterSecureStorage();
-  final pushKeysProto = await storage.read(
-    key: storageKey,
-    iOptions: const IOSOptions(
-      groupId: 'CN332ZUGRP.eu.twonly.shared',
-      accessibility: KeychainAccessibility.first_unlock,
-    ),
-  );
-  if (pushKeysProto == null) return [];
-  final pushKeysRaw = base64Decode(pushKeysProto);
-  return PushUsers.fromBuffer(pushKeysRaw).users;
+  try {
+    final pushKeysProto = await storage.read(
+      key: storageKey,
+      iOptions: const IOSOptions(
+        groupId: 'CN332ZUGRP.eu.twonly.shared',
+        accessibility: KeychainAccessibility.first_unlock,
+      ),
+    );
+    if (pushKeysProto == null) return [];
+    final pushKeysRaw = base64Decode(pushKeysProto);
+    return PushUsers.fromBuffer(pushKeysRaw).users;
+  } catch (e) {
+    Log.error(e);
+  }
+  return [];
 }
 
 Future<void> setPushKeys(String storageKey, List<PushUser> pushKeys) async {
   const storage = FlutterSecureStorage();
 
-  await storage.delete(
-    key: storageKey,
-    iOptions: const IOSOptions(
-      groupId: 'CN332ZUGRP.eu.twonly.shared',
-      accessibility: KeychainAccessibility.first_unlock,
-    ),
-  );
+  try {
+    await storage.delete(
+      key: storageKey,
+      iOptions: const IOSOptions(
+        groupId: 'CN332ZUGRP.eu.twonly.shared',
+        accessibility: KeychainAccessibility.first_unlock,
+      ),
+    );
+  } catch (e) {
+    Log.error(e);
+  }
 
   final jsonString = base64Encode(PushUsers(users: pushKeys).writeToBuffer());
-  await storage.write(
-    key: storageKey,
-    value: jsonString,
-    iOptions: const IOSOptions(
-      groupId: 'CN332ZUGRP.eu.twonly.shared',
-      accessibility: KeychainAccessibility.first_unlock,
-    ),
-  );
+  try {
+    await storage.write(
+      key: storageKey,
+      value: jsonString,
+      iOptions: const IOSOptions(
+        groupId: 'CN332ZUGRP.eu.twonly.shared',
+        accessibility: KeychainAccessibility.first_unlock,
+      ),
+    );
+  } catch (e) {
+    Log.error(e);
+  }
 }
diff --git a/pubspec.lock b/pubspec.lock
index 4d2c37e..63801d5 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -705,18 +705,19 @@ packages:
     dependency: "direct main"
     description:
       path: flutter_secure_storage
-      ref: "71b75a36f35f2ce945998e20c6c6aa1820babfc6"
-      resolved-ref: "71b75a36f35f2ce945998e20c6c6aa1820babfc6"
+      ref: a06ead81809c900e7fc421a30db0adf3b5919139
+      resolved-ref: a06ead81809c900e7fc421a30db0adf3b5919139
       url: "https://github.com/juliansteenbakker/flutter_secure_storage.git"
     source: git
     version: "10.0.0-beta.4"
   flutter_secure_storage_darwin:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: flutter_secure_storage_darwin
-      sha256: f226f2a572bed96bc6542198ebaec227150786e34311d455a7e2d3d06d951845
-      url: "https://pub.dev"
-    source: hosted
+      path: flutter_secure_storage_darwin
+      ref: a06ead81809c900e7fc421a30db0adf3b5919139
+      resolved-ref: a06ead81809c900e7fc421a30db0adf3b5919139
+      url: "https://github.com/juliansteenbakker/flutter_secure_storage.git"
+    source: git
     version: "0.1.0"
   flutter_secure_storage_linux:
     dependency: transitive
diff --git a/pubspec.yaml b/pubspec.yaml
index c43b7fb..ad4dfdd 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: "twonly, a privacy-friendly way to connect with friends through sec
 
 publish_to: 'none'
 
-version: 0.0.64+64
+version: 0.0.65+65
 
 environment:
   sdk: ^3.6.0
@@ -36,7 +36,7 @@ dependencies:
   flutter_secure_storage:
     git:
       url: https://github.com/juliansteenbakker/flutter_secure_storage.git
-      ref: 71b75a36f35f2ce945998e20c6c6aa1820babfc6 # from develop
+      ref: a06ead81809c900e7fc421a30db0adf3b5919139 # from develop
       path: flutter_secure_storage/
   flutter_svg: ^2.0.17
   flutter_volume_controller: ^1.3.4
@@ -77,6 +77,12 @@ dependencies:
 
 dependency_overrides: 
 
+  flutter_secure_storage_darwin:
+    git:
+      url: https://github.com/juliansteenbakker/flutter_secure_storage.git
+      ref: a06ead81809c900e7fc421a30db0adf3b5919139 # from develop
+      path: flutter_secure_storage_darwin/
+
   flutter_android_volume_keydown:
     git:
       url: https://github.com/yenchieh/flutter_android_volume_keydown.git