bitwarden/mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile synced 2026-01-07 11:03:54 +00:00
Code Issues Releases Wiki Activity

PS-70 fixed scanner animation for android devices

Browse Source
This commit is contained in:
André Bispo
2022-06-22 10:57:39 +01:00
parent 3a91bc7eb1
commit 3522953b8c
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/App/Pages/Vault/ScanPage.xaml.cs
View File

@@ -69,7 +69,14 @@ namespace Bit.App.Pages
{
if (!autofocusCts.IsCancellationRequested)
{
_zxing.AutoFocus();
try
{
_zxing.AutoFocus();
}
catch (Exception ex)
{
_logger.Value.Exception(ex);
}
}
});
}
@@ -95,7 +102,7 @@ namespace Bit.App.Pages
base.OnDisappearing();
}
private void OnScanResult(ZXing.Result result)
private async void OnScanResult(ZXing.Result result)
{
// Stop analysis until we navigate away so we don't keep reading barcodes
_zxing.IsAnalyzing = false;
@@ -104,14 +111,8 @@ namespace Bit.App.Pages
{
if (text.StartsWith("otpauth://totp"))
{
Task.Run(async () =>
{
_qrcodeFound = true;
Vibration.Vibrate();
await Task.Delay(1000);
_zxing.IsScanning = false;
_callback(text);
});
await QRCodeFound();
_callback(text);
return;
}
else if (Uri.TryCreate(text, UriKind.Absolute, out Uri uri) &&
@@ -122,14 +123,8 @@ namespace Bit.App.Pages
{
if (part.StartsWith("secret="))
{
Task.Run(async () =>
{
_qrcodeFound = true;
Vibration.Vibrate();
await Task.Delay(1000);
_zxing.IsScanning = false;
_callback(part.Substring(7)?.ToUpperInvariant());
});
await QRCodeFound();
_callback(part.Substring(7)?.ToUpperInvariant());
return;
}
}
@@ -138,6 +133,14 @@ namespace Bit.App.Pages
_callback(null);
}
private async Task QRCodeFound()
{
_qrcodeFound = true;
Vibration.Vibrate();
await Task.Delay(1000);
_zxing.IsScanning = false;
}
private async void Close_Clicked(object sender, System.EventArgs e)
{
if (DoOnce())