Skip to content

Commit 157a143

Browse files
author
overtake
committed
• The finer things – champagne, caviar… bug fixes.
1 parent c9f6752 commit 157a143

File tree

6 files changed

+40
-14
lines changed

6 files changed

+40
-14
lines changed

‎Telegram-Mac.xcworkspace/xcuserdata/keepcoder.xcuserdatad/xcdebugger/Expressions.xcexplist

+25-8
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,20 @@
5252
<ContextState
5353
contextName = "ThemePaletteSettings.init(decoder:):ThemeSettings.swift">
5454
</ContextState>
55+
<ContextState
56+
contextName = "ImageButton.apply(state:):ImageButton.swift">
57+
</ContextState>
58+
<ContextState
59+
contextName = "closure #1 in closure #1 in closure #1 in MediaBox.resourceData(_:size:in:mode:):MediaBox.swift">
60+
<PersistentStrings>
61+
<PersistentString
62+
value = "result.offset">
63+
</PersistentString>
64+
<PersistentString
65+
value = "result.size">
66+
</PersistentString>
67+
</PersistentStrings>
68+
</ContextState>
5569
<ContextState
5670
contextName = "closure #3 in closure #5 in DiceCache.init(postbox:network:):DiceCache.swift">
5771
</ContextState>
@@ -115,6 +129,9 @@
115129
<ContextState
116130
contextName = "closure #2 in EditThemeController(context:telegramTheme:presentation:):EditThemeController.swift">
117131
</ContextState>
132+
<ContextState
133+
contextName = "UserInfoArguments.updateEditable(_:peerView:controller:):UserInfoEntries.swift">
134+
</ContextState>
118135
<ContextState
119136
contextName = "ChatListViewSpaceState.fillSpace(postbox:):ChatListViewState.swift">
120137
</ContextState>
@@ -159,10 +176,10 @@
159176
contextName = "closure #2 in closure #2 in EditThemeController(context:telegramTheme:presentation:):EditThemeController.swift">
160177
</ContextState>
161178
<ContextState
162-
contextName = "closure #1 in ChatListTable.entries(groupId:from:to:peerChatInterfaceStateTable:count:predicate:):ChatListTable.swift">
179+
contextName = "closure #11 in closure #2 in SearchController.viewDidLoad():SearchController.swift">
163180
</ContextState>
164181
<ContextState
165-
contextName = "closure #11 in closure #2 in SearchController.viewDidLoad():SearchController.swift">
182+
contextName = "closure #1 in ChatListTable.entries(groupId:from:to:peerChatInterfaceStateTable:count:predicate:):ChatListTable.swift">
166183
</ContextState>
167184
<ContextState
168185
contextName = "specialized installedStickerPacksControllerEntries(state:stickerSettings:view:featured:):InstalledStickerPacksController.swift">
@@ -195,12 +212,6 @@
195212
<ContextState
196213
contextName = "applyPaints(_:for:imageSize:):EditImageCanvasController.swift">
197214
</ContextState>
198-
<ContextState
199-
contextName = "ViewTracker.updateViews(postbox:transaction:):ViewTracker.swift">
200-
</ContextState>
201-
<ContextState
202-
contextName = "closure #1 in closure #4 in closure #2 in EditThemeController(context:telegramTheme:presentation:):EditThemeController.swift">
203-
</ContextState>
204215
<ContextState
205216
contextName = "closure #1 in closure #5 in EditThemeController(context:telegramTheme:presentation:):EditThemeController.swift">
206217
<PersistentStrings>
@@ -209,5 +220,11 @@
209220
</PersistentString>
210221
</PersistentStrings>
211222
</ContextState>
223+
<ContextState
224+
contextName = "ViewTracker.updateViews(postbox:transaction:):ViewTracker.swift">
225+
</ContextState>
226+
<ContextState
227+
contextName = "closure #1 in closure #4 in closure #2 in EditThemeController(context:telegramTheme:presentation:):EditThemeController.swift">
228+
</ContextState>
212229
</ContextStates>
213230
</VariablesViewState>

‎Telegram-Mac/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</dict>
3737
</array>
3838
<key>CFBundleVersion</key>
39-
<string>201064</string>
39+
<string>201069</string>
4040
<key>LSApplicationCategoryType</key>
4141
<string>public.app-category.social-networking</string>
4242
<key>LSFileQuarantineEnabled</key>

‎Telegram-Mac/PeerInfoUtils.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ extension Peer {
7575
canCreateInviteLink = true
7676
}
7777
} else if let channel = self as? TelegramChannel {
78-
if channel.hasPermission(.inviteMembers) {
78+
if channel.hasPermission(.inviteMembers) && channel.adminRights != nil {
7979
canCreateInviteLink = true
8080
}
8181
}

‎Telegram-Mac/SVideoController.swift

+11-2
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,17 @@ class SVideoController: GenericViewController<SVideoView>, PictureInPictureContr
4747
private var pictureInPicture: Bool = false
4848
private var hideControls: ValuePromise<Bool> = ValuePromise(false, ignoreRepeated: true)
4949
var togglePictureInPictureImpl:((Bool, PictureInPictureControl)->Void)?
50-
private let videoFramePreview: MediaPlayerFramePreview
50+
51+
52+
private var _videoFramePreview: MediaPlayerFramePreview?
53+
private var videoFramePreview: MediaPlayerFramePreview {
54+
if let videoFramePreview = _videoFramePreview {
55+
return videoFramePreview
56+
} else {
57+
self._videoFramePreview = MediaPlayerFramePreview(postbox: postbox, fileReference: reference)
58+
}
59+
return _videoFramePreview!
60+
}
5161

5262

5363
private var scrubbingFrame = Promise<MediaPlayerFramePreviewResult?>(nil)
@@ -58,7 +68,6 @@ class SVideoController: GenericViewController<SVideoView>, PictureInPictureContr
5868
init(postbox: Postbox, reference: FileMediaReference, fetchAutomatically: Bool = false) {
5969
self.reference = reference
6070
self.postbox = postbox
61-
self.videoFramePreview = MediaPlayerFramePreview(postbox: postbox, fileReference: reference)
6271
mediaPlayer = MediaPlayer(postbox: postbox, reference: reference.resourceReference(reference.media.resource), streamable: reference.media.isStreamable, video: true, preferSoftwareDecoding: false, enableSound: true, volume: FastSettings.volumeRate, fetchAutomatically: fetchAutomatically)
6372
super.init()
6473
bar = .init(height: 0)

‎TelegramShare/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<key>CFBundleShortVersionString</key>
2222
<string>6.1.4</string>
2323
<key>CFBundleVersion</key>
24-
<string>201064</string>
24+
<string>201069</string>
2525
<key>LSMinimumSystemVersion</key>
2626
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
2727
<key>NSExtension</key>

‎submodules/telegram-ios

Submodule telegram-ios updated from 90f710e to c0721ab

0 commit comments

Comments
 (0)