diff --git a/Share/ShareRootController.swift b/Share/ShareRootController.swift index e397e65caf..b2ed7dd640 100644 --- a/Share/ShareRootController.swift +++ b/Share/ShareRootController.swift @@ -239,8 +239,8 @@ class ShareRootController: UIViewController { } |> runOn(Queue.mainQueue()) } - let sentItems: ([PeerId], [PreparedShareItemContent]) -> Signal = { peerIds, contents in - let sentItems = sentShareItems(account: context.account, to: peerIds, items: contents) + let sentItems: ([PeerId], [PreparedShareItemContent], Account) -> Signal = { peerIds, contents, account in + let sentItems = sentShareItems(account: account, to: peerIds, items: contents) |> `catch` { _ -> Signal< Float, NoError> in return .complete() @@ -252,10 +252,10 @@ class ShareRootController: UIViewController { |> then(.single(.done)) } - let shareController = ShareController(context: context, subject: .fromExternal({ peerIds, additionalText in + let shareController = ShareController(context: context, subject: .fromExternal({ peerIds, additionalText, account in if let strongSelf = self, let inputItems = strongSelf.extensionContext?.inputItems, !inputItems.isEmpty, !peerIds.isEmpty { let rawSignals = TGItemProviderSignals.itemSignals(forInputItems: inputItems)! - return preparedShareItems(account: context.account, to: peerIds[0], dataItems: rawSignals, additionalText: additionalText) + return preparedShareItems(account: account, to: peerIds[0], dataItems: rawSignals, additionalText: additionalText) |> map(Optional.init) |> `catch` { _ -> Signal in return .single(nil) @@ -272,10 +272,10 @@ class ShareRootController: UIViewController { case let .userInteractionRequired(value): return requestUserInteraction(value) |> mapToSignal { contents -> Signal in - return sentItems(peerIds, contents) + return sentItems(peerIds, contents, account) } case let .done(contents): - return sentItems(peerIds, contents) + return sentItems(peerIds, contents, account) } } } else { diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index 9375379cf5..9dbbe34281 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -3849,6 +3849,7 @@ Unused sets are archived when you add more."; "GroupPermission.ApplyAlertAction" = "Apply"; "GroupPermission.AddSuccess" = "Exception Added"; "GroupPermission.NotAvailableInPublicGroups" = "This permission is not available in public groups."; +"GroupPermission.AddMembersNotAvailable" = "You don't have persmission to add members."; "Channel.Management.RemovedBy" = "Removed by %@"; diff --git a/submodules/TelegramUI b/submodules/TelegramUI index bd77e8c600..3062f0548f 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit bd77e8c600d9bd521f519f74fb10686ebe5bf5c2 +Subproject commit 3062f0548f2031cb12353c3cba834446c1513228