Skip to content

Commit 280f27b

Browse files
author
Ali
committed
Merge branch 'master' into beta
2 parents 9b06f02 + f29cfa3 commit 280f27b

File tree

101 files changed

+19217
-6611
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+19217
-6611
lines changed

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

+29
Original file line numberDiff line numberDiff line change
@@ -5929,3 +5929,32 @@ Sorry for the inconvenience.";
59295929
"CallList.DeleteAllForMe" = "Delete for me";
59305930
"CallList.DeleteAllForEveryone" = "Delete for me and Others";
59315931
"Conversation.ImportProgress" = "Importing Messages... %@%";
5932+
5933+
"Conversation.AudioRateTooltipSpeedUp" = "The audio will now play 2 times faster.";
5934+
"Conversation.AudioRateTooltipNormal" = "The audio will now play at normal speed.";
5935+
5936+
"ChatImport.Title" = "Import Chat";
5937+
"ChatImport.SelectionErrorNotAdmin" = "You need to be an admin of the group to import messages into it.";
5938+
"ChatImport.SelectionErrorGroupGeneric" = "You can't import history into this group.";
5939+
"ChatImport.SelectionConfirmationGroupWithTitle" = "Are you sure you want to import messages from **%1$@** into **%2$@**?";
5940+
"ChatImport.SelectionConfirmationGroupWithoutTitle" = "Are you sure you want to import messages into **%@**?";
5941+
"ChatImport.SelectionConfirmationAlertTitle" = "Import Messages";
5942+
"ChatImport.SelectionConfirmationAlertImportAction" = "Import";
5943+
"ChatImport.CreateGroupAlertTitle" = "Create Group and Import Messages";
5944+
"ChatImport.CreateGroupAlertText" = "Are you sure you want to create group **%@** and import messages from another messaging app?";
5945+
"ChatImport.CreateGroupAlertImportAction" = "Create and Import";
5946+
"ChatImport.UserErrorNotMutual" = "You can only import messages into private chats with users who added you in their contact list.";
5947+
"ChatImport.SelectionConfirmationUserWithTitle" = "Are you sure you want to import messages from **%1$@** into the chat with **%2$@**?";
5948+
"ChatImport.SelectionConfirmationUserWithoutTitle" = "Are you sure you want to import messages into the chat with **%@**?";
5949+
5950+
"PeerSelection.CreateNewGroup" = "Create a New Group";
5951+
"Message.ImportedDateFormat" = "%1$@, %2$@ Imported %3$@";
5952+
5953+
"ChatImportActivity.Title" = "Importing Chat";
5954+
"ChatImportActivity.OpenApp" = "Open Telegram";
5955+
"ChatImportActivity.Retry" = "Retry";
5956+
"ChatImportActivity.InProgress" = "Please keep this window open\nduring the import.";
5957+
"ChatImportActivity.ErrorNotAdmin" = "You need to be an admin.";
5958+
"ChatImportActivity.ErrorInvalidChatType" = "You can't import this history in this type of chat.";
5959+
"ChatImportActivity.ErrorGeneric" = "An error occurred.";
5960+
"ChatImportActivity.Success" = "This chat has been imported\nsuccessfully.";

‎buildbox/verify-telegram.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ fi
2424

2525
OUTPUT_PATH="build/artifacts"
2626

27+
BAZEL_HTTP_CACHE_URL="$BAZEL_HTTP_CACHE_URL" sh buildbox/build-telegram.sh verify
28+
2729
if [ "$CONFIGURATION" == "appstore" ]; then
2830
if [ -z "$IPA_PATH" ]; then
2931
IPA_PATH="$OUTPUT_PATH/Telegram.ipa"
@@ -43,8 +45,6 @@ VERIFY_PATH="TelegramVerifyBuild.ipa"
4345
rm -f "$VERIFY_PATH"
4446
cp "$IPA_PATH" "$VERIFY_PATH"
4547

46-
BAZEL_HTTP_CACHE_URL="$BAZEL_HTTP_CACHE_URL" sh buildbox/build-telegram.sh verify
47-
4848
python3 tools/ipadiff.py "$IPA_PATH" "$VERIFY_PATH"
4949
retVal=$?
5050
if [ $retVal -ne 0 ]; then

‎submodules/AccountContext/Sources/AccountContext.swift

+17-5
Original file line numberDiff line numberDiff line change
@@ -202,19 +202,29 @@ public final class ChatPeekTimeout {
202202

203203
public final class ChatPeerNearbyData: Equatable {
204204
public static func == (lhs: ChatPeerNearbyData, rhs: ChatPeerNearbyData) -> Bool {
205+
return lhs.distance == rhs.distance
206+
}
207+
208+
public let distance: Int32
209+
210+
public init(distance: Int32) {
211+
self.distance = distance
212+
}
213+
}
214+
215+
public final class ChatGreetingData: Equatable {
216+
public static func == (lhs: ChatGreetingData, rhs: ChatGreetingData) -> Bool {
205217
if let lhsSticker = lhs.sticker, let rhsSticker = rhs.sticker, !lhsSticker.isEqual(to: rhsSticker) {
206218
return false
207219
} else if (lhs.sticker == nil) != (rhs.sticker == nil) {
208220
return false
209221
}
210-
return lhs.distance == rhs.distance
222+
return true
211223
}
212224

213-
public let distance: Int32
214225
public let sticker: TelegramMediaFile?
215226

216-
public init(distance: Int32, sticker: TelegramMediaFile?) {
217-
self.distance = distance
227+
public init(sticker: TelegramMediaFile?) {
218228
self.sticker = sticker
219229
}
220230
}
@@ -270,12 +280,13 @@ public final class NavigateToChatControllerParams {
270280
public let activateMessageSearch: (ChatSearchDomain, String)?
271281
public let peekData: ChatPeekTimeout?
272282
public let peerNearbyData: ChatPeerNearbyData?
283+
public let greetingData: ChatGreetingData?
273284
public let animated: Bool
274285
public let options: NavigationAnimationOptions
275286
public let parentGroupId: PeerGroupId?
276287
public let completion: (ChatController) -> Void
277288

278-
public init(navigationController: NavigationController, chatController: ChatController? = nil, context: AccountContext, chatLocation: ChatLocation, chatLocationContextHolder: Atomic<ChatLocationContextHolder?> = Atomic<ChatLocationContextHolder?>(value: nil), subject: ChatControllerSubject? = nil, botStart: ChatControllerInitialBotStart? = nil, updateTextInputState: ChatTextInputState? = nil, activateInput: Bool = false, keepStack: NavigateToChatKeepStack = .default, useExisting: Bool = true, purposefulAction: (() -> Void)? = nil, scrollToEndIfExists: Bool = false, activateMessageSearch: (ChatSearchDomain, String)? = nil, peekData: ChatPeekTimeout? = nil, peerNearbyData: ChatPeerNearbyData? = nil, animated: Bool = true, options: NavigationAnimationOptions = [], parentGroupId: PeerGroupId? = nil, completion: @escaping (ChatController) -> Void = { _ in }) {
289+
public init(navigationController: NavigationController, chatController: ChatController? = nil, context: AccountContext, chatLocation: ChatLocation, chatLocationContextHolder: Atomic<ChatLocationContextHolder?> = Atomic<ChatLocationContextHolder?>(value: nil), subject: ChatControllerSubject? = nil, botStart: ChatControllerInitialBotStart? = nil, updateTextInputState: ChatTextInputState? = nil, activateInput: Bool = false, keepStack: NavigateToChatKeepStack = .default, useExisting: Bool = true, purposefulAction: (() -> Void)? = nil, scrollToEndIfExists: Bool = false, activateMessageSearch: (ChatSearchDomain, String)? = nil, peekData: ChatPeekTimeout? = nil, peerNearbyData: ChatPeerNearbyData? = nil, greetingData: ChatGreetingData? = nil, animated: Bool = true, options: NavigationAnimationOptions = [], parentGroupId: PeerGroupId? = nil, completion: @escaping (ChatController) -> Void = { _ in }) {
279290
self.navigationController = navigationController
280291
self.chatController = chatController
281292
self.chatLocationContextHolder = chatLocationContextHolder
@@ -292,6 +303,7 @@ public final class NavigateToChatControllerParams {
292303
self.activateMessageSearch = activateMessageSearch
293304
self.peekData = peekData
294305
self.peerNearbyData = peerNearbyData
306+
self.greetingData = greetingData
295307
self.animated = animated
296308
self.options = options
297309
self.parentGroupId = parentGroupId

‎submodules/AccountContext/Sources/PresentationCallManager.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ public protocol PresentationGroupCall: class {
297297
func setVolume(peerId: PeerId, volume: Int32, sync: Bool)
298298
func setCurrentAudioOutput(_ output: AudioSessionOutput)
299299

300-
func updateMuteState(peerId: PeerId, isMuted: Bool)
300+
func updateMuteState(peerId: PeerId, isMuted: Bool) -> GroupCallParticipantsContext.Participant.MuteState?
301301

302302
func invitePeer(_ peerId: PeerId) -> Bool
303303
func removedPeer(_ peerId: PeerId)

‎submodules/ChatImportUI/BUILD

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ swift_library(
1515
"//submodules/SyncCore:SyncCore",
1616
"//submodules/TelegramCore:TelegramCore",
1717
"//submodules/AppBundle:AppBundle",
18-
"//third-party/ZIPFoundation:ZIPFoundation",
18+
"//third-party/ZipArchive:ZipArchive",
1919
"//submodules/AccountContext:AccountContext",
2020
"//submodules/PresentationDataUtils:PresentationDataUtils",
2121
"//submodules/RadialStatusNode:RadialStatusNode",
@@ -24,6 +24,7 @@ swift_library(
2424
"//submodules/MimeTypes:MimeTypes",
2525
"//submodules/ConfettiEffect:ConfettiEffect",
2626
"//submodules/TelegramUniversalVideoContent:TelegramUniversalVideoContent",
27+
"//submodules/SolidRoundedButtonNode:SolidRoundedButtonNode",
2728
],
2829
visibility = [
2930
"//visibility:public",

0 commit comments

Comments
 (0)