diff --git a/src/Android/MainActivity.cs b/src/Android/MainActivity.cs index f4fc640d0..566ff378f 100644 --- a/src/Android/MainActivity.cs +++ b/src/Android/MainActivity.cs @@ -44,6 +44,7 @@ namespace Bit.Droid private IAppIdService _appIdService; private IEventService _eventService; private IPushNotificationListenerService _pushNotificationListenerService; + private IVaultTimeoutService _vaultTimeoutService; private ILogger _logger; private PendingIntent _eventUploadPendingIntent; private AppOptions _appOptions; @@ -68,6 +69,7 @@ namespace Bit.Droid _appIdService = ServiceContainer.Resolve("appIdService"); _eventService = ServiceContainer.Resolve("eventService"); _pushNotificationListenerService = ServiceContainer.Resolve(); + _vaultTimeoutService = ServiceContainer.Resolve(); _logger = ServiceContainer.Resolve("logger"); TabLayoutResource = Resource.Layout.Tabbar; @@ -232,6 +234,7 @@ namespace Bit.Droid protected override void OnActivityResult(int requestCode, Result resultCode, Intent data) { + _vaultTimeoutService.ResetTimeoutDelay = true; if (resultCode == Result.Ok && (requestCode == Core.Constants.SelectFileRequestCode || requestCode == Core.Constants.SaveFileRequestCode)) { diff --git a/src/Android/Properties/AndroidManifest.xml b/src/Android/Properties/AndroidManifest.xml index 5e0839872..77372ff73 100644 --- a/src/Android/Properties/AndroidManifest.xml +++ b/src/Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + diff --git a/src/App/App.xaml.cs b/src/App/App.xaml.cs index aa839370b..a3deede96 100644 --- a/src/App/App.xaml.cs +++ b/src/App/App.xaml.cs @@ -297,7 +297,7 @@ namespace Bit.App { await _vaultTimeoutService.CheckVaultTimeoutAsync(); // Reset delay on every start - _vaultTimeoutService.DelayLockAndLogoutMs = null; + _vaultTimeoutService.DelayTimeoutMs = null; } await _configService.GetAsync(); diff --git a/src/App/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml b/src/App/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml index 59d05d14c..2ed17144d 100644 --- a/src/App/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml +++ b/src/App/Lists/ItemLayouts/CustomFields/HiddenCustomFieldItemLayout.xaml @@ -54,7 +54,9 @@ IsPassword="{Binding ShowHiddenValue, Converter={StaticResource inverseBool}}" IsEnabled="{Binding ShowViewHidden}" IsSpellCheckEnabled="False" - IsTextPredictionEnabled="False"> + IsTextPredictionEnabled="False" + AutomationProperties.IsInAccessibleTree="True" + AutomationProperties.Name="{Binding Field.Name}"> diff --git a/src/App/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml b/src/App/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml index a5d3239b0..238fbe0ab 100644 --- a/src/App/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml +++ b/src/App/Lists/ItemLayouts/CustomFields/TextCustomFieldItemLayout.xaml @@ -41,7 +41,9 @@ StyleClass="box-value" Grid.Row="1" Grid.Column="0" - IsVisible="{Binding IsEditing}" /> + IsVisible="{Binding IsEditing}" + AutomationProperties.IsInAccessibleTree="True" + AutomationProperties.Name="{Binding Field.Name}" /> + ReturnCommand="{Binding SubmitCommand}" + AutomationId="ServerUrlEntry"/>