diff --git a/lib/view/page/server/edit.dart b/lib/view/page/server/edit.dart
index c5360c54..a0cbb336 100644
--- a/lib/view/page/server/edit.dart
+++ b/lib/view/page/server/edit.dart
@@ -682,11 +682,11 @@ class _ServerEditPageState extends State<ServerEditPage> with AfterLayoutMixin {
       text: libL10n.import,
       icon: const Icon(Icons.qr_code, color: Colors.grey),
       onTap: () async {
-        final codes = await BarcodeScannerPage.route.go(
+        final ret = await BarcodeScannerPage.route.go(
           context,
           args: const BarcodeScannerPageArgs(),
         );
-        final code = codes?.firstOrNull?.rawValue;
+        final code = ret?.text;
         if (code == null) return;
         try {
           final spi = Spi.fromJson(json.decode(code));
diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift
index a74ca10c..7a6a1957 100644
--- a/macos/Flutter/GeneratedPluginRegistrant.swift
+++ b/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -8,7 +8,6 @@ import Foundation
 import dynamic_color
 import icloud_storage
 import local_auth_darwin
-import mobile_scanner
 import package_info_plus
 import path_provider_foundation
 import screen_retriever
@@ -22,7 +21,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
   IcloudStoragePlugin.register(with: registry.registrar(forPlugin: "IcloudStoragePlugin"))
   FLALocalAuthPlugin.register(with: registry.registrar(forPlugin: "FLALocalAuthPlugin"))
-  MobileScannerPlugin.register(with: registry.registrar(forPlugin: "MobileScannerPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   ScreenRetrieverPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverPlugin"))
diff --git a/pubspec.lock b/pubspec.lock
index 6a2a478a..3461df57 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -134,6 +134,46 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "8.9.2"
+  camera:
+    dependency: transitive
+    description:
+      name: camera
+      sha256: "26ff41045772153f222ffffecba711a206f670f5834d40ebf5eed3811692f167"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.11.0+2"
+  camera_android_camerax:
+    dependency: transitive
+    description:
+      name: camera_android_camerax
+      sha256: "7cd93578ad201dcc6bb5810451fb00d76a86bab9b68dceb68b8cbd7038ac5846"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.8+3"
+  camera_avfoundation:
+    dependency: transitive
+    description:
+      name: camera_avfoundation
+      sha256: "7c28969a975a7eb2349bc2cb2dfe3ad218a33dba9968ecfb181ce08c87486655"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.17+3"
+  camera_platform_interface:
+    dependency: transitive
+    description:
+      name: camera_platform_interface
+      sha256: b3ede1f171532e0d83111fe0980b46d17f1aa9788a07a2fbed07366bbdbb9061
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.8.0"
+  camera_web:
+    dependency: transitive
+    description:
+      name: camera_web
+      sha256: "595f28c89d1fb62d77c73c633193755b781c6d2e0ebcd8dc25b763b514e6ba8f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.3.5"
   characters:
     dependency: transitive
     description:
@@ -142,6 +182,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.0"
+  charset:
+    dependency: transitive
+    description:
+      name: charset
+      sha256: "27802032a581e01ac565904ece8c8962564b1070690794f0072f6865958ce8b9"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.0.1"
   checked_yaml:
     dependency: transitive
     description:
@@ -390,8 +438,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "v1.0.142"
-      resolved-ref: "0860beabd5096dd5f783d8c60b860c81895477dd"
+      ref: "v1.0.143"
+      resolved-ref: "241ab972985a97abcba032cba96229bdff61a759"
       url: "https://github.com/lppcg/fl_lib"
     source: git
     version: "0.0.1"
@@ -823,14 +871,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.0.5"
-  mobile_scanner:
-    dependency: transitive
-    description:
-      name: mobile_scanner
-      sha256: b8c0e9afcfd52534f85ec666f3d52156f560b5e6c25b1e3d4fe2087763607926
-      url: "https://pub.dev"
-    source: hosted
-    version: "5.1.1"
   nested:
     dependency: transitive
     description:
@@ -968,6 +1008,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.8"
+  pocketbase:
+    dependency: transitive
+    description:
+      name: pocketbase
+      sha256: "1d2958a3a7cb1e0050f425f179bd6557441fafcf740a79d5b8b80d6954149790"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.18.1"
   pointycastle:
     dependency: transitive
     description:
@@ -1024,6 +1072,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.2"
+  qr_code_dart_scan:
+    dependency: transitive
+    description:
+      name: qr_code_dart_scan
+      sha256: "7a6d4a17a8b68bea78b96ed2dab00a0619600517bcd6ea9195e40b0aebcab556"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.9.0"
   quiver:
     dependency: transitive
     description:
@@ -1536,6 +1592,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.0.6"
+  zxing_lib:
+    dependency: transitive
+    description:
+      name: zxing_lib
+      sha256: "870a63610be3f20009ca9201f7ba2d53d7eaefa675c154b3e8c1f6fc55984d04"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.2"
 sdks:
-  dart: ">=3.5.0-259.0.dev <4.0.0"
-  flutter: ">=3.22.0"
+  dart: ">=3.5.0 <4.0.0"
+  flutter: ">=3.24.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 5221c146..c55c95bf 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -60,7 +60,7 @@ dependencies:
   fl_lib:
     git:
       url: https://github.com/lppcg/fl_lib
-      ref: v1.0.142
+      ref: v1.0.143
 
 dependency_overrides:
   # dartssh2: