Merge branch 'rustdesk:master' into master

zhangbo8418 · Apr 2, 2024 · fbc8ddf · fbc8ddf
2 parents 44a62bb + 41d99d5
commit fbc8ddf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/flutter/lib/common/widgets/peer_card.dart b/flutter/lib/common/widgets/peer_card.dart
@@ -750,8 +750,10 @@ abstract class BasePeerCard extends StatelessWidget {
         if (succ) {
           showToast(translate('Successful'));
         } else {
-          BotToast.showText(
-              contentColor: Colors.red, text: translate("Failed"));
+          if (tab.index == PeerTabIndex.ab.index) {
+            BotToast.showText(
+                contentColor: Colors.red, text: translate("Failed"));
+          }
         }
       },
       padding: menuPadding,

diff --git a/flutter/lib/models/ab_model.dart b/flutter/lib/models/ab_model.dart
@@ -1490,7 +1490,7 @@ class Ab extends BaseAb {
   @override
   Future<bool> changePersonalHashPassword(String id, String hash) async {
     if (!personal) return false;
-    if (!peers.any((e) => e.id == id)) return false;
+    if (!peers.any((e) => e.id == id)) return true;
     return await _setPassword({"id": id, "hash": hash});
   }