fluffychat merge

.github/workflows/integrate.yaml

@@ -67,7 +67,7 @@ jobs:
   build_debug_linux:
     strategy:
       matrix:
-        arch: [ arm64 ] # Pangea Disabled x64
+        arch: [ x64, arm64 ]
     runs-on: ${{ matrix.arch == 'arm64' && 'ubuntu-24.04-arm' || 'ubuntu-latest'}}
     steps:
       - uses: actions/checkout@v5

lib/l10n/intl_nb.arb

@@ -2395,6 +2395,12 @@
     "type": "String",
     "placeholders": {}
   },
+  "noDatabaseEncryption": "Databasekryptering støttes ikke på denne plattformen",
+  "@noDatabaseEncryption": {},
+  "changeGeneralChatSettings": "Endre generelle chatinnstillinger",
+  "@changeGeneralChatSettings": {},
+  "changeTheChatPermissions": "Endre chattillatelsene",
+  "@changeTheChatPermissions": {},
   "alwaysUse24HourFormat": "falsk",
   "exportEmotePack": "Eksporter Emote-pakke som .zip",
   "commandHint_googly": "Send noen googly-øyne",
@@ -2593,10 +2599,7 @@
   "commandHint_ignore": "Ignorer den gitte matrix-ID-en",
   "commandHint_unignore": "Fjern ignorering av den gitte matrix-ID-en",
   "unreadChatsInApp": "{appname}: {unread} uleste chatter",
-  "noDatabaseEncryption": "Kryptering av database støttes ikke på denne plattformen",
   "knockRestricted": "Knock-begrenset",
-  "changeGeneralChatSettings": "Endre generelle chatinnstillinger",
-  "changeTheChatPermissions": "Endre chat-tillatelser",
   "changeTheVisibilityOfChatHistory": "Endre synligheten av chatthistorikken",
   "changeTheCanonicalRoomAlias": "Endre den viktigste offentlige chat-adressen",
   "sendRoomNotifications": "Send @rom varsler",
@@ -4781,22 +4784,10 @@
       }
     }
   },
-  "@noDatabaseEncryption": {
-    "type": "String",
-    "placeholders": {}
-  },
   "@knockRestricted": {
     "type": "String",
     "placeholders": {}
   },
-  "@changeGeneralChatSettings": {
-    "type": "String",
-    "placeholders": {}
-  },
-  "@changeTheChatPermissions": {
-    "type": "String",
-    "placeholders": {}
-  },
   "@changeTheVisibilityOfChatHistory": {
     "type": "String",
     "placeholders": {}

lib/utils/fluffy_share.dart

@@ -16,9 +16,11 @@ abstract class FluffyShare {
   }) async {
     if (PlatformInfos.isMobile && !copyOnly) {
       final box = context.findRenderObject() as RenderBox;
-      await Share.share(
-        text,
-        sharePositionOrigin: box.localToGlobal(Offset.zero) & box.size,
+      await SharePlus.instance.share(
+        ShareParams(
+          text: text,
+          sharePositionOrigin: box.localToGlobal(Offset.zero) & box.size,
+        ),
       );
       return;
     }

lib/utils/matrix_sdk_extensions/matrix_file_extension.dart

@@ -76,10 +76,12 @@ extension MatrixFileExtension on MatrixFile {
     // https://github.com/fluttercommunity/plus_plugins/tree/main/packages/share_plus/share_plus#ipad
     final box = context.findRenderObject() as RenderBox?;
 
-    await Share.shareXFiles(
-      [XFile.fromData(bytes, name: name, mimeType: mimeType)],
-      sharePositionOrigin:
-          box == null ? null : box.localToGlobal(Offset.zero) & box.size,
+    await SharePlus.instance.share(
+      ShareParams(
+        files: [XFile.fromData(bytes, name: name, mimeType: mimeType)],
+        sharePositionOrigin:
+            box == null ? null : box.localToGlobal(Offset.zero) & box.size,
+      ),
     );
     return;
   }

pubspec.lock

@@ -469,18 +469,18 @@ packages:
     dependency: "direct main"
     description:
       name: device_info_plus
-      sha256: a7fd703482b391a87d60b6061d04dfdeab07826b96f9abd8f5ed98068acc0074
+      sha256: "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a"
       url: "https://pub.dev"
     source: hosted
-    version: "10.1.2"
+    version: "11.5.0"
   device_info_plus_platform_interface:
     dependency: transitive
     description:
       name: device_info_plus_platform_interface
-      sha256: "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2"
+      sha256: e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.2"
+    version: "7.0.3"
   diacritic:
     dependency: "direct main"
     description:
@@ -580,10 +580,10 @@ packages:
     dependency: "direct main"
     description:
       name: file_picker
-      sha256: ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810
+      sha256: ef9908739bdd9c476353d6adff72e88fd00c625f5b959ae23f7567bd5137db0a
       url: "https://pub.dev"
     source: hosted
-    version: "8.3.7"
+    version: "10.2.0"
   file_selector:
     dependency: "direct main"
     description:
@@ -2195,18 +2195,18 @@ packages:
     dependency: "direct main"
     description:
       name: share_plus
-      sha256: fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da
+      sha256: b2961506569e28948d75ec346c28775bb111986bb69dc6a20754a457e3d97fa0
       url: "https://pub.dev"
     source: hosted
-    version: "10.1.4"
+    version: "11.0.0"
   share_plus_platform_interface:
     dependency: transitive
     description:
       name: share_plus_platform_interface
-      sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b
+      sha256: "1032d392bc5d2095a77447a805aa3f804d2ae6a4d5eef5e6ebb3bd94c1bc19ef"
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.2"
+    version: "6.0.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -2400,10 +2400,10 @@ packages:
     dependency: "direct main"
     description:
       name: sqlcipher_flutter_libs
-      sha256: "777c3469ada8fe6b808bd50f1c752cdd2ca1b1f3cf751d434502ead15334f3a5"
+      sha256: "550a0758aa4bba6eab75035102809506d76f2d71b9fb0c0f6e9cc414db0fe064"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.6"
+    version: "0.6.7"
   sqlite3:
     dependency: transitive
     description:
@@ -2861,21 +2861,21 @@ packages:
     source: hosted
     version: "1.2.2+hotfix.2"
   win32:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
       name: win32
-      sha256: "015002c060f1ae9f41a818f2d5640389cc05283e368be19dc8d77cecb43c40c9"
+      sha256: "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03"
       url: "https://pub.dev"
     source: hosted
-    version: "5.5.3"
+    version: "5.14.0"
   win32_registry:
     dependency: transitive
     description:
       name: win32_registry
-      sha256: "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852"
+      sha256: "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae"
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.5"
+    version: "2.1.0"
   window_to_front:
     dependency: transitive
     description:
@@ -2917,5 +2917,5 @@ packages:
     source: hosted
     version: "3.1.3"
 sdks:
-  dart: ">=3.8.0-0 <4.0.0"
+  dart: ">=3.8.0 <4.0.0"
   flutter: ">=3.29.0"

pubspec.yaml

@@ -27,12 +27,12 @@ dependencies:
   # desktop_drop: ^0.4.4
   # Pangea#
   desktop_notifications: ^0.6.3
-  device_info_plus: ^10.0.1
+  device_info_plus: ^11.5.0
   diacritic: ^0.1.6
   dynamic_color: ^1.7.0
   emoji_picker_flutter: ^4.3.0
   emojis: ^0.9.9
-  file_picker: ^8.1.2
+  file_picker: ^10.2.0
   file_selector: ^1.0.3
   flutter:
     sdk: flutter
@@ -87,11 +87,11 @@ dependencies:
   receive_sharing_intent: ^1.8.1
   record: ^6.0.0
   scroll_to_index: ^3.0.1
-  share_plus: ^10.0.2
+  share_plus: ^11.0.0
   shared_preferences: ^2.2.0 # Pinned because https://github.com/flutter/flutter/issues/118401
   slugify: ^2.0.0
   sqflite_common_ffi: ^2.3.6
-  sqlcipher_flutter_libs: ^0.6.1
+  sqlcipher_flutter_libs: ^0.6.7
   swipe_to_action: ^0.3.0
   tor_detector_web: ^1.1.0
   unifiedpush: ^5.0.1
@@ -201,5 +201,4 @@ dependency_overrides:
     git:
       url: https://github.com/ThexXTURBOXx/flutter_web_auth_2.git
       ref: 3.x-without-v1
-      path: flutter_web_auth_2
-  win32: 5.5.3
+      path: flutter_web_auth_2