refactor set/getByName "peers" "option"

flutter/lib/mobile/pages/connection_page.dart

@@ -7,6 +7,8 @@ import 'package:url_launcher/url_launcher.dart';
 
 import '../../common.dart';
 import '../../models/model.dart';
+import '../../models/peer_model.dart';
+import '../../models/platform_model.dart';
 import 'home_page.dart';
 import 'remote_page.dart';
 import 'scan_page.dart';
@@ -41,6 +43,16 @@ class _ConnectionPageState extends State<ConnectionPage> {
   @override
   void initState() {
     super.initState();
+    if (_idController.text.isEmpty) {
+      () async {
+        final lastRemoteId = await bind.mainGetLastRemoteId();
+        if (lastRemoteId != _idController.text) {
+          setState(() {
+            _idController.text = lastRemoteId;
+          });
+        }
+      }();
+    }
     if (isAndroid) {
       Timer(Duration(seconds: 5), () {
         _updateUrl = gFFI.getByName('software_update_url');
@@ -52,7 +64,6 @@ class _ConnectionPageState extends State<ConnectionPage> {
   @override
   Widget build(BuildContext context) {
     Provider.of<FfiModel>(context);
-    if (_idController.text.isEmpty) _idController.text = gFFI.getId();
     return SingleChildScrollView(
       child: Column(
           mainAxisAlignment: MainAxisAlignment.start,
@@ -221,44 +232,52 @@ class _ConnectionPageState extends State<ConnectionPage> {
       final n = (windowWidth / (minWidth + 2 * space)).floor();
       width = windowWidth / n - 2 * space;
     }
-    final cards = <Widget>[];
-    var peers = gFFI.peers();
-    peers.forEach((p) {
-      cards.add(Container(
-          width: width,
-          child: Card(
-              child: GestureDetector(
-                  onTap: !isWebDesktop ? () => connect('${p.id}') : null,
-                  onDoubleTap: isWebDesktop ? () => connect('${p.id}') : null,
-                  onLongPressStart: (details) {
-                    final x = details.globalPosition.dx;
-                    final y = details.globalPosition.dy;
-                    _menuPos = RelativeRect.fromLTRB(x, y, x, y);
-                    showPeerMenu(context, p.id);
-                  },
-                  child: ListTile(
-                    contentPadding: const EdgeInsets.only(left: 12),
-                    subtitle: Text('${p.username}@${p.hostname}'),
-                    title: Text('${p.id}'),
-                    leading: Container(
-                        padding: const EdgeInsets.all(6),
-                        child: getPlatformImage('${p.platform}'),
-                        color: str2color('${p.id}${p.platform}', 0x7f)),
-                    trailing: InkWell(
-                        child: Padding(
-                            padding: const EdgeInsets.all(12),
-                            child: Icon(Icons.more_vert)),
-                        onTapDown: (e) {
-                          final x = e.globalPosition.dx;
-                          final y = e.globalPosition.dy;
-                          _menuPos = RelativeRect.fromLTRB(x, y, x, y);
-                        },
-                        onTap: () {
-                          showPeerMenu(context, p.id);
-                        }),
-                  )))));
-    });
-    return Wrap(children: cards, spacing: space, runSpacing: space);
+    return FutureBuilder<List<Peer>>(
+        future: gFFI.peers(),
+        builder: (context, snapshot) {
+          final cards = <Widget>[];
+          if (snapshot.hasData) {
+            final peers = snapshot.data!;
+            peers.forEach((p) {
+              cards.add(Container(
+                  width: width,
+                  child: Card(
+                      child: GestureDetector(
+                          onTap:
+                              !isWebDesktop ? () => connect('${p.id}') : null,
+                          onDoubleTap:
+                              isWebDesktop ? () => connect('${p.id}') : null,
+                          onLongPressStart: (details) {
+                            final x = details.globalPosition.dx;
+                            final y = details.globalPosition.dy;
+                            _menuPos = RelativeRect.fromLTRB(x, y, x, y);
+                            showPeerMenu(context, p.id);
+                          },
+                          child: ListTile(
+                            contentPadding: const EdgeInsets.only(left: 12),
+                            subtitle: Text('${p.username}@${p.hostname}'),
+                            title: Text('${p.id}'),
+                            leading: Container(
+                                padding: const EdgeInsets.all(6),
+                                child: getPlatformImage('${p.platform}'),
+                                color: str2color('${p.id}${p.platform}', 0x7f)),
+                            trailing: InkWell(
+                                child: Padding(
+                                    padding: const EdgeInsets.all(12),
+                                    child: Icon(Icons.more_vert)),
+                                onTapDown: (e) {
+                                  final x = e.globalPosition.dx;
+                                  final y = e.globalPosition.dy;
+                                  _menuPos = RelativeRect.fromLTRB(x, y, x, y);
+                                },
+                                onTap: () {
+                                  showPeerMenu(context, p.id);
+                                }),
+                          )))));
+            });
+          }
+          return Wrap(children: cards, spacing: space, runSpacing: space);
+        });
   }
 
   /// Show the peer menu and handle user's choice.

flutter/lib/mobile/pages/scan_page.dart

@@ -9,7 +9,7 @@ import 'package:qr_code_scanner/qr_code_scanner.dart';
 import 'package:zxing2/qrcode.dart';
 
 import '../../common.dart';
-import '../../models/model.dart';
+import '../../models/platform_model.dart';
 
 class ScanPage extends StatefulWidget {
   @override
@@ -153,54 +153,80 @@ class _ScanPageState extends State<ScanPage> {
 }
 
 void showServerSettingsWithValue(
-    String id, String relay, String key, String api) {
-  final formKey = GlobalKey<FormState>();
-  final id0 = gFFI.getByName('option', 'custom-rendezvous-server');
-  final relay0 = gFFI.getByName('option', 'relay-server');
-  final api0 = gFFI.getByName('option', 'api-server');
-  final key0 = gFFI.getByName('option', 'key');
+    String id, String relay, String key, String api) async {
+  Map<String, dynamic> oldOptions = jsonDecode(await bind.mainGetOptions());
+  String id0 = oldOptions['custom-rendezvous-server'] ?? "";
+  String relay0 = oldOptions['relay-server'] ?? "";
+  String api0 = oldOptions['api-server'] ?? "";
+  String key0 = oldOptions['key'] ?? "";
+  var isInProgress = false;
+  final idController = TextEditingController(text: id);
+  final relayController = TextEditingController(text: relay);
+  final apiController = TextEditingController(text: api);
+
+  String? idServerMsg;
+  String? relayServerMsg;
+  String? apiServerMsg;
+
   DialogManager.show((setState, close) {
+    Future<bool> validate() async {
+      if (idController.text != id) {
+        final res = await validateAsync(idController.text);
+        setState(() => idServerMsg = res);
+        if (idServerMsg != null) return false;
+        id = idController.text;
+      }
+      if (relayController.text != relay) {
+        relayServerMsg = await validateAsync(relayController.text);
+        if (relayServerMsg != null) return false;
+        relay = relayController.text;
+      }
+      if (apiController.text != relay) {
+        apiServerMsg = await validateAsync(apiController.text);
+        if (apiServerMsg != null) return false;
+        api = apiController.text;
+      }
+      return true;
+    }
+
     return CustomAlertDialog(
       title: Text(translate('ID/Relay Server')),
       content: Form(
-          key: formKey,
           child: Column(
               mainAxisSize: MainAxisSize.min,
               children: <Widget>[
                     TextFormField(
-                      initialValue: id,
+                      controller: idController,
                       decoration: InputDecoration(
-                        labelText: translate('ID Server'),
-                      ),
-                      validator: validate,
-                      onSaved: (String? value) {
-                        if (value != null) id = value.trim();
-                      },
+                          labelText: translate('ID Server'),
+                          errorText: idServerMsg),
                     )
                   ] +
                   (isAndroid
                       ? [
                           TextFormField(
-                            initialValue: relay,
+                            controller: relayController,
                             decoration: InputDecoration(
-                              labelText: translate('Relay Server'),
-                            ),
-                            validator: validate,
-                            onSaved: (String? value) {
-                              if (value != null) relay = value.trim();
-                            },
+                                labelText: translate('Relay Server'),
+                                errorText: relayServerMsg),
                           )
                         ]
                       : []) +
                   [
                     TextFormField(
-                      initialValue: api,
+                      controller: apiController,
                       decoration: InputDecoration(
                         labelText: translate('API Server'),
                       ),
-                      validator: validate,
-                      onSaved: (String? value) {
-                        if (value != null) api = value.trim();
+                      autovalidateMode: AutovalidateMode.onUserInteraction,
+                      validator: (v) {
+                        if (v != null && v.length > 0) {
+                          if (!(v.startsWith('http://') ||
+                              v.startsWith("https://"))) {
+                            return translate("invalid_http");
+                          }
+                        }
+                        return apiServerMsg;
                       },
                     ),
                     TextFormField(
@@ -208,11 +234,13 @@ void showServerSettingsWithValue(
                       decoration: InputDecoration(
                         labelText: 'Key',
                       ),
-                      validator: null,
-                      onSaved: (String? value) {
+                      onChanged: (String? value) {
                         if (value != null) key = value.trim();
                       },
                     ),
+                    Offstage(
+                        offstage: !isInProgress,
+                        child: LinearProgressIndicator())
                   ])),
       actions: [
         TextButton(
@@ -224,24 +252,28 @@ void showServerSettingsWithValue(
         ),
         TextButton(
           style: flatButtonStyle,
-          onPressed: () {
-            if (formKey.currentState != null &&
-                formKey.currentState!.validate()) {
-              formKey.currentState!.save();
-              if (id != id0)
-                gFFI.setByName('option',
-                    '{"name": "custom-rendezvous-server", "value": "$id"}');
+          onPressed: () async {
+            setState(() {
+              idServerMsg = null;
+              relayServerMsg = null;
+              apiServerMsg = null;
+              isInProgress = true;
+            });
+            if (await validate()) {
+              if (id != id0) {
+                bind.mainSetOption(key: "custom-rendezvous-server", value: id);
+              }
               if (relay != relay0)
-                gFFI.setByName(
-                    'option', '{"name": "relay-server", "value": "$relay"}');
-              if (key != key0)
-                gFFI.setByName('option', '{"name": "key", "value": "$key"}');
+                bind.mainSetOption(key: "relay-server", value: relay);
+              if (key != key0) bind.mainSetOption(key: "key", value: key);
               if (api != api0)
-                gFFI.setByName(
-                    'option', '{"name": "api-server", "value": "$api"}');
+                bind.mainSetOption(key: "api-server", value: api);
               gFFI.ffiModel.updateUser();
               close();
             }
+            setState(() {
+              isInProgress = false;
+            });
           },
           child: Text(translate('OK')),
         ),
@@ -250,11 +282,11 @@ void showServerSettingsWithValue(
   });
 }
 
-String? validate(value) {
+Future<String?> validateAsync(String value) async {
   value = value.trim();
   if (value.isEmpty) {
     return null;
   }
-  final res = gFFI.getByName('test_if_valid_server', value);
+  final res = await bind.mainTestIfValidServer(server: value);
   return res.isEmpty ? null : res;
 }

flutter/lib/mobile/pages/settings_page.dart

@@ -185,11 +185,12 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
   }
 }
 
-void showServerSettings() {
-  final id = gFFI.getByName('option', 'custom-rendezvous-server');
-  final relay = gFFI.getByName('option', 'relay-server');
-  final api = gFFI.getByName('option', 'api-server');
-  final key = gFFI.getByName('option', 'key');
+void showServerSettings() async {
+  Map<String, dynamic> options = jsonDecode(await bind.mainGetOptions());
+  String id = options['custom-rendezvous-server'] ?? "";
+  String relay = options['relay-server'] ?? "";
+  String api = options['api-server'] ?? "";
+  String key = options['key'] ?? "";
   showServerSettingsWithValue(id, relay, key, api);
 }