Various fixes

Author: laktyushin

submodules/BrowserUI/Sources/BrowserWebContent.swift

@@ -446,16 +446,16 @@ final class BrowserWebContent: UIView, BrowserContent, WKNavigationDelegate, WKU
                             return
                         }
                         switch authResult {
-                        case let .accept(allowWriteAccess, sharePhoneNumber):
+                        case let .accept(allowWriteAccess, sharePhoneNumber, matchCode):
                             let signal: Signal<MessageActionUrlAuthResult, MessageActionUrlAuthError>
                             if accountContext === context {
-                                signal = accountContext.engine.messages.acceptMessageActionUrlAuth(subject: subject, allowWriteAccess: allowWriteAccess, sharePhoneNumber: sharePhoneNumber)
+                                signal = accountContext.engine.messages.acceptMessageActionUrlAuth(subject: subject, allowWriteAccess: allowWriteAccess, sharePhoneNumber: sharePhoneNumber, matchCode: matchCode)
                             } else {
                                 accountContext.account.shouldBeServiceTaskMaster.set(.single(.now))
                                 signal = accountContext.engine.messages.requestMessageActionUrlAuth(subject: subject)
                                 |> castError(MessageActionUrlAuthError.self)
                                 |> mapToSignal { result in
-                                    return accountContext.engine.messages.acceptMessageActionUrlAuth(subject: subject, allowWriteAccess: allowWriteAccess, sharePhoneNumber: sharePhoneNumber)
+                                    return accountContext.engine.messages.acceptMessageActionUrlAuth(subject: subject, allowWriteAccess: allowWriteAccess, sharePhoneNumber: sharePhoneNumber, matchCode: matchCode)
                                 } |> afterDisposed {
                                     accountContext.account.shouldBeServiceTaskMaster.set(.single(.never))
                                 }
@@ -497,6 +497,8 @@ final class BrowserWebContent: UIView, BrowserContent, WKNavigationDelegate, WKU
 
                                 let _ = self.context.engine.messages.declineUrlAuth(url: url).start()
                                 self.webView.sendEvent(name: "oauth_result_failed", data: nil)
+                                
+                                HapticFeedback().error()
                             })
                         case .decline:
                             let _ = self.context.engine.messages.declineUrlAuth(url: url).start()

submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoItemView.m

@@ -228,6 +228,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 
         UIView *scrubberBackgroundView = [[UIView alloc] initWithFrame:CGRectMake(0.0f, 0.0f, _headerView.frame.size.width, 64.0f)];
         scrubberBackgroundView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+        //scrubberBackgroundView.backgroundColor = [TGPhotoEditorInterfaceAssets toolbarTransparentBackgroundColor];
         [_scrubberPanelView addSubview:scrubberBackgroundView];
 
         _scrubberView = [[TGMediaPickerGalleryVideoScrubber alloc] initWithFrame:CGRectMake(0.0f, _headerView.frame.size.height - 44.0f, _headerView.frame.size.width, 68.0f) cover:false];
@@ -440,44 +441,31 @@ - (void)setItem:(TGMediaPickerGalleryVideoItem *)item synchronously:(bool)synchr
         [_contentWrapperView addSubview:_entitiesView];
     }
 
-    
     __weak TGMediaPickerGalleryVideoItemView *weakSelf = self;
-    
-    SSignal *durationSignal = item.durationSignal;
-    if (durationSignal != nil) {
-        [_videoDurationVar set:[[[durationSignal deliverOn:[SQueue mainQueue]] catch:^SSignal *(__unused id error)
+    [_videoDurationVar set:[[[item.durationSignal deliverOn:[SQueue mainQueue]] catch:^SSignal *(__unused id error)
+    {
+        __strong TGMediaPickerGalleryVideoItemView *strongSelf = weakSelf;
+        if (strongSelf != nil && [error isKindOfClass:[NSNumber class]])
+            [strongSelf _setDownloadRequired];
+        
+        return nil;
+    }] onNext:^(__unused id next)
+    {
+        __strong TGMediaPickerGalleryVideoItemView *strongSelf = weakSelf;
+        if (strongSelf != nil)
         {
-            __strong TGMediaPickerGalleryVideoItemView *strongSelf = weakSelf;
-            if (strongSelf != nil && [error isKindOfClass:[NSNumber class]])
-                [strongSelf _setDownloadRequired];
-            
-            return nil;
-        }] onNext:^(__unused id next)
-                                {
-            __strong TGMediaPickerGalleryVideoItemView *strongSelf = weakSelf;
-            if (strongSelf != nil)
-            {
-                strongSelf->_downloaded = true;
-                if (strongSelf->_currentAvailabilityObserver != nil)
-                    strongSelf->_currentAvailabilityObserver(true);
-            }
-        }]];
-    } else {
-        _downloaded = true;
-        if (_currentAvailabilityObserver != nil)
-            _currentAvailabilityObserver(true);
-    }
+            strongSelf->_downloaded = true;
+            if (strongSelf->_currentAvailabilityObserver != nil)
+                strongSelf->_currentAvailabilityObserver(true);
+        }
+    }]];
 
     SSignal *imageSignal = nil;
     if (item.asset != nil)
     {
         SSignal *assetSignal = [SSignal single:nil];
         if ([item.asset isKindOfClass:[TGMediaAsset class]])
         {
-            if (((TGMediaAsset *)item.asset).type == TGMediaAssetPhotoType) {
-                [_scrubberPanelView setHidden:true];
-            }
-            
             assetSignal = [TGMediaAssetImageSignals imageForAsset:(TGMediaAsset *)item.asset imageType:(item.immediateThumbnailImage != nil) ? TGMediaAssetImageTypeScreen : TGMediaAssetImageTypeFastScreen size:CGSizeMake(1280, 1280)];
         }
         else
@@ -753,7 +741,7 @@ - (bool)usePhotoBehavior
 - (bool)itemIsLivePhoto
 {
     if ([self.item.asset isKindOfClass:[TGMediaAsset class]])
-        return ((TGMediaAsset *)self.item.asset) ;
+        return ((TGMediaAsset *)self.item.asset).subtypes & TGMediaAssetSubtypePhotoLive;
 
     return false;
 }

submodules/TelegramUI/Components/AuthConfirmationScreen/BUILD

@@ -22,6 +22,7 @@ swift_library(
         "//submodules/TelegramPresentationData",
         "//submodules/AccountContext",
         "//submodules/TelegramUI/Components/ButtonComponent",
+        "//submodules/TelegramUI/Components/PlainButtonComponent",
         "//submodules/TelegramUI/Components/GlassBarButtonComponent",
         "//submodules/Components/SheetComponent",
         "//submodules/PresentationDataUtils",

submodules/TelegramUI/Components/AuthConfirmationScreen/Sources/AccountSwitchComponent.swift

@@ -15,19 +15,22 @@ final class AccountSwitchComponent: Component {
     let theme: PresentationTheme
     let peer: EnginePeer
     let canSwitch: Bool
+    let isVisible: Bool
     let action: ((GlassContextExtractableContainer) -> Void)
 
     init(
         context: AccountContext,
         theme: PresentationTheme,
         peer: EnginePeer,
         canSwitch: Bool,
+        isVisible: Bool,
         action: @escaping ((GlassContextExtractableContainer) -> Void)
     ) {
         self.context = context
         self.theme = theme
         self.peer = peer
         self.canSwitch = canSwitch
+        self.isVisible = isVisible
         self.action = action
     }
 
@@ -44,6 +47,9 @@ final class AccountSwitchComponent: Component {
         if lhs.canSwitch != rhs.canSwitch {
             return false
         }
+        if lhs.isVisible != rhs.isVisible {
+            return false
+        }
         return true
     }
 
@@ -116,7 +122,7 @@ final class AccountSwitchComponent: Component {
                 transition.setAlpha(view: arrowView, alpha: component.canSwitch ? 1.0 : 0.0)
             }
 
-            self.backgroundView.update(size: size, cornerRadius: size.height * 0.5, isDark: component.theme.overallDarkAppearance, tintColor: .init(kind: .panel), isInteractive: component.canSwitch, transition: transition)
+            self.backgroundView.update(size: size, cornerRadius: size.height * 0.5, isDark: component.theme.overallDarkAppearance, tintColor: .init(kind: .panel), isInteractive: component.canSwitch, isVisible: component.isVisible, transition: transition)
             transition.setFrame(view: self.backgroundView, frame: CGRect(origin: .zero, size: size))
             transition.setFrame(view: self.button, frame: CGRect(origin: .zero, size: size))