🐛 Fix android building

android/app/build.gradle.kts

@@ -11,7 +11,7 @@ plugins {
 android {
     namespace = "dev.solsynth.solian"
     compileSdk = flutter.compileSdkVersion
-    ndkVersion = "27.0.12077973"
+    ndkVersion = "29.0.13113456"
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17

android/app/src/main/AndroidManifest.xml

@@ -34,19 +34,22 @@
                  while the Flutter UI initializes. After that, this theme continues
                  to determine the Window background behind the Flutter UI. -->
             <meta-data
-              android:name="io.flutter.embedding.android.NormalTheme"
-              android:resource="@style/NormalTheme"
-              />
+                android:name="io.flutter.embedding.android.NormalTheme"
+                android:resource="@style/NormalTheme"
+            />
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
         <provider
-            android:name="com.superlist.super_native_extensions.DataProvider"
-            android:authorities="dev.solsynth.solian.SuperClipboardDataProvider"
-            android:exported="true"
-            android:grantUriPermissions="true" >
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="dev.solsynth.solian.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths" />
         </provider>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->
@@ -61,8 +64,8 @@
          In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
     <queries>
         <intent>
-            <action android:name="android.intent.action.PROCESS_TEXT"/>
-            <data android:mimeType="text/plain"/>
+            <action android:name="android.intent.action.PROCESS_TEXT" />
+            <data android:mimeType="text/plain" />
         </intent>
     </queries>
-</manifest>
+</manifest>

android/app/src/main/kotlin/com/example/island/MainActivity.kt

@@ -1,5 +0,0 @@
-package dev.solsynth.solian
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity : FlutterActivity()

android/app/src/main/kotlin/com/example/solian/MainActivity.kt

@@ -0,0 +1,14 @@
+package dev.solsynth.solian
+
+import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.engine.FlutterEngine
+import io.flutter.plugins.sharedpreferences.LegacySharedPreferencesPlugin
+
+class MainActivity : FlutterActivity()
+{
+    override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
+        super.configureFlutterEngine(flutterEngine)
+        // https://github.com/flutter/flutter/issues/153075#issuecomment-2693189362
+        flutterEngine.plugins.add(LegacySharedPreferencesPlugin())
+    }
+}

android/app/src/main/res/xml/provider_paths.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path
+        name="external_files"
+        path="." />
+</paths>

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip

android/settings.gradle.kts

@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.7.0" apply false
+    id("com.android.application") version "8.10.1" apply false
     // START: FlutterFire Configuration
     id("com.google.gms.google-services") version("4.3.15") apply false
     // END: FlutterFire Configuration

assets/i18n/en-US.json

@@ -308,5 +308,7 @@
   "accountDataExportRequested": "Data export requested. You'll receive an email when it's ready.",
   "accountDeletionDescription": "Permanently delete your account and all your data",
   "accountSettingsHelp": "Account Settings Help",
-  "accountSettingsHelpContent": "This page allows you to manage your account security, privacy, and other settings. If you need assistance, please contact support."
+  "accountSettingsHelpContent": "This page allows you to manage your account security, privacy, and other settings. If you need assistance, please contact support.",
+  "unauthorized": "Unauthorized",
+  "unauthorizedHint": "You're not signed in or session expired, please sign in again."
 }

lib/screens/chat/room.dart

@@ -3,6 +3,7 @@ import 'dart:convert';
 import 'dart:io';
 import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
@@ -27,12 +28,12 @@ import 'package:island/widgets/chat/message_item.dart';
 import 'package:island/widgets/content/cloud_files.dart';
 import 'package:island/widgets/response.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
+import 'package:pasteboard/pasteboard.dart';
 import 'package:styled_widget/styled_widget.dart';
 import 'package:super_sliver_list/super_sliver_list.dart';
 import 'package:uuid/uuid.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:riverpod_annotation/riverpod_annotation.dart';
-import 'package:super_clipboard/super_clipboard.dart';
 import 'chat.dart';
 import 'package:island/widgets/chat/call_button.dart';
 
@@ -745,33 +746,16 @@ class _ChatInput extends ConsumerWidget {
   }
 
   Future<void> _handlePaste() async {
-    final clipboard = SystemClipboard.instance;
+    final clipboard = await Pasteboard.image;
     if (clipboard == null) return;
 
-    final reader = await clipboard.read();
-    if (reader.canProvide(Formats.png)) {
-      reader.getFile(Formats.png, (file) async {
-        final stream = file.getStream();
-        final bytes = await stream.toList();
-        final imageBytes = bytes.expand((e) => e).toList();
-
-        // Create a temporary file to store the image
-        final tempDir = Directory.systemTemp;
-        final tempFile = File(
-          '${tempDir.path}/pasted_image_${DateTime.now().millisecondsSinceEpoch}.png',
-        );
-        await tempFile.writeAsBytes(imageBytes);
-
-        // Add the file to attachments
-        onAttachmentsChanged([
-          ...attachments,
-          UniversalFile(
-            data: XFile(tempFile.path),
-            type: UniversalFileType.image,
-          ),
-        ]);
-      });
-    }
+    onAttachmentsChanged([
+      ...attachments,
+      UniversalFile(
+        data: XFile.fromData(clipboard, mimeType: "image/jpeg"),
+        type: UniversalFileType.image,
+      ),
+    ]);
   }
 
   @override

lib/screens/posts/compose.dart

@@ -23,8 +23,8 @@ import 'package:island/widgets/app_scaffold.dart';
 import 'package:island/widgets/content/cloud_files.dart';
 import 'package:island/widgets/post/publishers_modal.dart';
 import 'package:material_symbols_icons/symbols.dart';
+import 'package:pasteboard/pasteboard.dart';
 import 'package:styled_widget/styled_widget.dart';
-import 'package:super_clipboard/super_clipboard.dart';
 
 @RoutePage()
 class PostEditScreen extends HookConsumerWidget {
@@ -211,33 +211,16 @@ class PostComposeScreen extends HookConsumerWidget {
     }
 
     Future<void> _handlePaste() async {
-      final clipboard = SystemClipboard.instance;
+      final clipboard = await Pasteboard.image;
       if (clipboard == null) return;
 
-      final reader = await clipboard.read();
-      if (reader.canProvide(Formats.png)) {
-        reader.getFile(Formats.png, (file) async {
-          final stream = file.getStream();
-          final bytes = await stream.toList();
-          final imageBytes = bytes.expand((e) => e).toList();
-
-          // Create a temporary file to store the image
-          final tempDir = Directory.systemTemp;
-          final tempFile = File(
-            '${tempDir.path}/pasted_image_${DateTime.now().millisecondsSinceEpoch}.png',
-          );
-          await tempFile.writeAsBytes(imageBytes);
-
-          // Add the file to attachments
-          attachments.value = [
-            ...attachments.value,
-            UniversalFile(
-              data: XFile(tempFile.path),
-              type: UniversalFileType.image,
-            ),
-          ];
-        });
-      }
+      attachments.value = [
+        ...attachments.value,
+        UniversalFile(
+          data: XFile.fromData(clipboard, mimeType: "image/jpeg"),
+          type: UniversalFileType.image,
+        ),
+      ];
     }
 
     void _handleKeyPress(RawKeyEvent event) {

lib/widgets/response.dart

@@ -1,3 +1,4 @@
+import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:gap/gap.dart';
@@ -7,11 +8,8 @@ import 'package:styled_widget/styled_widget.dart';
 class ResponseErrorWidget extends StatelessWidget {
   final dynamic error;
   final VoidCallback onRetry;
-  const ResponseErrorWidget({
-    super.key,
-    required this.error,
-    required this.onRetry,
-  });
+
+  const ResponseErrorWidget({super.key, required this.error, required this.onRetry});
 
   @override
   Widget build(BuildContext context) {
@@ -20,14 +18,33 @@ class ResponseErrorWidget extends StatelessWidget {
       children: [
         const Icon(Symbols.error_outline, size: 48),
         const Gap(4),
-        ConstrainedBox(
-          constraints: const BoxConstraints(maxWidth: 320),
-          child: Text(
-            error.toString(),
-            textAlign: TextAlign.center,
-            style: const TextStyle(color: Color(0xFF757575)),
-          ),
-        ).center(),
+        if (error is DioException && error.response?.statusCode == 401)
+          ConstrainedBox(
+            constraints: const BoxConstraints(maxWidth: 320),
+            child: Column(
+              children: [
+                Text(
+                  'unauthorized'.tr(),
+                  textAlign: TextAlign.center,
+                  style: const TextStyle(color: Color(0xFF757575)),
+                ).bold(),
+                Text(
+                  'unauthorizedHint'.tr(),
+                  textAlign: TextAlign.center,
+                  style: const TextStyle(color: Color(0xFF757575)),
+                ),
+              ],
+            ),
+          ).center()
+        else
+          ConstrainedBox(
+            constraints: const BoxConstraints(maxWidth: 320),
+            child: Text(
+              error.toString(),
+              textAlign: TextAlign.center,
+              style: const TextStyle(color: Color(0xFF757575)),
+            ),
+          ).center(),
         const Gap(8),
         TextButton(onPressed: onRetry, child: const Text('retry').tr()),
       ],

linux/flutter/generated_plugin_registrant.cc

@@ -14,6 +14,7 @@
 #include <irondash_engine_context/irondash_engine_context_plugin.h>
 #include <media_kit_libs_linux/media_kit_libs_linux_plugin.h>
 #include <media_kit_video/media_kit_video_plugin.h>
+#include <pasteboard/pasteboard_plugin.h>
 #include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
 #include <super_native_extensions/super_native_extensions_plugin.h>
 #include <url_launcher_linux/url_launcher_plugin.h>
@@ -44,6 +45,9 @@ void fl_register_plugins(FlPluginRegistry* registry) {
   g_autoptr(FlPluginRegistrar) media_kit_video_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "MediaKitVideoPlugin");
   media_kit_video_plugin_register_with_registrar(media_kit_video_registrar);
+  g_autoptr(FlPluginRegistrar) pasteboard_registrar =
+      fl_plugin_registry_get_registrar_for_plugin(registry, "PasteboardPlugin");
+  pasteboard_plugin_register_with_registrar(pasteboard_registrar);
   g_autoptr(FlPluginRegistrar) sqlite3_flutter_libs_registrar =
       fl_plugin_registry_get_registrar_for_plugin(registry, "Sqlite3FlutterLibsPlugin");
   sqlite3_flutter_libs_plugin_register_with_registrar(sqlite3_flutter_libs_registrar);

linux/flutter/generated_plugins.cmake

@@ -11,6 +11,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
   irondash_engine_context
   media_kit_libs_linux
   media_kit_video
+  pasteboard
   sqlite3_flutter_libs
   super_native_extensions
   url_launcher_linux

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -21,6 +21,7 @@ import livekit_client
 import media_kit_libs_macos_video
 import media_kit_video
 import package_info_plus
+import pasteboard
 import path_provider_foundation
 import shared_preferences_foundation
 import sqflite_darwin
@@ -47,6 +48,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   MediaKitLibsMacosVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitLibsMacosVideoPlugin"))
   MediaKitVideoPlugin.register(with: registry.registrar(forPlugin: "MediaKitVideoPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
+  PasteboardPlugin.register(with: registry.registrar(forPlugin: "PasteboardPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin"))

pubspec.lock

@@ -77,10 +77,10 @@ packages:
     dependency: "direct main"
     description:
       name: auto_route
-      sha256: eae18fcd3e3762eb6074a3560c0f411d1e36bd9f8d3eed9c15ed1c577e8d1815
+      sha256: b8c036fa613a98a759cf0fdcba26e62f4985dcbff01a5e760ab411e8554bbaf0
       url: "https://pub.dev"
     source: hosted
-    version: "10.1.0"
+    version: "10.1.0+1"
   auto_route_generator:
     dependency: "direct dev"
     description:
@@ -205,10 +205,10 @@ packages:
     dependency: transitive
     description:
       name: built_value
-      sha256: ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4
+      sha256: "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27"
       url: "https://pub.dev"
     source: hosted
-    version: "8.9.5"
+    version: "8.10.1"
   cached_network_image:
     dependency: "direct main"
     description:
@@ -589,10 +589,10 @@ packages:
     dependency: transitive
     description:
       name: file_selector_macos
-      sha256: "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc"
+      sha256: "8c9250b2bd2d8d4268e39c82543bacbaca0fda7d29e0728c3c4bbb7c820fd711"
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.4+2"
+    version: "0.9.4+3"
   file_selector_platform_interface:
     dependency: transitive
     description:
@@ -1086,12 +1086,13 @@ packages:
     source: hosted
     version: "1.0.5"
   irondash_engine_context:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: irondash_engine_context
-      sha256: cd7b769db11a2b5243b037c8a9b1ecaef02e1ae27a2d909ffa78c1dad747bb10
-      url: "https://pub.dev"
-    source: hosted
+      path: "engine_context/dart"
+      ref: "refs/pull/66/head"
+      resolved-ref: e2551d9a3b0272a723b3627c5ef70e01a9e26961
+      url: "https://github.com/irondash/irondash.git"
+    source: git
     version: "0.5.4"
   irondash_message_channel:
     dependency: transitive
@@ -1373,6 +1374,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.2.0"
+  pasteboard:
+    dependency: "direct main"
+    description:
+      name: pasteboard
+      sha256: "9ff73ada33f79a59ff91f6c01881fd4ed0a0031cfc4ae2d86c0384471525fca1"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.4.0"
   path:
     dependency: "direct main"
     description:
@@ -1874,14 +1883,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.4.1"
-  super_clipboard:
-    dependency: "direct main"
-    description:
-      name: super_clipboard
-      sha256: "5203c881d24033c3e6154c2ae01afd94e7f0a3201280373f28e540f1defa3f40"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.9.0-dev.6"
   super_context_menu:
     dependency: "direct main"
     description:
@@ -1891,12 +1892,13 @@ packages:
     source: hosted
     version: "0.9.0-dev.6"
   super_native_extensions:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: super_native_extensions
-      sha256: "09ccc40c475e6f91770eaeb2553bf4803812d7beadc3759aa57d643370619c86"
-      url: "https://pub.dev"
-    source: hosted
+      path: super_native_extensions
+      ref: "refs/pull/525/head"
+      resolved-ref: d3020a8c5acd8555707b3b6477fd744d09f3e22f
+      url: "https://github.com/superlistapp/super_native_extensions.git"
+    source: git
     version: "0.9.0-dev.6"
   super_sliver_list:
     dependency: "direct main"

pubspec.yaml

@@ -100,9 +100,9 @@ dependencies:
   photo_view: ^0.15.0
   dismissible_page: ^1.0.2
   super_sliver_list: ^0.4.1
-  super_clipboard: ^0.9.0-dev.6
   flutter_webrtc: ^0.14.1
   livekit_client: ^2.4.7
+  pasteboard: ^0.4.0
 
 dev_dependencies:
   flutter_test:
@@ -130,6 +130,17 @@ dependency_overrides:
   analyzer_plugin: 0.12.0
   # https://github.com/dart-lang/sdk/issues/60784#issuecomment-2906872272
   custom_lint_visitor: 1.0.0+7.3.0
+  # https://github.com/superlistapp/super_native_extensions/issues/524#issuecomment-2918531753
+  super_native_extensions:
+    git:
+      url: https://github.com/superlistapp/super_native_extensions.git
+      ref: refs/pull/525/head
+      path: super_native_extensions
+  irondash_engine_context:
+    git:
+      url: https://github.com/irondash/irondash.git
+      ref: refs/pull/66/head
+      path: engine_context/dart
 
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec

windows/flutter/generated_plugin_registrant.cc

@@ -18,6 +18,7 @@
 #include <livekit_client/live_kit_plugin.h>
 #include <media_kit_libs_windows_video/media_kit_libs_windows_video_plugin_c_api.h>
 #include <media_kit_video/media_kit_video_plugin_c_api.h>
+#include <pasteboard/pasteboard_plugin.h>
 #include <sqlite3_flutter_libs/sqlite3_flutter_libs_plugin.h>
 #include <super_native_extensions/super_native_extensions_plugin_c_api.h>
 #include <url_launcher_windows/url_launcher_windows.h>
@@ -48,6 +49,8 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("MediaKitLibsWindowsVideoPluginCApi"));
   MediaKitVideoPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("MediaKitVideoPluginCApi"));
+  PasteboardPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("PasteboardPlugin"));
   Sqlite3FlutterLibsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("Sqlite3FlutterLibsPlugin"));
   SuperNativeExtensionsPluginCApiRegisterWithRegistrar(

windows/flutter/generated_plugins.cmake

@@ -15,6 +15,7 @@ list(APPEND FLUTTER_PLUGIN_LIST
   livekit_client
   media_kit_libs_windows_video
   media_kit_video
+  pasteboard
   sqlite3_flutter_libs
   super_native_extensions
   url_launcher_windows