mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-30 00:02:47 +00:00
Merge pull request #3738 from vector-im/element_3732
Use `MXKPasteboardManager.pasteboard` instead of generalPasteboard
This commit is contained in:
commit
4edae8c72b
4 changed files with 7 additions and 6 deletions
|
@ -9,6 +9,7 @@ Changes to be released in next version
|
|||
* Room: Add more to long room topics (#3715).
|
||||
* Security screens: Update automatically shields when the trust changes.
|
||||
* Room: Add floating action button to invite members.
|
||||
* Pasteboard: Use MXKPasteboardManager.pasteboard on copy operations (#3732).
|
||||
|
||||
🐛 Bugfix
|
||||
* Push: Check crypto has keys to decrypt an event before decryption attempt, avoid sync loops on failure.
|
||||
|
|
|
@ -233,7 +233,7 @@ static RageShakeManager* sharedInstance = nil;
|
|||
UIGraphicsEndImageContext();
|
||||
|
||||
// the image is copied in the clipboard
|
||||
[UIPasteboard generalPasteboard].image = image;
|
||||
MXKPasteboardManager.shared.pasteboard.image = image;
|
||||
|
||||
return image;
|
||||
}
|
||||
|
|
|
@ -2622,7 +2622,7 @@
|
|||
|
||||
if (permalink)
|
||||
{
|
||||
[[UIPasteboard generalPasteboard] setString:permalink];
|
||||
MXKPasteboardManager.shared.pasteboard.string = permalink;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -5256,7 +5256,7 @@
|
|||
|
||||
if (textMessage)
|
||||
{
|
||||
[UIPasteboard generalPasteboard].string = textMessage;
|
||||
MXKPasteboardManager.shared.pasteboard.string = textMessage;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -898,7 +898,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
|
|||
|
||||
if (roomdId)
|
||||
{
|
||||
[[UIPasteboard generalPasteboard] setString:roomdId];
|
||||
MXKPasteboardManager.shared.pasteboard.string = roomdId;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -1006,7 +1006,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
|
|||
|
||||
if (roomAlias)
|
||||
{
|
||||
[[UIPasteboard generalPasteboard] setString:roomAlias];
|
||||
MXKPasteboardManager.shared.pasteboard.string = roomAlias;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -1031,7 +1031,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
|
|||
|
||||
if (permalink)
|
||||
{
|
||||
[[UIPasteboard generalPasteboard] setString:permalink];
|
||||
MXKPasteboardManager.shared.pasteboard.string = permalink;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue