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

Convert everything back to UTC since thats now settings plugin stores them. Move sync page ToLocalTime conversion.

Browse source
This commit is contained in:
Kyle Spearrin 2016-08-02 00:32:57 -04:00
parent 625be7fdd4
commit 2947809d78
8 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/App/App.cs
View file

@ -95,7 +95,7 @@ namespace Bit.App
if(Device.OS == TargetPlatform.Android) if(Device.OS == TargetPlatform.Android)
{ {
_settings.AddOrUpdateValue(Constants.SettingLastBackgroundedDate, DateTime.Now); _settings.AddOrUpdateValue(Constants.SettingLastBackgroundedDate, DateTime.UtcNow);
} }
} }

2
src/App/Pages/Settings/SettingsSyncPage.cs
View file

@ -71,7 +71,7 @@ namespace Bit.App.Pages
private void SetLastSync() private void SetLastSync()
{ {
var lastSyncDate = _settings.GetValueOrDefault<DateTime?>(Constants.SettingLastSync); var lastSyncDate = _settings.GetValueOrDefault<DateTime?>(Constants.SettingLastSync);
LastSyncLabel.Text = "Last Sync: " + lastSyncDate?.ToString() ?? "Never"; LastSyncLabel.Text = "Last Sync: " + lastSyncDate?.ToLocalTime().ToString() ?? "Never";
} }
public async Task SyncAsync() public async Task SyncAsync()

2
src/App/Pages/Vault/VaultListSitesPage.cs
View file

@ -158,7 +158,7 @@ namespace Bit.App.Pages
Action registerAction = () => Action registerAction = () =>
{ {
var lastPushRegistration = _settings.GetValueOrDefault<DateTime?>(Constants.PushLastRegistrationDate); var lastPushRegistration = _settings.GetValueOrDefault<DateTime?>(Constants.PushLastRegistrationDate);
if(!pushPromptShow || !lastPushRegistration.HasValue || (DateTime.Now - lastPushRegistration) > TimeSpan.FromDays(1)) if(!pushPromptShow || !lastPushRegistration.HasValue || (DateTime.UtcNow - lastPushRegistration) > TimeSpan.FromDays(1))
{ {
_pushNotification.Register(); _pushNotification.Register();
} }

2
src/App/Services/LockService.cs
View file

@ -41,7 +41,7 @@ namespace Bit.App.Services
} }
// Has it been longer than lockSeconds since the last time the app was backgrounded? // Has it been longer than lockSeconds since the last time the app was backgrounded?
var now = DateTime.Now; var now = DateTime.UtcNow;
var lastBackground = _settings.GetValueOrDefault(Constants.SettingLastBackgroundedDate, now.AddYears(-1)); var lastBackground = _settings.GetValueOrDefault(Constants.SettingLastBackgroundedDate, now.AddYears(-1));
if((now - lastBackground).TotalSeconds < lockSeconds) if((now - lastBackground).TotalSeconds < lockSeconds)
{ {

2
src/App/Services/PushNotificationListener.cs
View file

@ -87,7 +87,7 @@ namespace Bit.App.Services
if(response.Succeeded) if(response.Succeeded)
{ {
Debug.WriteLine("Registered device with server."); Debug.WriteLine("Registered device with server.");
_settings.AddOrUpdateValue(Constants.PushLastRegistrationDate, DateTime.Now); _settings.AddOrUpdateValue(Constants.PushLastRegistrationDate, DateTime.UtcNow);
} }
else else
{ {

6
src/App/Services/SyncService.cs
View file

@ -135,7 +135,7 @@ namespace Bit.App.Services
SyncStarted(); SyncStarted();
var now = DateTime.Now; var now = DateTime.UtcNow;
var ciphers = await _cipherApiRepository.GetAsync(); var ciphers = await _cipherApiRepository.GetAsync();
if(!ciphers.Succeeded) if(!ciphers.Succeeded)
{ {
@ -168,7 +168,7 @@ namespace Bit.App.Services
public async Task<bool> IncrementalSyncAsync(TimeSpan syncThreshold) public async Task<bool> IncrementalSyncAsync(TimeSpan syncThreshold)
{ {
DateTime? lastSync = _settings.GetValueOrDefault<DateTime?>(Constants.SettingLastSync); DateTime? lastSync = _settings.GetValueOrDefault<DateTime?>(Constants.SettingLastSync);
if(lastSync != null && DateTime.Now - lastSync.Value < syncThreshold) if(lastSync != null && DateTime.UtcNow - lastSync.Value < syncThreshold)
{ {
return false; return false;
} }
@ -183,7 +183,7 @@ namespace Bit.App.Services
return false; return false;
} }
var now = DateTime.Now; var now = DateTime.UtcNow;
DateTime? lastSync = _settings.GetValueOrDefault<DateTime?>(Constants.SettingLastSync); DateTime? lastSync = _settings.GetValueOrDefault<DateTime?>(Constants.SettingLastSync);
if(lastSync == null) if(lastSync == null)
{ {

2
src/iOS.Extension/SiteListViewController.cs
View file

@ -163,7 +163,7 @@ namespace Bit.iOS.Extension
return; return;
} }
Resolver.Resolve<ISettings>().AddOrUpdateValue(App.Constants.SettingLastBackgroundedDate, DateTime.Now); Resolver.Resolve<ISettings>().AddOrUpdateValue(App.Constants.SettingLastBackgroundedDate, DateTime.UtcNow);
var item = _tableItems.ElementAt(indexPath.Row); var item = _tableItems.ElementAt(indexPath.Row);
if(item == null) if(item == null)

2
src/iOS/AppDelegate.cs
View file

@ -138,7 +138,7 @@ namespace Bit.iOS
// Log the date/time we last backgrounded // Log the date/time we last backgrounded
Settings.AddOrUpdateValue(Bit.App.Constants.SettingLastBackgroundedDate, DateTime.Now); Settings.AddOrUpdateValue(Bit.App.Constants.SettingLastBackgroundedDate, DateTime.UtcNow);
base.DidEnterBackground(uiApplication); base.DidEnterBackground(uiApplication);
Debug.WriteLine("DidEnterBackground"); Debug.WriteLine("DidEnterBackground");