- UI display: display_name first (#14358)

* - UI display: display_name first - Fallback: name - Technical identity: still name ### What changed - Added account display helpers and display_name state in user model: - flutter/lib/models/user_model.dart:16 - Account/logout label now uses display_name (@name) when both exist: - flutter/lib/mobile/pages/settings_page.dart:689 - flutter/lib/desktop/pages/desktop_setting_page.dart:2016 - flutter/lib/desktop/pages/desktop_setting_page.dart:2135 - Desktop Account info now shows both when applicable: - Display Name: ... - Username: ... - flutter/lib/desktop/pages/desktop_setting_page.dart:2039 - Previously done group-list behavior remains: - group user list displays display_name with name fallback - flutter/lib/common/widgets/my_group.dart:187 - Persistence path for display_name remains enabled (including group cache/submodule field): - libs/hbb_common/src/config.rs:2347 - src/client.rs:2630 - LoginRequest.my_name now resolves as: 1. OPTION_DISPLAY_NAME (manual override) 2. user_info.display_name 3. user_info.name 4. OS username fallback * 1. GUID key (...Uninstall\{GUID}) is MSI-native metadata generated by Windows Installer. 2. Non-GUID key (...Uninstall\RustDesk) is explicitly written by RustDesk’s MSI compatibility component in res/msi/Package/Components/Regs.wxs:44, populated by preprocess.py --arp from .github/workflows/ flutter-build.yml:262. So they were not using the same EstimatedSize logic: - MSI GUID key: MSI-calculated size (KB). - RustDesk key: custom script value from res/msi/preprocess.py:339 (previously bytes, now fixed to KB). That mismatch is exactly why you saw different sizes. * improve display name handling - Append (@username) when multiple users share the same display name - Trim whitespace from display_name before comparison and display - Add missing translate() for Logout button on desktop Signed-off-by: 21pages <sunboeasy@gmail.com> * group peer filter match both user's display name and user's name Signed-off-by: 21pages <sunboeasy@gmail.com> * case-insensitive search in group peer filter Signed-off-by: 21pages <sunboeasy@gmail.com> --------- Signed-off-by: 21pages <sunboeasy@gmail.com> Co-authored-by: 21pages <sunboeasy@gmail.com>
2026-03-07 20:30:08 +03:00 · 2026-02-22 14:59:25 +08:00
parent 4d2d2118a2
commit 6c3515588f
58 changed files with 153 additions and 26 deletions
--- a/flutter/lib/common/hbbs/hbbs.dart
+++ b/flutter/lib/common/hbbs/hbbs.dart
@@ -25,6 +25,7 @@ enum UserStatus { kDisabled, kNormal, kUnverified }
 // Is all the fields of the user needed?
 class UserPayload {
  String name = '';
+  String displayName = '';
  String email = '';
  String note = '';
  String? verifier;
@@ -33,6 +34,7 @@ class UserPayload {

  UserPayload.fromJson(Map<String, dynamic> json)
      : name = json['name'] ?? '',
+        displayName = json['display_name'] ?? '',
        email = json['email'] ?? '',
        note = json['note'] ?? '',
        verifier = json['verifier'],
@@ -46,6 +48,7 @@ class UserPayload {
  Map<String, dynamic> toJson() {
    final Map<String, dynamic> map = {
      'name': name,
+      'display_name': displayName,
      'status': status == UserStatus.kDisabled
          ? 0
          : status == UserStatus.kUnverified
@@ -58,9 +61,14 @@ class UserPayload {
  Map<String, dynamic> toGroupCacheJson() {
    final Map<String, dynamic> map = {
      'name': name,
+      'display_name': displayName,
    };
    return map;
  }
+
+  String get displayNameOrName {
+    return displayName.trim().isEmpty ? name : displayName;
+  }
 }

 class PeerPayload {
--- a/flutter/lib/common/widgets/my_group.dart
+++ b/flutter/lib/common/widgets/my_group.dart
@@ -158,12 +158,18 @@ class _MyGroupState extends State<MyGroup> {
    return Obx(() {
      final userItems = gFFI.groupModel.users.where((p0) {
        if (searchAccessibleItemNameText.isNotEmpty) {
-          return p0.name
-              .toLowerCase()
-              .contains(searchAccessibleItemNameText.value.toLowerCase());
+          final search = searchAccessibleItemNameText.value.toLowerCase();
+          return p0.name.toLowerCase().contains(search) ||
+              p0.displayNameOrName.toLowerCase().contains(search);
        }
        return true;
      }).toList();
+      // Count occurrences of each displayNameOrName to detect duplicates
+      final displayNameCount = <String, int>{};
+      for (final u in userItems) {
+        final dn = u.displayNameOrName;
+        displayNameCount[dn] = (displayNameCount[dn] ?? 0) + 1;
+      }
      final deviceGroupItems = gFFI.groupModel.deviceGroups.where((p0) {
        if (searchAccessibleItemNameText.isNotEmpty) {
          return p0.name
@@ -177,7 +183,8 @@ class _MyGroupState extends State<MyGroup> {
          itemCount: deviceGroupItems.length + userItems.length,
          itemBuilder: (context, index) => index < deviceGroupItems.length
              ? _buildDeviceGroupItem(deviceGroupItems[index])
-              : _buildUserItem(userItems[index - deviceGroupItems.length]));
+              : _buildUserItem(userItems[index - deviceGroupItems.length],
+                  displayNameCount));
      var maxHeight = max(MediaQuery.of(context).size.height / 6, 100.0);
      return Obx(() => stateGlobal.isPortrait.isFalse
          ? listView(false)
@@ -185,8 +192,14 @@ class _MyGroupState extends State<MyGroup> {
    });
  }

-  Widget _buildUserItem(UserPayload user) {
+  Widget _buildUserItem(UserPayload user, Map<String, int> displayNameCount) {
    final username = user.name;
+    final dn = user.displayNameOrName;
+    final isDuplicate = (displayNameCount[dn] ?? 0) > 1;
+    final displayName =
+        isDuplicate && user.displayName.trim().isNotEmpty
+            ? '${user.displayName} (@$username)'
+            : dn;
    return InkWell(onTap: () {
      isSelectedDeviceGroup.value = false;
      if (selectedAccessibleItemName.value != username) {
@@ -222,14 +235,14 @@ class _MyGroupState extends State<MyGroup> {
                    alignment: Alignment.center,
                    child: Center(
                      child: Text(
-                        username.characters.first.toUpperCase(),
+                        displayName.characters.first.toUpperCase(),
                        style: TextStyle(color: Colors.white),
                        textAlign: TextAlign.center,
                      ),
                    ),
                  ),
                ).marginOnly(right: 4),
-                if (isMe) Flexible(child: Text(username)),
+                if (isMe) Flexible(child: Text(displayName)),
                if (isMe)
                  Flexible(
                    child: Container(
@@ -246,7 +259,7 @@ class _MyGroupState extends State<MyGroup> {
                      ),
                    ),
                  ),
-                if (!isMe) Expanded(child: Text(username)),
+                if (!isMe) Expanded(child: Text(displayName)),
              ],
            ).paddingSymmetric(vertical: 4),
          ),
--- a/flutter/lib/common/widgets/peers_view.dart
+++ b/flutter/lib/common/widgets/peers_view.dart
@@ -570,11 +570,14 @@ class MyGroupPeerView extends BasePeersView {
  static bool filter(Peer peer) {
    final model = gFFI.groupModel;
    if (model.searchAccessibleItemNameText.isNotEmpty) {
-      final text = model.searchAccessibleItemNameText.value;
-      final searchPeersOfUser = peer.loginName.contains(text) &&
-          model.users.any((user) => user.name == peer.loginName);
-      final searchPeersOfDeviceGroup = peer.device_group_name.contains(text) &&
-          model.deviceGroups.any((g) => g.name == peer.device_group_name);
+      final text = model.searchAccessibleItemNameText.value.toLowerCase();
+      final searchPeersOfUser = model.users.any((user) =>
+          user.name == peer.loginName &&
+          (user.name.toLowerCase().contains(text) ||
+              user.displayNameOrName.toLowerCase().contains(text)));
+      final searchPeersOfDeviceGroup =
+          peer.device_group_name.toLowerCase().contains(text) &&
+              model.deviceGroups.any((g) => g.name == peer.device_group_name);
      if (!searchPeersOfUser && !searchPeersOfDeviceGroup) {
        return false;
      }
--- a/flutter/lib/desktop/pages/desktop_setting_page.dart
+++ b/flutter/lib/desktop/pages/desktop_setting_page.dart
@@ -2016,7 +2016,9 @@ class _AccountState extends State<_Account> {

  Widget accountAction() {
    return Obx(() => _Button(
-        gFFI.userModel.userName.value.isEmpty ? 'Login' : 'Logout',
+        gFFI.userModel.userName.value.isEmpty
+            ? 'Login'
+            : '${translate('Logout')} (${gFFI.userModel.accountLabelWithHandle})',
        () => {
              gFFI.userModel.userName.value.isEmpty
                  ? loginDialog()
@@ -2037,6 +2039,10 @@ class _AccountState extends State<_Account> {
          offstage: gFFI.userModel.userName.value.isEmpty,
          child: Column(
            children: [
+              if (gFFI.userModel.displayName.value.trim().isNotEmpty &&
+                  gFFI.userModel.displayName.value.trim() !=
+                      gFFI.userModel.userName.value.trim())
+                text('Display Name', gFFI.userModel.displayName.value.trim()),
              text('Username', gFFI.userModel.userName.value),
              // text('Group', gFFI.groupModel.groupName.value),
            ],
@@ -2130,7 +2136,9 @@ class _PluginState extends State<_Plugin> {

  Widget accountAction() {
    return Obx(() => _Button(
-        gFFI.userModel.userName.value.isEmpty ? 'Login' : 'Logout',
+        gFFI.userModel.userName.value.isEmpty
+            ? 'Login'
+            : '${translate('Logout')} (${gFFI.userModel.accountLabelWithHandle})',
        () => {
              gFFI.userModel.userName.value.isEmpty
                  ? loginDialog()
--- a/flutter/lib/mobile/pages/settings_page.dart
+++ b/flutter/lib/mobile/pages/settings_page.dart
@@ -688,7 +688,7 @@ class _SettingsState extends State<SettingsPage> with WidgetsBindingObserver {
              SettingsTile(
                title: Obx(() => Text(gFFI.userModel.userName.value.isEmpty
                    ? translate('Login')
-                    : '${translate('Logout')} (${gFFI.userModel.userName.value})')),
+                    : '${translate('Logout')} (${gFFI.userModel.accountLabelWithHandle})')),
                leading: Icon(Icons.person),
                onPressed: (context) {
                  if (gFFI.userModel.userName.value.isEmpty) {
--- a/flutter/lib/models/user_model.dart
+++ b/flutter/lib/models/user_model.dart
@@ -16,9 +16,23 @@ bool refreshingUser = false;

 class UserModel {
  final RxString userName = ''.obs;
+  final RxString displayName = ''.obs;
  final RxBool isAdmin = false.obs;
  final RxString networkError = ''.obs;
  bool get isLogin => userName.isNotEmpty;
+  String get displayNameOrUserName =>
+      displayName.value.trim().isEmpty ? userName.value : displayName.value;
+  String get accountLabelWithHandle {
+    final username = userName.value.trim();
+    if (username.isEmpty) {
+      return '';
+    }
+    final preferred = displayName.value.trim();
+    if (preferred.isEmpty || preferred == username) {
+      return username;
+    }
+    return '$preferred (@$username)';
+  }
  WeakReference<FFI> parent;

  UserModel(this.parent) {
@@ -98,7 +112,8 @@ class UserModel {
  _updateLocalUserInfo() {
    final userInfo = getLocalUserInfo();
    if (userInfo != null) {
-      userName.value = userInfo['name'];
+      userName.value = (userInfo['name'] ?? '').toString();
+      displayName.value = (userInfo['display_name'] ?? '').toString();
    }
  }

@@ -110,10 +125,12 @@ class UserModel {
      await gFFI.groupModel.reset();
    }
    userName.value = '';
+    displayName.value = '';
  }

  _parseAndUpdateUser(UserPayload user) {
    userName.value = user.name;
+    displayName.value = user.displayName;
    isAdmin.value = user.isAdmin;
    bind.mainSetLocalOption(key: 'user_info', value: jsonEncode(user));
    if (isWeb) {