ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '94118d979817bb1cbc08afe9d5ef0551dab9775c'

Browse Source
This commit is contained in:
Ali 2021-03-15 20:56:03 +04:00
commit 25215d542b
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/InstantPageUI/Sources/InstantPageMediaPlaylist.swift
View File

@ -89,7 +89,7 @@ final class InstantPageMediaPlaylistItem: SharedMediaPlaylistItem {
}
let albumArt: SharedMediaPlaybackAlbumArt?
if file.fileName?.lowercased().hasPrefix(".ogg") == true {
if file.fileName?.lowercased().hasSuffix(".ogg") == true {
albumArt = nil
} else {
albumArt = SharedMediaPlaybackAlbumArt(thumbnailResource: ExternalMusicAlbumArtResource(title: updatedTitle ?? "", performer: updatedPerformer ?? "", isThumbnail: true), fullSizeResource: ExternalMusicAlbumArtResource(title: updatedTitle ?? "", performer: updatedPerformer ?? "", isThumbnail: false))

4
submodules/ListMessageItem/Sources/ListMessageFileItemNode.swift
View File

@ -439,8 +439,8 @@ public final class ListMessageFileItemNode: ListMessageNode {
descriptionText = NSAttributedString(string: descriptionString, font: descriptionFont, textColor: item.presentationData.theme.theme.list.itemSecondaryTextColor)
if !voice {
if file.fileName?.lowercased().hasPrefix(".ogg") == true {
iconImage = .none
if file.fileName?.lowercased().hasSuffix(".ogg") == true {
iconImage = .albumArt(file, SharedMediaPlaybackAlbumArt(thumbnailResource: ExternalMusicAlbumArtResource(title: "", performer: "", isThumbnail: true), fullSizeResource: ExternalMusicAlbumArtResource(title: "", performer: "", isThumbnail: false)))
} else {
iconImage = .albumArt(file, SharedMediaPlaybackAlbumArt(thumbnailResource: ExternalMusicAlbumArtResource(title: title ?? "", performer: performer ?? "", isThumbnail: true), fullSizeResource: ExternalMusicAlbumArtResource(title: title ?? "", performer: performer ?? "", isThumbnail: false)))
}

6
submodules/TelegramCallsUI/Sources/VoiceChatActionButton.swift
View File

@ -716,7 +716,7 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
guard let strongSelf = self else {
return
}
if strongSelf.state != .connecting && strongSelf.state != .disabled {
if strongSelf.state != .connecting {
return
}
strongSelf.maskBlobView.isHidden = true
@ -745,7 +745,7 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
guard let strongSelf = self else {
return
}
if strongSelf.state != .connecting && strongSelf.state != .disabled {
if strongSelf.state != .connecting {
return
}
strongSelf.maskBlobView.isHidden = true
@ -766,7 +766,7 @@ private final class VoiceChatActionButtonBackgroundNode: ASDisplayNode {
self.animatingDisappearance = false
self.growingForegroundCircleLayer.isHidden = true
self.disableGlowAnimations = false
if self.state != .connecting && self.state != .disabled {
if self.state != .connecting {
return
}
CATransaction.begin()

18
submodules/TelegramCallsUI/Sources/VoiceChatController.swift
View File

@ -1593,15 +1593,15 @@ public final class VoiceChatController: ViewController {
}
}
self.memberEventsDisposable.set((self.call.memberEvents
|> deliverOnMainQueue).start(next: { [weak self] event in
guard let strongSelf = self else {
return
}
if event.joined {
strongSelf.presentUndoOverlay(content: .invitedToVoiceChat(context: strongSelf.context, peer: event.peer, text: strongSelf.presentationData.strings.VoiceChat_PeerJoinedText(event.peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0), action: { _ in return false })
}
}))
// self.memberEventsDisposable.set((self.call.memberEvents
// |> deliverOnMainQueue).start(next: { [weak self] event in
// guard let strongSelf = self else {
// return
// }
// if event.joined {
// strongSelf.presentUndoOverlay(content: .invitedToVoiceChat(context: strongSelf.context, peer: event.peer, text: strongSelf.presentationData.strings.VoiceChat_PeerJoinedText(event.peer.displayTitle(strings: strongSelf.presentationData.strings, displayOrder: strongSelf.presentationData.nameDisplayOrder)).0), action: { _ in return false })
// }
// }))
self.reconnectedAsEventsDisposable.set((self.call.reconnectedAsEvents
|> deliverOnMainQueue).start(next: { [weak self] peer in

2
submodules/TelegramUI/Sources/ChatMessageInteractiveFileNode.swift
View File

@ -919,7 +919,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
var image: Signal<(TransformImageArguments) -> DrawingContext?, NoError>? = nil
if file.isMusic {
if file.fileName?.lowercased().hasPrefix(".ogg") == true {
if file.fileName?.lowercased().hasSuffix(".ogg") == true {
} else {
var title: String?
var performer: String?

2
submodules/TelegramUI/Sources/PeerMessagesMediaPlaylist.swift
View File

@ -117,7 +117,7 @@ final class MessageMediaPlaylistItem: SharedMediaPlaylistItem {
}
let albumArt: SharedMediaPlaybackAlbumArt?
if file.fileName?.lowercased().hasPrefix(".ogg") == true {
if file.fileName?.lowercased().hasSuffix(".ogg") == true {
albumArt = nil
} else {
albumArt = SharedMediaPlaybackAlbumArt(thumbnailResource: ExternalMusicAlbumArtResource(title: updatedTitle ?? "", performer: updatedPerformer ?? "", isThumbnail: true), fullSizeResource: ExternalMusicAlbumArtResource(title: updatedTitle ?? "", performer: updatedPerformer ?? "", isThumbnail: false))