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

null check on key retrievals

Browse source
This commit is contained in:
Kyle Spearrin 2017-04-20 14:23:58 -04:00
parent 8cf25d3602
commit 0d9ba92db4
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/App/Services/CryptoService.cs
View file

@ -39,9 +39,13 @@ namespace Bit.App.Services
{ {
get get
{ {
if(_key == null) if(_key == null && _secureStorage.Contains(KeyKey))
{ {
_key = new CryptoKey(_secureStorage.Retrieve(KeyKey)); var keyBytes = _secureStorage.Retrieve(KeyKey);
if(keyBytes != null)
{
_key = new CryptoKey(keyBytes);
}
} }
return _key; return _key;
@ -66,9 +70,13 @@ namespace Bit.App.Services
{ {
get get
{ {
if(_previousKey == null) if(_previousKey == null && _secureStorage.Contains(PreviousKeyKey))
{ {
_previousKey = new CryptoKey(_secureStorage.Retrieve(PreviousKeyKey)); var keyBytes = _secureStorage.Retrieve(PreviousKeyKey);
if(keyBytes != null)
{
_previousKey = new CryptoKey(keyBytes);
}
} }
return _previousKey; return _previousKey;
@ -105,7 +113,7 @@ namespace Bit.App.Services
{ {
get get
{ {
if(_privateKey == null) if(_privateKey == null && _secureStorage.Contains(PrivateKeyKey))
{ {
_privateKey = _secureStorage.Retrieve(PrivateKeyKey); _privateKey = _secureStorage.Retrieve(PrivateKeyKey);
} }