mirror of
https://github.com/bitwarden/mobile
synced 2025-12-18 01:03:24 +00:00
Merge branch 'feature/maui-migration' into feature/maui-migration-passkeys
# Conflicts: # src/iOS.Autofill/iOS.Autofill.csproj
This commit is contained in:
@@ -17,6 +17,8 @@ using CoreFoundation;
|
||||
using CoreNFC;
|
||||
using Foundation;
|
||||
using Microsoft.Maui.ApplicationModel;
|
||||
using Microsoft.Maui.Controls;
|
||||
using Microsoft.Maui.Platform;
|
||||
using UIKit;
|
||||
|
||||
namespace Bit.iOS.Autofill
|
||||
@@ -313,7 +315,6 @@ namespace Bit.iOS.Autofill
|
||||
}
|
||||
}
|
||||
|
||||
#if !ENABLED_TAP_GESTURE_RECOGNIZER_MAUI_EMBEDDED_WORKAROUND
|
||||
public async void DismissLockAndContinue()
|
||||
{
|
||||
DismissViewController(false, async () => await OnLockDismissedAsync());
|
||||
@@ -327,7 +328,6 @@ namespace Bit.iOS.Autofill
|
||||
|
||||
PresentViewController(uiController, true, null);
|
||||
}
|
||||
#endif
|
||||
|
||||
public async Task OnLockDismissedAsync()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user