Skip to content

Commit 368f669

Browse files
committed
Various fixes
1 parent af65474 commit 368f669

File tree

9 files changed

+217
-99
lines changed

9 files changed

+217
-99
lines changed

Telegram/Telegram-iOS/en.lproj/Localizable.strings

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13949,6 +13949,7 @@ Sorry for the inconvenience.";
1394913949

1395013950
"Stars.Intro.BuyShort" = "Top Up";
1395113951
"Stars.Intro.Withdraw" = "Withdraw";
13952+
"Stars.Intro.Stats" = "Stats";
1395213953

1395313954
"Group.Info.Settings" = "Group Settings";
1395413955

@@ -14014,3 +14015,6 @@ Sorry for the inconvenience.";
1401414015
"Premium.MaxExpiringStoriesFinalTextNumberFormat_1" = "**%d** story";
1401514016
"Premium.MaxExpiringStoriesFinalTextNumberFormat_any" = "**%d** stories";
1401614017
"Premium.MaxExpiringStoriesFinalTextFormat" = "You have reached the limit of %@ stories per **24** hours.";
14018+
14019+
"Stars.AccountRevenue.Proceeds.Info" = "Stars from your total balance can be withdrawn as rewards 21 days after they are earned.";
14020+
"Stars.AccountRevenue.Withdraw.Info" = "You can collect rewards for Stars using Fragment. You cannot withdraw less than 1000 stars. [Learn More >]()";

submodules/AccountContext/Sources/ContactMultiselectionController.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ public enum ContactMultiselectionControllerMode {
4848
public var onlyUsers: Bool
4949
public var disableChannels: Bool
5050
public var disableBots: Bool
51+
public var disableContacts: Bool
5152

5253
public init(
5354
title: String,
@@ -59,7 +60,8 @@ public enum ContactMultiselectionControllerMode {
5960
displayPresence: Bool = false,
6061
onlyUsers: Bool = false,
6162
disableChannels: Bool = false,
62-
disableBots: Bool = false
63+
disableBots: Bool = false,
64+
disableContacts: Bool = false
6365
) {
6466
self.title = title
6567
self.searchPlaceholder = searchPlaceholder
@@ -71,6 +73,7 @@ public enum ContactMultiselectionControllerMode {
7173
self.onlyUsers = onlyUsers
7274
self.disableChannels = disableChannels
7375
self.disableBots = disableBots
76+
self.disableContacts = disableContacts
7477
}
7578
}
7679

submodules/SettingsUI/Sources/Privacy and Security/IncomingMessagePrivacyScreen.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,9 @@ public func incomingMessagePrivacyScreen(context: AccountContext, value: GlobalP
281281
chatListFilters: nil,
282282
onlyUsers: false,
283283
disableChannels: true,
284-
disableBots: false
285-
)), filters: [.excludeSelf]))
284+
disableBots: true,
285+
disableContacts: true
286+
))))
286287
addPeerDisposable.set((controller.result
287288
|> take(1)
288289
|> deliverOnMainQueue).start(next: { [weak controller] result in
@@ -342,7 +343,7 @@ public func incomingMessagePrivacyScreen(context: AccountContext, value: GlobalP
342343
controller.navigationPresentation = .modal
343344
pushControllerImpl?(controller)
344345
} else {
345-
let controller = selectivePrivacyPeersController(context: context, title: presentationData.strings.Privacy_Messages_Exceptions_Title, footer: presentationData.strings.Privacy_Messages_RemoveFeeInfo, initialPeers: peerIds, initialEnableForPremium: false, displayPremiumCategory: false, initialEnableForBots: false, displayBotsCategory: false, updated: { updatedPeerIds, _, _ in
346+
let controller = selectivePrivacyPeersController(context: context, title: presentationData.strings.Privacy_Messages_Exceptions_Title, footer: presentationData.strings.Privacy_Messages_RemoveFeeInfo, hideContacts: true, initialPeers: peerIds, initialEnableForPremium: false, displayPremiumCategory: false, initialEnableForBots: false, displayBotsCategory: false, updated: { updatedPeerIds, _, _ in
346347
updateState { state in
347348
var updatedState = state
348349
updatedState.disableFor = updatedPeerIds

submodules/SettingsUI/Sources/Privacy and Security/SelectivePrivacySettingsPeersController.swift

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ private func selectivePrivacyPeersControllerEntries(presentationData: Presentati
322322
return entries
323323
}
324324

325-
public func selectivePrivacyPeersController(context: AccountContext, title: String, footer: String? = nil, initialPeers: [EnginePeer.Id: SelectivePrivacyPeer], initialEnableForPremium: Bool, displayPremiumCategory: Bool, initialEnableForBots: Bool, displayBotsCategory: Bool, updated: @escaping ([EnginePeer.Id: SelectivePrivacyPeer], Bool, Bool) -> Void) -> ViewController {
325+
public func selectivePrivacyPeersController(context: AccountContext, title: String, footer: String? = nil, hideContacts: Bool = false, initialPeers: [EnginePeer.Id: SelectivePrivacyPeer], initialEnableForPremium: Bool, displayPremiumCategory: Bool, initialEnableForBots: Bool, displayBotsCategory: Bool, updated: @escaping ([EnginePeer.Id: SelectivePrivacyPeer], Bool, Bool) -> Void) -> ViewController {
326326
let initialState = SelectivePrivacyPeersControllerState(enableForPremium: initialEnableForPremium, enableForBots: initialEnableForBots, editing: false, peerIdWithRevealedOptions: nil)
327327
let statePromise = ValuePromise(initialState, ignoreRepeated: true)
328328
let stateValue = Atomic(value: initialState)
@@ -428,7 +428,8 @@ public func selectivePrivacyPeersController(context: AccountContext, title: Stri
428428
chatListFilters: nil,
429429
onlyUsers: false,
430430
disableChannels: true,
431-
disableBots: false
431+
disableBots: hideContacts,
432+
disableContacts: hideContacts
432433
)), alwaysEnabled: true))
433434
addPeerDisposable.set((controller.result
434435
|> take(1)

0 commit comments

Comments
 (0)