Merge pull request #5550 from 21pages/ios_1.2.2

Ios 1.2.2 waitForImage and login menu

flutter/lib/mobile/pages/connection_page.dart

@@ -211,25 +211,6 @@ class WebMenu extends StatefulWidget {
 }
 
 class _WebMenuState extends State<WebMenu> {
-  String url = "";
-
-  @override
-  void initState() {
-    super.initState();
-    () async {
-      final urlRes = await bind.mainGetApiServer();
-      var update = false;
-      if (urlRes != url) {
-        url = urlRes;
-        update = true;
-      }
-
-      if (update) {
-        setState(() {});
-      }
-    }();
-  }
-
   @override
   Widget build(BuildContext context) {
     Provider.of<FfiModel>(context);
@@ -251,16 +232,14 @@ class _WebMenuState extends State<WebMenu> {
                   child: Text(translate('ID/Relay Server')),
                 )
               ] +
-              (url.contains('admin.rustdesk.com')
-                  ? <PopupMenuItem<String>>[]
-                  : [
-                      PopupMenuItem(
-                        value: "login",
-                        child: Text(gFFI.userModel.userName.value.isEmpty
-                            ? translate("Login")
-                            : '${translate("Logout")} (${gFFI.userModel.userName.value})'),
-                      )
-                    ]) +
+              [
+                PopupMenuItem(
+                  value: "login",
+                  child: Text(gFFI.userModel.userName.value.isEmpty
+                      ? translate("Login")
+                      : '${translate("Logout")} (${gFFI.userModel.userName.value})'),
+                )
+              ] +
               [
                 PopupMenuItem(
                   value: "about",

flutter/lib/models/model.dart

@@ -1623,6 +1623,12 @@ class FFI {
     elevationModel = ElevationModel(WeakReference(this));
   }
 
+  /// Mobile reuse FFI
+  void mobileReset() {
+    _waitForImageDialogShow.clear();
+    _waitForFirstImage.clear();
+  }
+
   /// Start with the given [id]. Only transfer file if [isFileTransfer], only port forward if [isPortForward].
   void start(String id,
       {bool isFileTransfer = false,
@@ -1633,6 +1639,7 @@ class FFI {
       bool? forceRelay}) {
     closed = false;
     auditNote = '';
+    if (isMobile) mobileReset();
     assert(!(isFileTransfer && isPortForward), 'more than one connect type');
     if (isFileTransfer) {
       connType = ConnType.fileTransfer;