Merge branch 'trunk' into feat/at_contacts_attribute_fix

.github/workflows/dependency-review.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Harden Runner
-        uses: step-security/harden-runner@eb238b55efaa70779f274895e782ed17c84f2895 # v2.6.1
+        uses: step-security/harden-runner@63c24ba6bd7ba022e95695ff85de572c04a18142 # v2.7.0
         with:
           egress-policy: audit
 

.github/workflows/scorecards.yml

@@ -59,7 +59,7 @@ jobs:
       # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
       # format to the repository Actions tab.
       - name: "Upload artifact"
-        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 # v4.3.0
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
         with:
           name: SARIF file
           path: results.sarif

packages/at_chat_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -20,7 +20,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   BiometricStorageMacOSPlugin.register(with: registry.registrar(forPlugin: "BiometricStorageMacOSPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
-  FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
+  FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))

packages/at_chat_flutter/example/pubspec.yaml

@@ -35,7 +35,7 @@ dependencies:
     # The example app is bundled with the plugin so we use a path dependency on
     # the parent directory to use the current plugin's version.
     path: ../
-  at_onboarding_flutter: ^6.1.3
+  at_onboarding_flutter: ^6.1.7
   at_client_mobile: ^3.2.13
   at_utils: ^3.0.15
   path_provider: ^2.1.1

packages/at_chat_flutter/lib/services/chat_service.dart

@@ -160,7 +160,7 @@ class ChatService {
         ..sharedBy = currentAtSign!
         ..sharedWith = chatWithAtSign
         ..metadata = Metadata();
-      key.metadata?.ccd = true;
+      key.metadata.ccd = true;
       var keyValue = await atClientManager.atClient.get(key).catchError((e) {
         return AtValue();
       });
@@ -262,8 +262,8 @@ class ChatService {
         ..sharedBy = currentAtSign!
         ..sharedWith = chatWithAtSign
         ..metadata = Metadata();
-      key.metadata?.ccd = true;
-      key.metadata?.ttr = -1;
+      key.metadata.ccd = true;
+      key.metadata.ttr = -1;
 
       chatHistoryMessages.insert(0, message.toJson());
       if (message.contentType == MessageContentType.image) {
@@ -295,7 +295,7 @@ class ChatService {
       ..sharedBy = currentAtSign!
       ..sharedWith = chatWithAtSign
       ..metadata = Metadata();
-    key.metadata?.ccd = true;
+    key.metadata.ccd = true;
     try {
       for (var i = 0; i < chatHistoryMessages.length; i++) {
         var message = Message.fromJson(chatHistoryMessages[i]);
@@ -326,7 +326,7 @@ class ChatService {
       ..sharedBy = currentAtSign!
       ..sharedWith = chatWithAtSign
       ..metadata = Metadata();
-    key.metadata?.ccd = true;
+    key.metadata.ccd = true;
 
     try {
       for (var i = 0; i < chatHistoryMessages.length; i++) {
@@ -369,9 +369,9 @@ class ChatService {
         ..sharedBy = currentAtSign!
         ..sharedWith = chatWithAtSign
         ..metadata = Metadata();
-      key.metadata?.ccd = true;
-      key.metadata?.ttr = -1;
-      key.metadata?.isBinary = true;
+      key.metadata.ccd = true;
+      key.metadata.ttr = -1;
+      key.metadata.isBinary = true;
 
       if (isGroupChat) {
         await Future.forEach(groupChatMembers!, (dynamic member) async {
@@ -422,14 +422,14 @@ class ChatService {
     var key = AtKey();
     Map<String, String> keyFields = fieldSeparator(savedKey);
     // construct key
-    key.key = keyFields['key'];
+    key.key = keyFields['key'] ?? "";
     key.sharedBy = keyFields['sharedBy'];
     key.sharedWith = keyFields['sharedWith'];
     // prepare metadata
     key.metadata = Metadata();
-    key.metadata?.ccd = true;
-    key.metadata?.ttr = -1;
-    key.metadata?.isBinary = true;
+    key.metadata.ccd = true;
+    key.metadata.ttr = -1;
+    key.metadata.isBinary = true;
     return key;
   }
 

packages/at_chat_flutter/pubspec.yaml

@@ -11,13 +11,13 @@ environment:
   flutter: ">=1.20.0"
 
 dependencies:
-  at_client: ^3.0.64
+  at_client: ^3.0.72
   at_client_mobile: ^3.2.12
   at_common_flutter: ^2.0.12
-  at_commons: ^3.0.55
-  at_contact: ^3.0.7
+  at_commons: ^4.0.1
+  at_contact: ^3.0.8
   at_lookup: ^3.0.40
-  file_picker: ^5.5.0
+  file_picker: ^6.1.1
   flutter:
     sdk: flutter
 

packages/at_chat_flutter/test/unit_test/chat_screen_test.dart

@@ -25,7 +25,7 @@ class MockAtClient extends Mock implements AtClient {
     bool isDedicated = false,
     GetRequestOptions? getRequestOptions,
   }) async {
-    if (key.metadata?.isBinary == true) {
+    if (key.metadata.isBinary == true) {
       return AtValue()..value = Uint8List(5);
     } else {
       var atSign = "@83apedistinct";

packages/at_contacts_flutter/example/ios/Podfile.lock

@@ -9,6 +9,8 @@ PODS:
     - Flutter
   - biometric_storage (0.0.1):
     - Flutter
+  - device_info_plus (0.0.1):
+    - Flutter
   - DKImagePickerController/Core (4.3.4):
     - DKImagePickerController/ImageDataManager
     - DKImagePickerController/Resource
@@ -43,6 +45,8 @@ PODS:
   - file_picker (0.0.1):
     - DKImagePickerController/PhotoGallery
     - Flutter
+  - file_selector_ios (0.0.1):
+    - Flutter
   - Flutter (1.0.0)
   - flutter_keychain (0.0.1):
     - Flutter
@@ -52,7 +56,7 @@ PODS:
   - path_provider_foundation (0.0.1):
     - Flutter
     - FlutterMacOS
-  - permission_handler_apple (9.0.4):
+  - permission_handler_apple (9.1.1):
     - Flutter
   - qr_code_scanner (0.2.0):
     - Flutter
@@ -77,7 +81,9 @@ DEPENDENCIES:
   - at_file_saver (from `.symlinks/plugins/at_file_saver/ios`)
   - at_onboarding_flutter (from `.symlinks/plugins/at_onboarding_flutter/ios`)
   - biometric_storage (from `.symlinks/plugins/biometric_storage/ios`)
+  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
   - file_picker (from `.symlinks/plugins/file_picker/ios`)
+  - file_selector_ios (from `.symlinks/plugins/file_selector_ios/ios`)
   - Flutter (from `Flutter`)
   - flutter_keychain (from `.symlinks/plugins/flutter_keychain/ios`)
   - package_info_plus (from `.symlinks/plugins/package_info_plus/ios`)
@@ -108,8 +114,12 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/at_onboarding_flutter/ios"
   biometric_storage:
     :path: ".symlinks/plugins/biometric_storage/ios"
+  device_info_plus:
+    :path: ".symlinks/plugins/device_info_plus/ios"
   file_picker:
     :path: ".symlinks/plugins/file_picker/ios"
+  file_selector_ios:
+    :path: ".symlinks/plugins/file_selector_ios/ios"
   Flutter:
     :path: Flutter
   flutter_keychain:
@@ -137,23 +147,25 @@ SPEC CHECKSUMS:
   at_file_saver: c0e052c72d8c0296318bd70f2ae7f510887014ce
   at_onboarding_flutter: e8219b6d0bfb236d3837ec3528871aebdcc56e8d
   biometric_storage: 1400f1382af3a4cc2bf05340e13c3d8de873ceb9
+  device_info_plus: c6fb39579d0f423935b0c9ce7ee2f44b71b9fce6
   DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
-  file_picker: ce3938a0df3cc1ef404671531facef740d03f920
+  file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de
+  file_selector_ios: 8c25d700d625e1dcdd6599f2d927072f2254647b
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_keychain: 01aabf894ffe8b01adfda1d9df21c210c1b4b452
   MTBBarcodeScanner: f453b33c4b7dfe545d8c6484ed744d55671788cb
-  package_info_plus: fd030dabf36271f146f1f3beacd48f564b0f17f7
-  path_provider_foundation: eaf5b3e458fc0e5fbb9940fb09980e853fe058b8
-  permission_handler_apple: 44366e37eaf29454a1e7b1b7d736c2cceaeb17ce
+  package_info_plus: 115f4ad11e0698c8c1c5d8a689390df880f47e85
+  path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
+  permission_handler_apple: e76247795d700c14ea09e3a2d8855d41ee80a2e6
   qr_code_scanner: bb67d64904c3b9658ada8c402e8b4d406d5d796e
   SDWebImage: fd7e1a22f00303e058058278639bf6196ee431fe
-  share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
+  share_plus: c3fef564749587fc939ef86ffb283ceac0baf9f5
   shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
   SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
-  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
+  url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
   webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a
 
 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
 
-COCOAPODS: 1.11.3
+COCOAPODS: 1.12.1

packages/at_contacts_flutter/example/ios/Runner.xcodeproj/project.pbxproj

@@ -156,7 +156,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1430;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

packages/at_contacts_flutter/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1430"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

packages/at_contacts_flutter/example/pubspec.yaml

@@ -31,7 +31,7 @@ dependencies:
   at_backupkey_flutter: ^4.0.10
   at_contacts_flutter:
     path: ../
-  at_onboarding_flutter: ^6.1.3
+  at_onboarding_flutter: ^6.1.7
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.

packages/at_contacts_flutter/lib/services/contact_service.dart

@@ -571,7 +571,7 @@ class ContactService {
       key.sharedBy = atSign;
       key.metadata = metadata;
       // making isPublic true (as get method changes it to false)
-      key.metadata?.isBinary = true;
+      key.metadata.isBinary = true;
       key.key = contactFields[2];
       Uint8List? image;
 
@@ -609,7 +609,7 @@ class ContactService {
     key.sharedBy = atsign;
     key.metadata = metadata;
     // making isPublic true (as get method changes it to false)
-    key.metadata?.isBinary = true;
+    key.metadata.isBinary = true;
     key.key = "image.wavi";
 
     GetRequestOptions options = GetRequestOptions();
@@ -641,7 +641,7 @@ class ContactService {
     key.sharedBy = atsign;
     key.metadata = metadata;
     // making isPublic true (as get method changes it to false)
-    key.metadata?.isBinary = true;
+    key.metadata.isBinary = true;
     key.key = "image.wavi";
 
     var result = await atClientManager.atClient.getMeta(key);

packages/at_contacts_flutter/pubspec.yaml

@@ -12,11 +12,11 @@ environment:
   flutter: ">=1.20.0"
 
 dependencies:
-  at_client: ^3.0.64
+  at_client: ^3.0.72
   at_client_mobile: ^3.2.12
   at_common_flutter: ^2.0.12
-  at_commons: ^3.0.55
-  at_contact: ^3.0.7
+  at_commons: ^4.0.1
+  at_contact: ^3.0.8
   at_lookup: ^3.0.40
   at_utils: ^3.0.15
   flutter:

packages/at_contacts_group_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -10,6 +10,7 @@ import biometric_storage
 import device_info_plus
 import emoji_picker_flutter
 import file_selector_macos
+import flutter_image_compress_macos
 import package_info_plus
 import path_provider_foundation
 import share_plus
@@ -22,7 +23,8 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   EmojiPickerFlutterPlugin.register(with: registry.registrar(forPlugin: "EmojiPickerFlutterPlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
-  FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
+  FlutterImageCompressMacosPlugin.register(with: registry.registrar(forPlugin: "FlutterImageCompressMacosPlugin"))
+  FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))

packages/at_contacts_group_flutter/example/pubspec.yaml

@@ -39,13 +39,16 @@ dependencies:
     # The example app is bundled with the plugin so we use a path dependency on
     # the parent directory to use the current plugin's version.
     path: ../
-  at_onboarding_flutter: ^6.1.3
+  at_onboarding_flutter: ^6.1.7
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.6
   flutter:
     sdk: flutter
 
+dependency_overrides:
+  at_commons: ^4.0.1
+
 dev_dependencies:
   # The "flutter_lints" package below contains a set of recommended lints to
   # encourage good coding practices. The lint set provided by the package is

packages/at_contacts_group_flutter/pubspec.yaml

@@ -16,12 +16,12 @@ dependencies:
   at_client_mobile: ^3.2.12
   at_common_flutter: ^2.0.12
   at_commons: ^3.0.55
-  at_contact: ^3.0.7
-  at_contacts_flutter: ^4.0.11
+  at_contact: ^3.0.8
+  at_contacts_flutter: ^4.0.13
   at_utils: ^3.0.15
   collection: ^1.17.0
   emoji_picker_flutter: ^1.6.1
-  file_picker: ^5.5.0
+  file_picker: ^6.1.1
   file_selector: ^1.0.1
   file_selector_macos: ^0.9.3+2
   flutter:
@@ -34,6 +34,9 @@ dependencies:
   image_compression: ^1.0.4
   pedantic: ^1.11.1
 
+dependency_overrides:
+  at_commons: ^4.0.1
+
 dev_dependencies:
   flutter_lints: ^2.0.3
   flutter_test:

packages/at_events_flutter/example/macos/Flutter/GeneratedPluginRegistrant.swift

@@ -10,6 +10,7 @@ import biometric_storage
 import device_info_plus
 import emoji_picker_flutter
 import file_selector_macos
+import flutter_image_compress_macos
 import geolocator_apple
 import package_info_plus
 import path_provider_foundation
@@ -24,8 +25,9 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   EmojiPickerFlutterPlugin.register(with: registry.registrar(forPlugin: "EmojiPickerFlutterPlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
+  FlutterImageCompressMacosPlugin.register(with: registry.registrar(forPlugin: "FlutterImageCompressMacosPlugin"))
   GeolocatorPlugin.register(with: registry.registrar(forPlugin: "GeolocatorPlugin"))
-  FLTPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlusPlugin"))
+  FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))

packages/at_events_flutter/example/pubspec.yaml

@@ -35,14 +35,18 @@ dependencies:
     # The example app is bundled with the plugin so we use a path dependency on
     # the parent directory to use the current plugin's version.
     path: ../
-  at_onboarding_flutter: ^6.1.3
+  at_onboarding_flutter: ^6.1.7
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.6
   flutter:
     sdk: flutter
 
+dependency_overrides:
+  at_commons: ^4.0.1
+  file_picker: ^6.1.1
+
 dev_dependencies:
   # The "flutter_lints" package below contains a set of recommended lints to
   # encourage good coding practices. The lint set provided by the package is

packages/at_events_flutter/lib/services/contact_service.dart

@@ -82,7 +82,7 @@ Future<Map<String, dynamic>> getContactDetails(atSign) async {
     }
 
     // profile picture
-    key.metadata!.isBinary = true;
+    key.metadata.isBinary = true;
     key.key = contactFields[2];
     result = await EventKeyStreamService().atClientManager.atClient.get(key);
     var image = result.value;