mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-26 19:08:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

[SG-690] DateTime to Utc fix (#2115)

Browse source 
* [SG-690] DateTime to Utc fix

* [SG-690] Removed Utc from server side datetime.
This commit is contained in:
André Bispo 2022-10-05 01:40:28 +01:00 committed by GitHub
parent c1101af582
commit 1e5eab0574
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/App/App.xaml.cs
View file

@ -189,7 +189,7 @@ namespace Bit.App
}); });
await _stateService.SetPasswordlessLoginNotificationAsync(null); await _stateService.SetPasswordlessLoginNotificationAsync(null);
_pushNotificationService.DismissLocalNotification(Constants.PasswordlessNotificationId); _pushNotificationService.DismissLocalNotification(Constants.PasswordlessNotificationId);
if (loginRequestData.CreationDate.AddMinutes(Constants.PasswordlessNotificationTimeoutInMinutes) > DateTime.Now) if (loginRequestData.CreationDate.AddMinutes(Constants.PasswordlessNotificationTimeoutInMinutes) > DateTime.UtcNow)
{ {
await Device.InvokeOnMainThreadAsync(() => Application.Current.MainPage.Navigation.PushModalAsync(new NavigationPage(page))); await Device.InvokeOnMainThreadAsync(() => Application.Current.MainPage.Navigation.PushModalAsync(new NavigationPage(page)));
} }

4
src/App/Pages/Accounts/LoginPasswordlessViewModel.cs
View file

@ -100,7 +100,7 @@ namespace Bit.App.Pages
private async Task UpdateRequestTime() private async Task UpdateRequestTime()
{ {
TriggerPropertyChanged(nameof(TimeOfRequestText)); TriggerPropertyChanged(nameof(TimeOfRequestText));
if (DateTime.UtcNow > LoginRequest?.RequestDate.ToUniversalTime().AddMinutes(Constants.PasswordlessNotificationTimeoutInMinutes)) if (DateTime.UtcNow > LoginRequest?.RequestDate.AddMinutes(Constants.PasswordlessNotificationTimeoutInMinutes))
{ {
StopRequestTimeUpdater(); StopRequestTimeUpdater();
await _platformUtilsService.ShowDialogAsync(AppResources.LoginRequestHasAlreadyExpired); await _platformUtilsService.ShowDialogAsync(AppResources.LoginRequestHasAlreadyExpired);
@ -110,7 +110,7 @@ namespace Bit.App.Pages
private async Task PasswordlessLoginAsync(bool approveRequest) private async Task PasswordlessLoginAsync(bool approveRequest)
{ {
if (LoginRequest.RequestDate.AddMinutes(Constants.PasswordlessNotificationTimeoutInMinutes) <= DateTime.Now) if (LoginRequest.RequestDate.AddMinutes(Constants.PasswordlessNotificationTimeoutInMinutes) <= DateTime.UtcNow)
{ {
await _platformUtilsService.ShowDialogAsync(AppResources.LoginRequestHasAlreadyExpired); await _platformUtilsService.ShowDialogAsync(AppResources.LoginRequestHasAlreadyExpired);
await Page.Navigation.PopModalAsync(); await Page.Navigation.PopModalAsync();