Skip to content

Commit b5d1906

Browse files
committed
- some improvements.
1 parent 464ba1e commit b5d1906

File tree

7 files changed

+10
-5
lines changed

7 files changed

+10
-5
lines changed

Telegram-Mac/AccountContext.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ final class AccountContext {
457457
let tonContext: StarsContext
458458
let starsSubscriptionsContext: StarsSubscriptionsContext
459459
let currentCountriesConfiguration: Atomic<CountriesConfiguration> = Atomic(value: CountriesConfiguration(countries: loadCountryCodes()))
460-
private(set) var contentConfig: ContentSettingsConfiguration = .default
460+
var contentConfig: ContentSettingsConfiguration = .default
461461
private let _countriesConfiguration = Promise<CountriesConfiguration>()
462462
var countriesConfiguration: Signal<CountriesConfiguration, NoError> {
463463
return self._countriesConfiguration.get()

Telegram-Mac/ChatInteractiveContentView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ class ChatInteractiveContentView: ChatMediaContentView {
855855

856856
let isSensitive: Bool
857857
if let parent = parent {
858-
isSensitive = parent.isSensitiveContent(platform: "ios")
858+
isSensitive = parent.isSensitiveContent(platform: "ios") && !context.contentConfig.sensitiveContentEnabled
859859
} else {
860860
isSensitive = false
861861
}

Telegram-Mac/DataAndStorageViewController.swift

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,9 @@ class DataAndStorageViewController: TableViewController {
574574
}
575575
})
576576
updateSensitiveContentDisposable.set(updateRemoteContentSettingsConfiguration(postbox: context.account.postbox, network: context.account.network, sensitiveContentEnabled: value).start())
577+
578+
context.contentConfig.sensitiveContentEnabled = true
579+
577580
}
578581

579582
enableSensitiveContent = {

Telegram-Mac/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</dict>
3434
</array>
3535
<key>CFBundleVersion</key>
36-
<string>274200</string>
36+
<string>274202</string>
3737
<key>ITSAppUsesNonExemptEncryption</key>
3838
<false/>
3939
<key>LSApplicationCategoryType</key>

Telegram-Mac/PeerPhotosMonthItem.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ struct MediaCellLayoutItem : Equatable, MediaCellLayoutable {
7070
}
7171

7272
var isSensitive: Bool {
73-
return self.message.isSensitiveContent(platform: "ios")
73+
return self.message.isSensitiveContent(platform: "ios") && !context.contentConfig.sensitiveContentEnabled
7474
}
7575

7676
var id: MessageId {

Telegram-Mac/WebpageModalController.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2406,6 +2406,8 @@ class WebpageModalController: ModalViewController, WKNavigationDelegate, WKUIDel
24062406
showModalText(for: context.window, text: info, title: header)
24072407
_ = updateRemoteContentSettingsConfiguration(postbox: context.account.postbox, network: context.account.network, sensitiveContentEnabled: true).start()
24082408

2409+
context.contentConfig.sensitiveContentEnabled = true
2410+
24092411
NotificationCenter.default.post(name: NSNotification.Name("external_age_verify"), object: nil)
24102412

24112413
FastSettings.lastAgeVerification = Date().timeIntervalSince1970

TelegramShare/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<key>CFBundleShortVersionString</key>
2222
<string>$(MARKETING_VERSION)</string>
2323
<key>CFBundleVersion</key>
24-
<string>274200</string>
24+
<string>274202</string>
2525
<key>ITSAppUsesNonExemptEncryption</key>
2626
<false/>
2727
<key>LSMinimumSystemVersion</key>

0 commit comments

Comments
 (0)