mirror of
https://github.com/bitwarden/android.git
synced 2024-12-24 01:48:25 +03:00
handle timers more appropriately
This commit is contained in:
parent
5bae15831b
commit
f092d4ffc3
3 changed files with 23 additions and 22 deletions
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<string name="AutoFillServiceSummary">
|
||||
Assist in filling username and password fields in other apps and on the web.
|
||||
Assist with filling username and password fields in other apps and on the web.
|
||||
</string>
|
||||
<string name="AutoFillServiceDescription">
|
||||
It can be difficult for users (especially those with disabilities) to switch between apps and copy/paste
|
||||
|
|
|
@ -169,19 +169,6 @@ namespace Bit.App.Pages
|
|||
};
|
||||
|
||||
ScrollView = new ScrollView { Content = DisabledStackLayout };
|
||||
|
||||
UpdateEnabled();
|
||||
Device.StartTimer(new TimeSpan(0, 0, 3), () =>
|
||||
{
|
||||
if(_pageDisappeared)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
UpdateEnabled();
|
||||
return true;
|
||||
});
|
||||
|
||||
Title = AppResources.AutofillAccessibilityService;
|
||||
Content = ScrollView;
|
||||
}
|
||||
|
@ -189,6 +176,19 @@ namespace Bit.App.Pages
|
|||
protected override void OnAppearing()
|
||||
{
|
||||
_pageDisappeared = false;
|
||||
UpdateEnabled();
|
||||
Device.StartTimer(new TimeSpan(0, 0, 3), () =>
|
||||
{
|
||||
System.Diagnostics.Debug.WriteLine("Check timer on accessibility");
|
||||
if(_pageDisappeared)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
UpdateEnabled();
|
||||
return true;
|
||||
});
|
||||
|
||||
base.OnAppearing();
|
||||
}
|
||||
|
||||
|
@ -200,7 +200,8 @@ namespace Bit.App.Pages
|
|||
|
||||
private void UpdateEnabled()
|
||||
{
|
||||
ScrollView.Content = _appInfoService.AutofillAccessibilityServiceEnabled ? EnabledStackLayout : DisabledStackLayout;
|
||||
ScrollView.Content = _appInfoService.AutofillAccessibilityServiceEnabled ?
|
||||
EnabledStackLayout : DisabledStackLayout;
|
||||
}
|
||||
|
||||
private Label BuildServiceLabel()
|
||||
|
|
|
@ -120,10 +120,17 @@ namespace Bit.App.Pages
|
|||
};
|
||||
|
||||
ScrollView = new ScrollView { Content = DisabledStackLayout };
|
||||
Title = AppResources.AutofillService;
|
||||
Content = ScrollView;
|
||||
}
|
||||
|
||||
protected override void OnAppearing()
|
||||
{
|
||||
_pageDisappeared = false;
|
||||
UpdateEnabled();
|
||||
Device.StartTimer(new TimeSpan(0, 0, 2), () =>
|
||||
{
|
||||
System.Diagnostics.Debug.WriteLine("Check timer on autofill");
|
||||
if(_pageDisappeared)
|
||||
{
|
||||
return false;
|
||||
|
@ -133,13 +140,6 @@ namespace Bit.App.Pages
|
|||
return true;
|
||||
});
|
||||
|
||||
Title = AppResources.AutofillService;
|
||||
Content = ScrollView;
|
||||
}
|
||||
|
||||
protected override void OnAppearing()
|
||||
{
|
||||
_pageDisappeared = false;
|
||||
base.OnAppearing();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue