[Feature] Notifications content on lock screen

Telegram-Mac/NotificationPreferencesController.swift

@@ -172,8 +172,9 @@ private final class NotificationArguments {
     let updateJoinedNotifications: (Bool) -> Void
     let toggleBadge: (Bool)->Void
     let toggleRequestUserAttention: ()->Void
+    let toggleContentsOnLockscreen: ()->Void
     let toggleInAppSounds:(Bool)->Void
-    init(resetAllNotifications: @escaping() -> Void, toggleMessagesPreview:@escaping() -> Void, toggleNotifications:@escaping() -> Void, notificationTone:@escaping() -> Void, toggleIncludeUnreadChats:@escaping(Bool) -> Void, toggleCountUnreadMessages:@escaping(Bool) -> Void, toggleIncludeGroups:@escaping(Bool) -> Void, toggleIncludeChannels:@escaping(Bool) -> Void, allAcounts: @escaping()-> Void, snoof: @escaping()-> Void, updateJoinedNotifications: @escaping(Bool) -> Void, toggleBadge: @escaping(Bool)->Void, toggleRequestUserAttention: @escaping ()->Void, toggleInAppSounds: @escaping(Bool)->Void) {
+    init(resetAllNotifications: @escaping() -> Void, toggleMessagesPreview:@escaping() -> Void, toggleNotifications:@escaping() -> Void, notificationTone:@escaping() -> Void, toggleIncludeUnreadChats:@escaping(Bool) -> Void, toggleCountUnreadMessages:@escaping(Bool) -> Void, toggleIncludeGroups:@escaping(Bool) -> Void, toggleIncludeChannels:@escaping(Bool) -> Void, allAcounts: @escaping()-> Void, snoof: @escaping()-> Void, updateJoinedNotifications: @escaping(Bool) -> Void, toggleBadge: @escaping(Bool)->Void, toggleRequestUserAttention: @escaping ()->Void, toggleContentsOnLockscreen: @escaping ()->Void, toggleInAppSounds: @escaping(Bool)->Void) {
         self.resetAllNotifications = resetAllNotifications
         self.toggleMessagesPreview = toggleMessagesPreview
         self.toggleNotifications = toggleNotifications
@@ -187,6 +188,7 @@ private final class NotificationArguments {
         self.updateJoinedNotifications = updateJoinedNotifications
         self.toggleBadge = toggleBadge
         self.toggleRequestUserAttention = toggleRequestUserAttention
+        self.toggleContentsOnLockscreen = toggleContentsOnLockscreen
         self.toggleInAppSounds = toggleInAppSounds
     }
 }
@@ -205,6 +207,7 @@ private let _id_new_contacts = InputDataIdentifier("_id_new_contacts")
 private let _id_snoof = InputDataIdentifier("_id_snoof")
 private let _id_tone = InputDataIdentifier("_id_tone")
 private let _id_bounce = InputDataIdentifier("_id_bounce")
+private let _id_lockscreen = InputDataIdentifier("_id_lockscreen")
 
 private let _id_turnon_notifications = InputDataIdentifier("_id_turnon_notifications")
 private let _id_turnon_notifications_title = InputDataIdentifier("_id_turnon_notifications_title")
@@ -279,6 +282,11 @@ private func notificationEntries(settings:InAppNotificationSettings, soundList:
     })))
     index += 1
 
+    entries.append(InputDataEntry.general(sectionId: sectionId, index: index, value: .none, error: nil, identifier: _id_lockscreen, data: InputDataGeneralData(name: strings().notificationSettingsLockScreenContent, color: theme.colors.text, type: .switchable(settings.showContentsOnLockscreen), viewType: .innerItem, action: {
+        arguments.toggleContentsOnLockscreen()
+    })))
+    index += 1
+
     entries.append(InputDataEntry.general(sectionId: sectionId, index: index, value: .none, error: nil, identifier: _id_reset, data: InputDataGeneralData(name: strings().notificationSettingsResetNotifications, color: theme.colors.text, type: .none, viewType: .lastItem, action: {
         arguments.resetAllNotifications()
     })))
@@ -423,6 +431,10 @@ func NotificationPreferencesController(_ context: AccountContext, focusOnItemTag
         _ = updateInAppNotificationSettingsInteractively(accountManager: context.sharedContext.accountManager, { value in
             return value.withUpdatedRequestUserAttention(!value.requestUserAttention)
         }).start()
+    }, toggleContentsOnLockscreen: {
+        _ = updateInAppNotificationSettingsInteractively(accountManager: context.sharedContext.accountManager, { value in
+            return value.withUpdatedShowContentsOnLockscreen(!value.showContentsOnLockscreen)
+        }).start()
     }, toggleInAppSounds: { value in
         FastSettings.toggleInAppSouds(value)
     })

Telegram-Mac/SharedNotificationManager.swift

@@ -487,6 +487,7 @@ final class SharedNotificationManager : NSObject, NSUserNotificationCenterDelega
                     return .complete()
                 }
             } |> deliverOnMainQueue).start(next: { sources, images, inAppSettings, screenIsLocked, accountPeer, soundPath in
+                let hideContentOnLockScreen = screenIsLocked && !inAppSettings.showContentsOnLockscreen
 
                 if !primary, !inAppSettings.notifyAllAccounts {
                     return
@@ -523,7 +524,7 @@ final class SharedNotificationManager : NSObject, NSUserNotificationCenterDelega
                                 hasReplyButton = false
                             }
 
-                            if screenIsLocked {
+                            if hideContentOnLockScreen {
                                 title = appName
                             }
 
@@ -575,7 +576,7 @@ final class SharedNotificationManager : NSObject, NSUserNotificationCenterDelega
                                 subText = "\(txt) → \(threadData.info.title)"
                             }
 
-                            if !inAppSettings.displayPreviews || message.peers[message.id.peerId] is TelegramSecretChat || screenIsLocked {
+                            if !inAppSettings.displayPreviews || message.peers[message.id.peerId] is TelegramSecretChat || hideContentOnLockScreen {
                                 text = strings().notificationLockedPreview
                                 subText = nil
                             }
@@ -614,14 +615,14 @@ final class SharedNotificationManager : NSObject, NSUserNotificationCenterDelega
                                 notification.soundName = nil
                             }
 
-                            if self.activeAccounts.accounts.count > 1 && !screenIsLocked {
+                            if self.activeAccounts.accounts.count > 1 && !hideContentOnLockScreen {
                                 title += " → \(accountPeer.addressName ?? accountPeer.displayTitle)"
                             }
 
                             notification.title = title
                             notification.informativeText = text as String
                             notification.subtitle = subText
-                            notification.contentImage = screenIsLocked ? nil : images[message.id]
+                            notification.contentImage = hideContentOnLockScreen ? nil : images[message.id]
                             notification.hasReplyButton = hasReplyButton
 
                             notification.hasActionButton = !message.wasScheduled