From 572e5ceb7d67fa35eacf6ebe1d4d5c4b32bf01cc Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <>
Date: Mon, 1 Jul 2024 13:37:03 +1000
Subject: [PATCH] fix an issue where 100 bytes string won't pass the display
 name length test

---
 .../Home/GlobalSearch/GlobalSearchViewController.swift |  2 +-
 Session/Onboarding/DisplayNameScreen.swift             |  2 +-
 Session/Settings/SettingsViewModel.swift               |  2 +-
 SessionMessagingKit/Utilities/ProfileManager.swift     | 10 +++++++---
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Session/Home/GlobalSearch/GlobalSearchViewController.swift b/Session/Home/GlobalSearch/GlobalSearchViewController.swift
index ab681d332..c102046a5 100644
--- a/Session/Home/GlobalSearch/GlobalSearchViewController.swift
+++ b/Session/Home/GlobalSearch/GlobalSearchViewController.swift
@@ -42,7 +42,7 @@ class GlobalSearchViewController: BaseVC, LibSessionRespondingViewController, UI
     // MARK: - Variables
     
     private lazy var defaultSearchResults: SearchResultData = {
-        let nonalphabeticNameTitle: String = "#"
+        let nonalphabeticNameTitle: String = "#" // stringlint:disable
         let contacts: [SessionThreadViewModel] = Storage.shared.read { db -> [SessionThreadViewModel]? in
             try SessionThreadViewModel
                 .defaultContactsQuery(userPublicKey: getUserHexEncodedPublicKey(db))
diff --git a/Session/Onboarding/DisplayNameScreen.swift b/Session/Onboarding/DisplayNameScreen.swift
index 0f9de4c55..5d7acbdc0 100644
--- a/Session/Onboarding/DisplayNameScreen.swift
+++ b/Session/Onboarding/DisplayNameScreen.swift
@@ -105,7 +105,7 @@ struct DisplayNameScreen: View {
             error = "vc_display_name_display_name_missing_error".localized()
             return
         }
-        guard !ProfileManager.isToLong(profileName: displayName) else {
+        guard !ProfileManager.isTooLong(profileName: displayName) else {
             error = "vc_display_name_display_name_too_long_error".localized()
             return
         }
diff --git a/Session/Settings/SettingsViewModel.swift b/Session/Settings/SettingsViewModel.swift
index c130f070e..3eaeffb47 100644
--- a/Session/Settings/SettingsViewModel.swift
+++ b/Session/Settings/SettingsViewModel.swift
@@ -190,7 +190,7 @@ class SettingsViewModel: SessionTableViewModel, NavigationItemSource, Navigatabl
                                     )
                                     return
                                 }
-                                guard !ProfileManager.isToLong(profileName: updatedNickname) else {
+                                guard !ProfileManager.isTooLong(profileName: updatedNickname) else {
                                     self?.transitionToScreen(
                                         ConfirmationModal(
                                             info: ConfirmationModal.Info(
diff --git a/SessionMessagingKit/Utilities/ProfileManager.swift b/SessionMessagingKit/Utilities/ProfileManager.swift
index d0e624a9c..7d00f969c 100644
--- a/SessionMessagingKit/Utilities/ProfileManager.swift
+++ b/SessionMessagingKit/Utilities/ProfileManager.swift
@@ -28,11 +28,15 @@ public struct ProfileManager {
     
     // MARK: - Functions
     
-    public static func isToLong(profileName: String) -> Bool {
-        return (profileName.utf8CString.count > LibSession.libSessionMaxNameByteLength)
+    public static func isTooLong(profileName: String) -> Bool {
+        ///String.utf8CString will include the null terminator (Int8)0 as the end of string buffer.
+        ///When the string is exactly 100 bytes String.utf8CString.count will be 101.
+        ///However in LibSession, the Contact C API supports 101 characters in order to account for
+        ///the null terminator - char name[101]. So it is OK to use String.utf8.count
+        return (profileName.utf8.count > LibSession.libSessionMaxNameByteLength)
     }
     
-    public static func isToLong(profileUrl: String) -> Bool {
+    public static func isTooLong(profileUrl: String) -> Bool {
         return (profileUrl.utf8CString.count > LibSession.libSessionMaxProfileUrlByteLength)
     }