Add renaming the current device in Active Sessions (#157)

Author: zweeltow

Telegram-Mac/app/AppDelegate.swift

@@ -829,12 +829,32 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
                 useBetaFeatures = false
                 #endif
 
-                let networkArguments = NetworkInitializationArguments(apiId: ApiEnvironment.apiId, apiHash: ApiEnvironment.apiHash, languagesCategory: ApiEnvironment.language, appVersion: ApiEnvironment.version, voipMaxLayer: OngoingCallContext.maxLayer, voipVersions: voipVersions, appData: appData, externalRequestVerificationStream: .single([:]), externalRecaptchaRequestVerification: { _, _ in return .complete() }, autolockDeadine: .single(nil), encryptionProvider: OpenSSLEncryptionProvider(), deviceModelName: deviceModelPretty(), useBetaFeatures: useBetaFeatures, isICloudEnabled: false, networkEngineFactory: RustNetworkEngineFactory())
+                let systemDeviceModel = deviceModelPretty()
+                ApiEnvironment.systemDeviceModel = systemDeviceModel
+                let networkArguments = NetworkInitializationArguments(apiId: ApiEnvironment.apiId, apiHash: ApiEnvironment.apiHash, languagesCategory: ApiEnvironment.language, appVersion: ApiEnvironment.version, voipMaxLayer: OngoingCallContext.maxLayer, voipVersions: voipVersions, appData: appData, externalRequestVerificationStream: .single([:]), externalRecaptchaRequestVerification: { _, _ in return .complete() }, autolockDeadine: .single(nil), encryptionProvider: OpenSSLEncryptionProvider(), deviceModelName: ApiEnvironment.customDeviceModel ?? systemDeviceModel, useBetaFeatures: useBetaFeatures, isICloudEnabled: false, networkEngineFactory: RustNetworkEngineFactory())
 
                 let sharedContext = SharedAccountContext(accountManager: accountManager, networkArguments: networkArguments, rootPath: rootPath, encryptionParameters: encryptionParameters, appEncryption: appEncryption, displayUpgradeProgress: displayUpgrade)
 
                 self.hangKeybind(sharedContext)
 
+                let deviceModel: Signal<String, NoError> = Signal { subscriber in
+                    subscriber.putNext(ApiEnvironment.customDeviceModel ?? systemDeviceModel)
+                    let observer = NotificationCenter.default.addObserver(forName: ApiEnvironment.deviceModelDidChange, object: nil, queue: nil, using: { _ in
+                        subscriber.putNext(ApiEnvironment.customDeviceModel ?? systemDeviceModel)
+                    })
+                    return ActionDisposable {
+                        NotificationCenter.default.removeObserver(observer)
+                    }
+                }
+                _ = combineLatest(sharedContext.activeAccounts, deviceModel).start(next: { accounts, deviceModel in
+                    for (_, account, _) in accounts.accounts {
+                        updateDeviceModel(account.network, deviceModel)
+                    }
+                    if let auth = accounts.currentAuth {
+                        updateDeviceModel(auth.network, deviceModel)
+                    }
+                })
+                
 
 
 
@@ -1794,3 +1814,18 @@ class AppDelegate: NSResponder, NSApplicationDelegate, NSUserNotificationCenterD
         self.authContextValue?.applyExternalLoginCode(code)
     }
 }
+
+private func updateDeviceModel(_ network: Network, _ deviceModel: String) {
+    guard class_getInstanceVariable(MTApiEnvironment.self, "_deviceModelName") != nil else {
+        return
+    }
+    network.context.updateApiEnvironment { current in
+        guard let current = current, current.deviceModel != deviceModel else {
+            return nil
+        }
+        let copy = current.withUpdatedLangPackCode(current.langPackCode)
+        copy.setValue(deviceModel, forKey: "deviceModelName")
+        let updated = copy.withUpdatedLangPackCode(copy.langPackCode)
+        return updated.deviceModel == deviceModel ? updated : nil
+    }
+}

TelegramShare/ShareViewController.swift

@@ -120,7 +120,7 @@ class ShareViewController: NSViewController {
         useBetaFeatures = false
         #endif
 
-        let networkArguments = NetworkInitializationArguments(apiId: ApiEnvironment.apiId, apiHash: ApiEnvironment.apiHash, languagesCategory: ApiEnvironment.language, appVersion: ApiEnvironment.version, voipMaxLayer: 90, voipVersions: [], appData: appData, externalRequestVerificationStream: .single([:]), externalRecaptchaRequestVerification: { _, _ in return .complete() }, autolockDeadine: .single(nil), encryptionProvider: OpenSSLEncryptionProvider(), deviceModelName: deviceModelPretty(), useBetaFeatures: useBetaFeatures, isICloudEnabled: false)
+        let networkArguments = NetworkInitializationArguments(apiId: ApiEnvironment.apiId, apiHash: ApiEnvironment.apiHash, languagesCategory: ApiEnvironment.language, appVersion: ApiEnvironment.version, voipMaxLayer: 90, voipVersions: [], appData: appData, externalRequestVerificationStream: .single([:]), externalRecaptchaRequestVerification: { _, _ in return .complete() }, autolockDeadine: .single(nil), encryptionProvider: OpenSSLEncryptionProvider(), deviceModelName: ApiEnvironment.customDeviceModel ?? deviceModelPretty(), useBetaFeatures: useBetaFeatures, isICloudEnabled: false)
 
         let sharedContext = SharedAccountContext(accountManager: accountManager, networkArguments: networkArguments, rootPath: rootPath, encryptionParameters: encryptionParameters, appEncryption: appEncryption, displayUpgradeProgress: { _ in })
 

packages/ApiCredentials/Sources/ApiCredentials/DeviceModel.swift

@@ -0,0 +1,37 @@
+import Foundation
+
+public extension ApiEnvironment {
+    static let deviceModelMaxLength = 32
+    static let deviceModelDidChange = Notification.Name("ApiEnvironmentDeviceModelDidChange")
+    static var systemDeviceModel: String?
+
+    private static var deviceModelURL: URL? {
+        return containerURL?.appendingPathComponent("device-model")
+    }
+
+    static var customDeviceModel: String? {
+        get {
+            guard let url = deviceModelURL, let value = try? String(contentsOf: url, encoding: .utf8) else {
+                return nil
+            }
+            return normalizedDeviceModel(value)
+        }
+        set {
+            guard let url = deviceModelURL else {
+                return
+            }
+            if let value = newValue.flatMap(normalizedDeviceModel) {
+                try? value.write(to: url, atomically: true, encoding: .utf8)
+            } else {
+                try? FileManager.default.removeItem(at: url)
+            }
+            NotificationCenter.default.post(name: deviceModelDidChange, object: nil)
+        }
+    }
+
+    static func normalizedDeviceModel(_ value: String) -> String? {
+        let words = value.components(separatedBy: .whitespacesAndNewlines).filter { !$0.isEmpty }
+        let result = String(words.joined(separator: " ").prefix(deviceModelMaxLength)).trimmingCharacters(in: .whitespaces)
+        return result.isEmpty ? nil : result
+    }
+}

packages/SessionsUI/Package.swift

@@ -17,6 +17,7 @@ let deps: [(String, String)] = [
     ("DateUtils", "../DateUtils"),
     ("ColorPalette", "../ColorPalette"),
     ("TelegramIconsTheme", "../TelegramIconsTheme"),
+    ("ApiCredentials", "../ApiCredentials"),
 ]
 
 let package = Package(

packages/SessionsUI/Sources/SessionsUI/RecentSessionRowItem.swift

@@ -26,11 +26,11 @@ public class RecentSessionRowItem: GeneralRowItem {
     public let handler:()->Void
     public let icon: (CGImage?, LocalAnimatedSticker?, NSColor?, [String]?)
 
-    public init(_ initialSize: NSSize, session:RecentAccountSession, stableId:AnyHashable, viewType: GeneralViewType, icon: (CGImage?, LocalAnimatedSticker?, NSColor?, [String]?), handler: @escaping()->Void) {
+    public init(_ initialSize: NSSize, session:RecentAccountSession, deviceModel: String? = nil, stableId:AnyHashable, viewType: GeneralViewType, icon: (CGImage?, LocalAnimatedSticker?, NSColor?, [String]?), handler: @escaping()->Void) {
         self.session = session
         self.handler = handler
         self.icon = icon
-        headerLayout = TextViewLayout(.initialize(string: session.deviceModel, color: theme.colors.text, font: .normal(.title)), maximumNumberOfLines: 1)
+        headerLayout = TextViewLayout(.initialize(string: deviceModel ?? session.deviceModel, color: theme.colors.text, font: .normal(.title)), maximumNumberOfLines: 1)
 
         let attr = NSMutableAttributedString()
 
@@ -93,6 +93,12 @@ public class RecentSessionRowView : GeneralContainableRowView {
     private let descTextView = TextView()
     private let dateTextView = TextView()
     private let iconView: ImageView = ImageView()
+    private let scrambleAnimation = ScrambleTextAnimation()
+    private var scrambleLayout: TextViewLayout?
+
+    var titleView: NSView {
+        return headerTextView
+    }
     public required init(frame frameRect: NSRect) {
 
         super.init(frame: frameRect)
@@ -136,11 +142,26 @@ public class RecentSessionRowView : GeneralContainableRowView {
 
 
     public override func set(item: TableRowItem, animated: Bool) {
+        let previousTitle = (self.item as? RecentSessionRowItem)?.headerLayout.attributedString.string
         super.set(item: item)
 
 
 
         if let item = item as? RecentSessionRowItem {
+            let title = item.headerLayout.attributedString.string
+            if animated, let previousTitle = previousTitle, previousTitle != title, !title.isEmpty {
+                let width = item.headerLayout.constrainedWidth
+                let attributes = item.headerLayout.attributedString.attributes(at: 0, effectiveRange: nil)
+                scrambleAnimation.start(from: scrambleLayout?.attributedString.string ?? previousTitle, to: title, update: { [weak self] text in
+                    let layout = TextViewLayout(NSAttributedString(string: text, attributes: attributes), maximumNumberOfLines: 1)
+                    layout.measure(width: width)
+                    self?.scrambleLayout = text == title ? nil : layout
+                    self?.needsLayout = true
+                })
+            } else if previousTitle != title {
+                scrambleAnimation.cancel()
+                scrambleLayout = nil
+            }
             self.iconView.image = item.icon.0
             self.iconView.sizeToFit()
         }
@@ -156,7 +177,7 @@ public class RecentSessionRowView : GeneralContainableRowView {
         let insets = item.viewType.innerInset
         self.iconView.setFrameOrigin(NSMakePoint(insets.left, insets.top))
         let left: CGFloat = (item.icon.0 != nil ? 38 : 0)
-        self.headerTextView.update(item.headerLayout, origin: NSMakePoint(left + insets.left, insets.top - 2))
+        self.headerTextView.update(scrambleLayout ?? item.headerLayout, origin: NSMakePoint(left + insets.left, insets.top - 2))
         self.descTextView.update(item.descLayout, origin: NSMakePoint(left + insets.left, headerTextView.frame.maxY + 4))
         self.dateTextView.update(item.dateLayout, origin: NSMakePoint(self.containerView.frame.width - insets.right - item.dateLayout.layoutSize.width, insets.top))
 

packages/SessionsUI/Sources/SessionsUI/RecentSessionsController.swift

@@ -24,6 +24,9 @@ public func iconForSession(_ session: RecentAccountSession) -> (CGImage?, LocalA
     let platform = session.platform.lowercased()
     let device = session.deviceModel.lowercased()
     let systemVersion = session.systemVersion.lowercased()
+    if session.isCurrent {
+        return (NSImage(named: "Icon_Device_Apple")!.precomposed(), LocalAnimatedSticker.device_mac, NSColor(rgb: 0x0079ff), nil)
+    }
     if device.contains("xbox") {
         return (NSImage(named: "Icon_Device_Xbox")!.precomposed(), nil, NSColor(rgb: 0x35c759), nil)
     }
@@ -48,7 +51,7 @@ public func iconForSession(_ session: RecentAccountSession) -> (CGImage?, LocalA
     if platform.contains("android") {
         return (NSImage(named: "Icon_Device_Android")!.precomposed(), LocalAnimatedSticker.device_android, NSColor(rgb: 0x35c759), ["Eye L.Eye L.Заливка 1", "Eye R.Eye R.Заливка 1"])
     }
-    if (platform.contains("macos") || systemVersion.contains("macos")) && device.contains("mac")  {
+    if (platform.contains("macos") || systemVersion.contains("macos")) && !device.contains("iphone") && !device.contains("ipad") {
         return (NSImage(named: "Icon_Device_Apple")!.precomposed(), LocalAnimatedSticker.device_mac, NSColor(rgb: 0x0079ff), nil)
     }
     if device.contains("ipad") {
@@ -83,12 +86,14 @@ private final class RecentSessionsControllerArguments {
     public let terminateOthers:() -> Void
     public let toggleTtl:(Int)->Void
     public let preview:(RecentAccountSession, AnyHashable)->Void
-    public init(context: any AccountContextProtocol, removeSession: @escaping (Int64) -> Void, terminateOthers: @escaping()->Void, toggleTtl:@escaping(Int)->Void, preview:@escaping(RecentAccountSession, AnyHashable)->Void) {
+    public let rename:()->Void
+    public init(context: any AccountContextProtocol, removeSession: @escaping (Int64) -> Void, terminateOthers: @escaping()->Void, toggleTtl:@escaping(Int)->Void, preview:@escaping(RecentAccountSession, AnyHashable)->Void, rename:@escaping()->Void) {
         self.context = context
         self.removeSession = removeSession
         self.terminateOthers = terminateOthers
         self.toggleTtl = toggleTtl
         self.preview = preview
+        self.rename = rename
     }
 }
 
@@ -113,7 +118,7 @@ public enum RecentSessionsEntryStableId: Hashable {
 private enum RecentSessionsEntry: Comparable, Identifiable {
     case loading(sectionId:Int)
     case currentSessionHeader(sectionId:Int, viewType: GeneralViewType)
-    case currentSession(sectionId:Int, RecentAccountSession, viewType: GeneralViewType)
+    case currentSession(sectionId:Int, RecentAccountSession, deviceModel: String?, viewType: GeneralViewType)
     case terminateOtherSessions(sectionId:Int, viewType: GeneralViewType)
     case currentSessionInfo(sectionId:Int, viewType: GeneralViewType)
 
@@ -193,7 +198,7 @@ private enum RecentSessionsEntry: Comparable, Identifiable {
             return sectionId
         case let .currentSessionHeader(sectionId, _):
             return sectionId
-        case let .currentSession(sectionId, _, _):
+        case let .currentSession(sectionId, _, _, _):
             return sectionId
         case let .terminateOtherSessions(sectionId, _):
             return sectionId
@@ -222,7 +227,7 @@ private enum RecentSessionsEntry: Comparable, Identifiable {
             return (sectionId * 1000) + stableIndex
         case let .currentSessionHeader(sectionId, _):
             return (sectionId * 1000) + stableIndex
-        case let .currentSession(sectionId, _, _):
+        case let .currentSession(sectionId, _, _, _):
             return (sectionId * 1000) + stableIndex
         case let .terminateOtherSessions(sectionId, _):
             return (sectionId * 1000) + stableIndex
@@ -253,9 +258,9 @@ private enum RecentSessionsEntry: Comparable, Identifiable {
     public func item(_ arguments: RecentSessionsControllerArguments, initialSize: NSSize) -> TableRowItem {
         switch self {
         case let .currentSessionHeader(_, viewType):
-            return GeneralTextRowItem(initialSize, stableId: stableId, text: strings().sessionsCurrentSessionHeader, viewType: viewType)
-        case let .currentSession(_, session, viewType):
-            return RecentSessionRowItem(initialSize, session: session, stableId: stableId, viewType: viewType, icon: iconForSession(session), handler: {
+            return GeneralTextRowItem(initialSize, stableId: stableId, text: strings().sessionsCurrentSessionHeader, viewType: viewType, rightItem: InputDataGeneralTextRightData(isLoading: false, text: .initialize(string: "Rename", color: theme.colors.accent, font: .medium(.small)), action: arguments.rename)) //TODOLANG
+        case let .currentSession(_, session, deviceModel, viewType):
+            return RecentSessionRowItem(initialSize, session: session, deviceModel: deviceModel, stableId: stableId, viewType: viewType, icon: iconForSession(session), handler: {
                 arguments.preview(session, stableId)
             })
         case let .terminateOtherSessions(_, viewType):
@@ -356,7 +361,7 @@ private struct RecentSessionsControllerState: Equatable {
     }
 }
 
-private func recentSessionsControllerEntries(state: RecentSessionsControllerState, sessions: ActiveSessionsContextState) -> [RecentSessionsEntry] {
+private func recentSessionsControllerEntries(state: RecentSessionsControllerState, sessions: ActiveSessionsContextState, deviceModel: String?) -> [RecentSessionsEntry] {
     var entries: [RecentSessionsEntry] = []
 
 
@@ -368,7 +373,7 @@ private func recentSessionsControllerEntries(state: RecentSessionsControllerStat
     entries.append(.currentSessionHeader(sectionId: sectionId, viewType: .textTopItem))
     if let index = sessions.sessions.firstIndex(where: { $0.hash == 0 }) {
         existingSessionIds.insert(sessions.sessions[index].hash)
-        entries.append(.currentSession(sectionId: sectionId, sessions.sessions[index], viewType: .firstItem))
+        entries.append(.currentSession(sectionId: sectionId, sessions.sessions[index], deviceModel: deviceModel, viewType: .firstItem))
     }
     entries.append(.terminateOtherSessions(sectionId: sectionId, viewType: existingSessionIds.isEmpty ? .singleItem : .lastItem))
     entries.append(.currentSessionInfo(sectionId: sectionId, viewType: .textBottomItem))
@@ -526,6 +531,9 @@ open class RecentSessionsController<Context: AccountContextProtocol>: TableViewC
             showModal(with: SessionModalController(context: context, session: session), for: context.window, morphSource: {
                 (self?.genericView.item(stableId: stableId)?.view as? GeneralContainableRowView)?.containerView
             })
+        }, rename: { [weak self] in
+            let source = (self?.genericView.item(stableId: RecentSessionsEntryStableId.index(2))?.view as? RecentSessionRowView)?.titleView
+            showModal(with: RenameDeviceController(context: context), for: context.window, morphSource: source.map { source in { [weak source] in source } })
         })
 
         let sessionsSignal: Signal<ActiveSessionsContextState, NoError> = context.activeSessionsContext.state
@@ -534,10 +542,10 @@ open class RecentSessionsController<Context: AccountContextProtocol>: TableViewC
 
         let previousSessions: Atomic<[AppearanceWrapperEntry<RecentSessionsEntry>]> = Atomic(value: [])
 
-        let signal = combineLatest(statePromise.get(), sessionsPromise.get(), appearanceSignal)
+        let signal = combineLatest(statePromise.get(), sessionsPromise.get(), renamedDeviceModel.get(), appearanceSignal)
             |> deliverOnMainQueue
-            |> map { state, sessions, appearance -> TableUpdateTransition in
-                let entries = recentSessionsControllerEntries(state: state, sessions: sessions).map {AppearanceWrapperEntry(entry: $0, appearance: appearance)}
+            |> map { state, sessions, deviceModel, appearance -> TableUpdateTransition in
+                let entries = recentSessionsControllerEntries(state: state, sessions: sessions, deviceModel: deviceModel).map {AppearanceWrapperEntry(entry: $0, appearance: appearance)}
                 return prepareSessions(left: previousSessions.swap(entries), right: entries, arguments: arguments, initialSize: initialSize.modify {$0})
             } |> afterDisposed {
                 actionsDisposable.dispose()