diff --git a/Telegram-iOS/BuildConfig.m b/Telegram-iOS/BuildConfig.m index c711fe304c..05041fed1a 100644 --- a/Telegram-iOS/BuildConfig.m +++ b/Telegram-iOS/BuildConfig.m @@ -622,7 +622,7 @@ API_AVAILABLE(ios(10)) [resultData writeToFile:filePath atomically:false]; } - if (@available(iOS 10, *)) { + if (@available(iOS 11, *)) { NSData *currentEncryptedData = [NSData dataWithContentsOfFile:encryptedPath]; LocalPrivateKey *localPrivateKey = [self getLocalPrivateKey:baseAppBundleId]; @@ -638,7 +638,7 @@ API_AVAILABLE(ios(10)) if (![resultData isEqualToData:decryptedData]) { NSData *encryptedData = [localPrivateKey encrypt:resultData]; [encryptedData writeToFile:encryptedPath atomically:false]; - assert(false); + //assert(false); } } else { NSData *encryptedData = [localPrivateKey encrypt:resultData]; diff --git a/Telegram-iOS/en.lproj/Localizable.strings b/Telegram-iOS/en.lproj/Localizable.strings index 03ad41e679..ac3c6537e0 100644 --- a/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram-iOS/en.lproj/Localizable.strings @@ -4236,9 +4236,6 @@ Unused sets are archived when you add more."; "ChatList.UndoArchiveTitle" = "Chat archived"; "ChatList.UndoArchiveText1" = "Hide the archive by swiping left on it."; -"ChatList.UndoArchiveText2" = "Unmuted chats will get unarchived if new messages arrive."; -"ChatList.UndoArchiveText3" = "Muted chats will stay archived after new messages arrive."; -"ChatList.UndoArchiveText4" = "You can pin unlimited number or archived chats to the top."; "ChatList.UndoArchiveHiddenTitle" = "Archive unpinned"; "ChatList.UndoArchiveHiddenText" = "Swipe down to see archive."; "ChatList.UndoArchiveRevealedTitle" = "Archive pinned"; diff --git a/submodules/Display b/submodules/Display index 44c84bc116..cfc191bc16 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit 44c84bc116ce9faf63233e6a72f65804955ca5c4 +Subproject commit cfc191bc16af3beb4212345ba10e8e36a3b51937 diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 2f3ec197f1..ea4a724076 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 2f3ec197f1ef9b97c2290ed1c597ffa4044bd61f +Subproject commit ea4a7240760016107fc303ce7dab3f98f2765da4