Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Telegram/Telegram-iOS/en.lproj/Localizable.strings

@@ -6543,14 +6543,14 @@ Sorry for the inconvenience.";
 "TwoFactorSetup.PasswordRecovery.SkipAlertAction" = "Skip";
 
 "TwoStepAuth.RecoveryUnavailableResetTitle" = "Reset Password";
-"TwoStepAuth.RecoveryUnavailableResetText" = "Since you haven't provided a recovery e-mail when setting up your password, your remaining options are either to remember your password or wait 7 days until your password is reset.";
+"TwoStepAuth.RecoveryUnavailableResetText" = "Since you didn’t provide a recovery email when setting up your password, your remaining options are either to remember your password or wait 7 days until your password is reset.";
 "TwoStepAuth.RecoveryEmailResetText" = "If you don't have access to your recovery email, your remaining options are either to remember your password or wait 7 days until your password resets.";
 "TwoStepAuth.RecoveryUnavailableResetAction" = "Reset";
 "TwoStepAuth.ResetPendingText" = "You can reset your password in %@.";
 "TwoStepAuth.CancelResetTitle" = "Cancel Reset";
 "TwoStepAuth.ResetAction" = "Reset Password";
-"TwoStepAuth.CancelResetText" = "Cancel the password resetting process? If you proceed, the expired part of the 7-day delay will be lost.";
-"TwoStepAuth.RecoveryEmailResetNoAccess" = "Lost access to your Email?";
+"TwoStepAuth.CancelResetText" = "Cancel the password reset process? If you request a new reset later, it will take another 7 days.";
+"TwoStepAuth.RecoveryEmailResetNoAccess" = "Can’t access your email?";
 
 "TwoFactorSetup.ResetDone.Title" = "New Password Set!";
 "TwoFactorSetup.ResetDone.Text" = "This password will be required when you log in on a new device in addition to the code you get via SMS.";
@@ -6559,6 +6559,7 @@ Sorry for the inconvenience.";
 "TwoFactorSetup.ResetDone.TitleNoPassword" = "Password Removed";
 "TwoFactorSetup.ResetDone.TextNoPassword" = "You can always set a new password in\n\n\nSettings>Privacy & Security>Two-Step Verification";
 
+"TwoFactorSetup.ResetFloodWait" = "You recently requested a password reset that was cancelled. Please wait %@ before making a new request.";
 "TwoFactorSetup.ResetFloodWait" = "You have recently requested a password reset that was canceled. Please wait for %@ before making a new request.";
 
 "TwoFactorRemember.Title" = "Enter Your Password";
@@ -6566,7 +6567,7 @@ Sorry for the inconvenience.";
 "TwoFactorRemember.Placeholder" = "Password";
 "TwoFactorRemember.Forgot" = "Forgot Password?";
 "TwoFactorRemember.CheckPassword" = "Check Password";
-"TwoFactorRemember.WrongPassword" = "You entered a wrong password.";
+"TwoFactorRemember.WrongPassword" = "This password is incorrect.";
 "TwoFactorRemember.Done.Title" = "Perfect!";
 "TwoFactorRemember.Done.Text" = "You still remember your password.";
 "TwoFactorRemember.Done.Action" = "Back to Settings";

submodules/TelegramCallsUI/Sources/GroupVideoNode.swift

@@ -34,6 +34,8 @@ final class GroupVideoNode: ASDisplayNode {
     private var effectView: UIVisualEffectView?
     private var isBlurred: Bool = false
 
+    private var isEnabled: Bool = false
+        
     private var validLayout: (CGSize, LayoutMode)?
     
     var tapped: (() -> Void)?
@@ -107,7 +109,10 @@ final class GroupVideoNode: ASDisplayNode {
     }
 
     func updateIsEnabled(_ isEnabled: Bool) {
+        self.isEnabled = isEnabled
+
         self.videoView.updateIsEnabled(isEnabled)
+        self.backdropVideoView?.updateIsEnabled(isEnabled)
     }
     
     func updateIsBlurred(isBlurred: Bool, light: Bool = false, animated: Bool = true) {
@@ -298,11 +303,11 @@ final class GroupVideoNode: ASDisplayNode {
             rotatedVideoFrame.size.width = ceil(rotatedVideoFrame.size.width)
             rotatedVideoFrame.size.height = ceil(rotatedVideoFrame.size.height)
 
-            let isEnabled = !topFrame.contains(rotatedVideoFrame)
+            let isBlurEnabled = !topFrame.contains(rotatedVideoFrame)
             
             let normalizedVideoSize = rotatedVideoFrame.size.aspectFilled(CGSize(width: 1080.0, height: 1080.0))
-            if isEnabled {
-                self.backdropVideoView?.updateIsEnabled(true)
+            if isBlurEnabled {
+                self.backdropVideoView?.updateIsEnabled(self.isEnabled)
                 self.backdropVideoView?.view.isHidden = false
                 self.backdropEffectView?.isHidden = false
             }
@@ -310,7 +315,7 @@ final class GroupVideoNode: ASDisplayNode {
                 guard let strongSelf = self, value else {
                     return
                 }
-                if !isEnabled {
+                if !isBlurEnabled {
                     strongSelf.backdropVideoView?.updateIsEnabled(false)
                     strongSelf.backdropVideoView?.view.isHidden = true
                     strongSelf.backdropEffectView?.isHidden = false

versions.json

@@ -1,5 +1,5 @@
 {
-    "app": "7.9",
+    "app": "7.8.3",
     "bazel": "4.0.0",
     "xcode": "12.4"
 }