Skip to content

Commit e23a02e

Browse files
author
Isaac
committed
Merge branch 'beta'
# Conflicts: # submodules/TelegramUI/Components/Stories/StoryContainerScreen/Sources/StoryItemSetContainerComponent.swift # versions.json
2 parents edd33a0 + 0699602 commit e23a02e

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

submodules/TelegramCallsUI/Sources/PresentationCallManager.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@ public final class PresentationCallManagerImpl: PresentationCallManager {
362362
)
363363
strongSelf.updateCurrentCall(call)
364364
}))
365-
} else if let currentCall = self.currentCall, currentCall.peerId == firstState.1.id, currentCall.peerId.id._internalGetInt64Value() < firstState.0.account.peerId.id._internalGetInt64Value() {
365+
} else if !"".isEmpty, let currentCall = self.currentCall, currentCall.peerId == firstState.1.id, currentCall.peerId.id._internalGetInt64Value() < firstState.0.account.peerId.id._internalGetInt64Value() {
366366
let _ = currentCall.hangUp().startStandalone()
367367

368368
self.currentCallDisposable.set((combineLatest(

submodules/TelegramUI/Components/ShareWithPeersScreen/Sources/ShareWithPeersScreen.swift

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1833,7 +1833,8 @@ final class ShareWithPeersScreenComponent: Component {
18331833
sectionOffset += footerSize.height
18341834
} else if section.id == 4 && section.itemCount > 0 {
18351835
var sectionItemOffset: CGFloat = 0.0
1836-
if self.selectedOptions.contains(.pin) {
1836+
//TODO:release
1837+
if self.selectedOptions.contains(.pin) && !"".isEmpty {
18371838
let itemFrame = CGRect(origin: CGPoint(x: itemLayout.sideInset, y: sectionOffset + section.insets.top + sectionItemOffset), size: CGSize(width: itemLayout.containerSize.width, height: section.itemHeight))
18381839
if !visibleBounds.intersects(itemFrame) {
18391840
continue
@@ -2728,15 +2729,18 @@ final class ShareWithPeersScreenComponent: Component {
27282729
if hasCover {
27292730
itemCount += 1
27302731
}
2731-
if self.selectedOptions.contains(.pin) {
2732+
//TODO:release
2733+
/*if self.selectedOptions.contains(.pin) {
27322734
itemCount += 1
2735+
}*/
2736+
if itemCount != 0 {
2737+
sections.append(ItemLayout.Section(
2738+
id: 4,
2739+
insets: UIEdgeInsets(top: 28.0, left: 0.0, bottom: 0.0, right: 0.0),
2740+
itemHeight: optionItemSize.height,
2741+
itemCount: itemCount
2742+
))
27332743
}
2734-
sections.append(ItemLayout.Section(
2735-
id: 4,
2736-
insets: UIEdgeInsets(top: 28.0, left: 0.0, bottom: 0.0, right: 0.0),
2737-
itemHeight: optionItemSize.height,
2738-
itemCount: 1
2739-
))
27402744
}
27412745
} else {
27422746
sections.append(ItemLayout.Section(

0 commit comments

Comments
 (0)