Upstream/bitwarden-mobile
1
0
Fork 0
mirror of https://github.com/bitwarden/mobile.git synced 2024-09-28 03:57:43 +02:00
Code Issues Projects Releases Wiki Activity

fix for incorrect times during Send creation (#1313)

Browse Source
This commit is contained in:
Matt Portune 2021-03-11 20:52:35 -05:00 committed by GitHub
parent 5cee71ce8a
commit d0e424abd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/App/Pages/Send/SendAddEditPageViewModel.cs
View File

@ -29,8 +29,10 @@ namespace Bit.App.Pages
private bool _showPassword; private bool _showPassword;
private int _deletionDateTypeSelectedIndex; private int _deletionDateTypeSelectedIndex;
private int _expirationDateTypeSelectedIndex; private int _expirationDateTypeSelectedIndex;
private DateTime _simpleDeletionDateTime;
private DateTime _deletionDate; private DateTime _deletionDate;
private TimeSpan _deletionTime; private TimeSpan _deletionTime;
private DateTime? _simpleExpirationDateTime;
private DateTime? _expirationDate; private DateTime? _expirationDate;
private TimeSpan? _expirationTime; private TimeSpan? _expirationTime;
private bool _isOverridingPickers; private bool _isOverridingPickers;
@ -220,7 +222,9 @@ namespace Bit.App.Pages
} }
Send = await send.DecryptAsync(); Send = await send.DecryptAsync();
DeletionDate = Send.DeletionDate.ToLocalTime(); DeletionDate = Send.DeletionDate.ToLocalTime();
DeletionTime = DeletionDate.TimeOfDay;
ExpirationDate = Send.ExpirationDate?.ToLocalTime(); ExpirationDate = Send.ExpirationDate?.ToLocalTime();
ExpirationTime = ExpirationDate?.TimeOfDay;
} }
else else
{ {
@ -229,13 +233,13 @@ namespace Bit.App.Pages
{ {
Type = Type.GetValueOrDefault(defaultType), Type = Type.GetValueOrDefault(defaultType),
}; };
_deletionDate = DateTimeNow().AddDays(7);
_deletionTime = DeletionDate.TimeOfDay;
DeletionDateTypeSelectedIndex = 4; DeletionDateTypeSelectedIndex = 4;
ExpirationDateTypeSelectedIndex = 0; ExpirationDateTypeSelectedIndex = 0;
} }
MaxAccessCount = Send.MaxAccessCount; MaxAccessCount = Send.MaxAccessCount;
DeletionTime = DeletionDate.TimeOfDay;
ExpirationTime = ExpirationDate?.TimeOfDay;
_isOverridingPickers = false; _isOverridingPickers = false;
} }
@ -270,20 +274,17 @@ namespace Bit.App.Pages
} }
else else
{ {
Send.DeletionDate = DeletionDate.ToUniversalTime(); Send.DeletionDate = _simpleDeletionDateTime.ToUniversalTime();
} }
// expiration date // expiration date
if (ExpirationDate.HasValue) if (ShowExpirationCustomPickers && ExpirationDate.HasValue && ExpirationTime.HasValue)
{ {
if (ShowExpirationCustomPickers && ExpirationTime.HasValue) Send.ExpirationDate = ExpirationDate.Value.Date.Add(ExpirationTime.Value).ToUniversalTime();
{ }
Send.ExpirationDate = ExpirationDate.Value.Date.Add(ExpirationTime.Value).ToUniversalTime(); else if (_simpleExpirationDateTime.HasValue)
} {
else Send.ExpirationDate = _simpleExpirationDateTime.Value.ToUniversalTime();
{
Send.ExpirationDate = ExpirationDate.Value.ToUniversalTime();
}
} }
else else
{ {
@ -436,26 +437,27 @@ namespace Bit.App.Pages
switch (DeletionDateTypeSelectedIndex) switch (DeletionDateTypeSelectedIndex)
{ {
case 0: case 0:
DeletionDate = DateTimeNow().AddHours(1); _simpleDeletionDateTime = DateTimeNow().AddHours(1);
break; break;
case 1: case 1:
DeletionDate = DateTimeNow().AddDays(1); _simpleDeletionDateTime = DateTimeNow().AddDays(1);
break; break;
case 2: case 2:
DeletionDate = DateTimeNow().AddDays(2); _simpleDeletionDateTime = DateTimeNow().AddDays(2);
break; break;
case 3: case 3:
DeletionDate = DateTimeNow().AddDays(3); _simpleDeletionDateTime = DateTimeNow().AddDays(3);
break; break;
case 4: case 4:
case 6: _simpleDeletionDateTime = DateTimeNow().AddDays(7);
DeletionDate = DateTimeNow().AddDays(7);
break; break;
case 5: case 5:
DeletionDate = DateTimeNow().AddDays(30); _simpleDeletionDateTime = DateTimeNow().AddDays(30);
break;
case 6:
// custom option, initial values already set elsewhere
break; break;
} }
DeletionTime = DeletionDate.TimeOfDay;
_isOverridingPickers = false; _isOverridingPickers = false;
TriggerPropertyChanged(nameof(ShowDeletionCustomPickers)); TriggerPropertyChanged(nameof(ShowDeletionCustomPickers));
} }
@ -469,33 +471,29 @@ namespace Bit.App.Pages
switch (ExpirationDateTypeSelectedIndex) switch (ExpirationDateTypeSelectedIndex)
{ {
case 0: case 0:
ClearExpirationDate(); _simpleExpirationDateTime = null;
break; break;
case 1: case 1:
ExpirationDate = DateTimeNow().AddHours(1); _simpleExpirationDateTime = DateTimeNow().AddHours(1);
ExpirationTime = ExpirationDate.Value.TimeOfDay;
break; break;
case 2: case 2:
ExpirationDate = DateTimeNow().AddDays(1); _simpleExpirationDateTime = DateTimeNow().AddDays(1);
ExpirationTime = ExpirationDate.Value.TimeOfDay;
break; break;
case 3: case 3:
ExpirationDate = DateTimeNow().AddDays(2); _simpleExpirationDateTime = DateTimeNow().AddDays(2);
ExpirationTime = ExpirationDate.Value.TimeOfDay;
break; break;
case 4: case 4:
ExpirationDate = DateTimeNow().AddDays(3); _simpleExpirationDateTime = DateTimeNow().AddDays(3);
ExpirationTime = ExpirationDate.Value.TimeOfDay;
break; break;
case 5: case 5:
ExpirationDate = DateTimeNow().AddDays(7); _simpleExpirationDateTime = DateTimeNow().AddDays(7);
ExpirationTime = ExpirationDate.Value.TimeOfDay;
break; break;
case 6: case 6:
ExpirationDate = DateTimeNow().AddDays(30); _simpleExpirationDateTime = DateTimeNow().AddDays(30);
ExpirationTime = ExpirationDate.Value.TimeOfDay;
break; break;
case 7: case 7:
// custom option, clear all expiration values
_simpleExpirationDateTime = null;
ClearExpirationDate(); ClearExpirationDate();
break; break;
} }

2
src/App/Resources/AppResources.resx
View File

@ -1901,7 +1901,7 @@
<comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment> <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
</data> </data>
<data name="NoSends" xml:space="preserve"> <data name="NoSends" xml:space="preserve">
<value>There are no sends in your account.</value> <value>There are no Sends in your account.</value>
<comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment> <comment>'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated.</comment>
</data> </data>
<data name="CopyLink" xml:space="preserve"> <data name="CopyLink" xml:space="preserve">