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

Disable message image sharing

Browse Source
This commit is contained in:
Ilya Laktyushin 2022-01-27 02:36:29 +03:00
parent 26f6e04fb3
commit 97f224f0a8
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
submodules/ShareController/Sources/ShareController.swift
View File

@ -685,7 +685,7 @@ public final class ShareController: ViewController {
|> take(1) |> take(1)
} }
} }
self.controllerNode.shareExternal = { [weak self] asImage in self.controllerNode.shareExternal = { [weak self] _ in
if let strongSelf = self { if let strongSelf = self {
var collectableItems: [CollectableExternalShareItem] = [] var collectableItems: [CollectableExternalShareItem] = []
var subject = strongSelf.subject var subject = strongSelf.subject
@ -694,7 +694,7 @@ public final class ShareController: ViewController {
subject = selectedValue.subject subject = selectedValue.subject
} }
var messageUrl: String? var messageUrl: String?
var messagesToShare: [Message]? // var messagesToShare: [Message]?
switch subject { switch subject {
case let .url(text): case let .url(text):
collectableItems.append(CollectableExternalShareItem(url: explicitUrl(text), text: "", author: nil, timestamp: nil, mediaReference: nil)) collectableItems.append(CollectableExternalShareItem(url: explicitUrl(text), text: "", author: nil, timestamp: nil, mediaReference: nil))
@ -711,7 +711,7 @@ public final class ShareController: ViewController {
let latLong = "\(media.latitude),\(media.longitude)" let latLong = "\(media.latitude),\(media.longitude)"
collectableItems.append(CollectableExternalShareItem(url: "https://maps.apple.com/maps?ll=\(latLong)&q=\(latLong)&t=m", text: "", author: nil, timestamp: nil, mediaReference: nil)) collectableItems.append(CollectableExternalShareItem(url: "https://maps.apple.com/maps?ll=\(latLong)&q=\(latLong)&t=m", text: "", author: nil, timestamp: nil, mediaReference: nil))
case let .messages(messages): case let .messages(messages):
messagesToShare = messages // messagesToShare = messages
for message in messages { for message in messages {
var url: String? var url: String?
var selectedMedia: Media? var selectedMedia: Media?
@ -801,16 +801,16 @@ public final class ShareController: ViewController {
|> filter { $0 } |> filter { $0 }
|> take(1) |> take(1)
|> deliverOnMainQueue).start(next: { [weak self] _ in |> deliverOnMainQueue).start(next: { [weak self] _ in
if asImage, let messages = messagesToShare { // if asImage, let messages = messagesToShare {
self?.openShareAsImage?(messages) // self?.openShareAsImage?(messages)
} else { // } else {
let activityController = UIActivityViewController(activityItems: activityItems, applicationActivities: activities) let activityController = UIActivityViewController(activityItems: activityItems, applicationActivities: activities)
if let strongSelf = self, let window = strongSelf.view.window, let rootViewController = window.rootViewController { if let strongSelf = self, let window = strongSelf.view.window, let rootViewController = window.rootViewController {
activityController.popoverPresentationController?.sourceView = window activityController.popoverPresentationController?.sourceView = window
activityController.popoverPresentationController?.sourceRect = CGRect(origin: CGPoint(x: window.bounds.width / 2.0, y: window.bounds.size.height - 1.0), size: CGSize(width: 1.0, height: 1.0)) activityController.popoverPresentationController?.sourceRect = CGRect(origin: CGPoint(x: window.bounds.width / 2.0, y: window.bounds.size.height - 1.0), size: CGSize(width: 1.0, height: 1.0))
rootViewController.present(activityController, animated: true, completion: nil) rootViewController.present(activityController, animated: true, completion: nil)
} }
} // }
}) })
} }
return .done return .done

6
submodules/ShareController/Sources/ShareControllerNode.swift
View File

@ -825,7 +825,7 @@ final class ShareControllerNode: ViewControllerTracingNode, UIScrollViewDelegate
} }
}) })
} }
let openShare: (Bool, ASDisplayNode?, ContextGesture?) -> Void = { [weak self] reportReady, node, gesture in let openShare: (Bool) -> Void = { [weak self] reportReady in
guard let strongSelf = self, let shareExternal = strongSelf.shareExternal else { guard let strongSelf = self, let shareExternal = strongSelf.shareExternal else {
return return
} }
@ -881,7 +881,7 @@ final class ShareControllerNode: ViewControllerTracingNode, UIScrollViewDelegate
} }
} }
peersContentNode.openShare = { node, gesture in peersContentNode.openShare = { node, gesture in
openShare(false, node, gesture) openShare(false)
} }
peersContentNode.segmentedSelectedIndexUpdated = { [weak self] index in peersContentNode.segmentedSelectedIndexUpdated = { [weak self] index in
if let strongSelf = self, let _ = strongSelf.segmentedValues { if let strongSelf = self, let _ = strongSelf.segmentedValues {
@ -890,7 +890,7 @@ final class ShareControllerNode: ViewControllerTracingNode, UIScrollViewDelegate
} }
} }
if self.immediateExternalShare { if self.immediateExternalShare {
openShare(true, nil, nil) openShare(true)
} else { } else {
self.transitionToContentNode(peersContentNode, animated: animated) self.transitionToContentNode(peersContentNode, animated: animated)
self.ready.set(.single(true)) self.ready.set(.single(true))