devol
/
Bitwarden-app-android-iphone-ios
mirror of https://github.com/bitwarden/mobile
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

catch sql crashes in sync service

This commit is contained in:
Kyle Spearrin 2017-03-11 12:26:10 -05:00
parent ac6e95c442
commit 82d4745da3
1 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
src/App/Services/SyncService.cs
View File

@ -73,35 +73,27 @@ namespace Bit.App.Services
return false; return false;
} }
switch(cipher.Result.Type) try
{ {
case Enums.CipherType.Folder: switch(cipher.Result.Type)
var folderData = new FolderData(cipher.Result, _authService.UserId); {
var existingLocalFolder = _folderRepository.GetByIdAsync(id); case Enums.CipherType.Folder:
if(existingLocalFolder == null) var folderData = new FolderData(cipher.Result, _authService.UserId);
{ await _folderRepository.UpsertAsync(folderData).ConfigureAwait(false);
await _folderRepository.InsertAsync(folderData).ConfigureAwait(false); break;
} case Enums.CipherType.Login:
else var loginData = new LoginData(cipher.Result, _authService.UserId);
{ await _loginRepository.UpsertAsync(loginData).ConfigureAwait(false);
await _folderRepository.UpdateAsync(folderData).ConfigureAwait(false); break;
} default:
break; SyncCompleted(false);
case Enums.CipherType.Login: return false;
var loginData = new LoginData(cipher.Result, _authService.UserId); }
var existingLocalLogin = _loginRepository.GetByIdAsync(id); }
if(existingLocalLogin == null) catch(SQLite.SQLiteException)
{ {
await _loginRepository.InsertAsync(loginData).ConfigureAwait(false); SyncCompleted(false);
} return false;
else
{
await _loginRepository.UpdateAsync(loginData).ConfigureAwait(false);
}
break;
default:
SyncCompleted(false);
return false;
} }
SyncCompleted(true); SyncCompleted(true);
@ -117,9 +109,17 @@ namespace Bit.App.Services
SyncStarted(); SyncStarted();
await _folderRepository.DeleteWithLoginUpdateAsync(id, revisionDate).ConfigureAwait(false); try
SyncCompleted(true); {
return true; await _folderRepository.DeleteWithLoginUpdateAsync(id, revisionDate).ConfigureAwait(false);
SyncCompleted(true);
return true;
}
catch(SQLite.SQLiteException)
{
SyncCompleted(false);
return false;
}
} }
public async Task<bool> SyncDeleteLoginAsync(string id) public async Task<bool> SyncDeleteLoginAsync(string id)
@ -131,9 +131,17 @@ namespace Bit.App.Services
SyncStarted(); SyncStarted();
await _loginRepository.DeleteAsync(id).ConfigureAwait(false); try
SyncCompleted(true); {
return true; await _loginRepository.DeleteAsync(id).ConfigureAwait(false);
SyncCompleted(true);
return true;
}
catch(SQLite.SQLiteException)
{
SyncCompleted(false);
return false;
}
} }
public async Task<bool> FullSyncAsync(TimeSpan syncThreshold, bool forceSync = false) public async Task<bool> FullSyncAsync(TimeSpan syncThreshold, bool forceSync = false)
@ -188,8 +196,8 @@ namespace Bit.App.Services
var logins = ciphers.Result.Data.Where(c => c.Type == Enums.CipherType.Login).ToDictionary(s => s.Id); var logins = ciphers.Result.Data.Where(c => c.Type == Enums.CipherType.Login).ToDictionary(s => s.Id);
var folders = ciphers.Result.Data.Where(c => c.Type == Enums.CipherType.Folder).ToDictionary(f => f.Id); var folders = ciphers.Result.Data.Where(c => c.Type == Enums.CipherType.Folder).ToDictionary(f => f.Id);
var loginTask = SyncLoginsAsync(logins, true); var loginTask = SyncLoginsAsync(logins);
var folderTask = SyncFoldersAsync(folders, true); var folderTask = SyncFoldersAsync(folders);
var domainsTask = SyncDomainsAsync(domains.Result); var domainsTask = SyncDomainsAsync(domains.Result);
await Task.WhenAll(loginTask, folderTask, domainsTask).ConfigureAwait(false); await Task.WhenAll(loginTask, folderTask, domainsTask).ConfigureAwait(false);
@ -228,7 +236,7 @@ namespace Bit.App.Services
return false; return false;
} }
private async Task SyncFoldersAsync(IDictionary<string, CipherResponse> serverFolders, bool deleteMissing) private async Task SyncFoldersAsync(IDictionary<string, CipherResponse> serverFolders)
{ {
if(!_authService.IsAuthenticated) if(!_authService.IsAuthenticated)
{ {
@ -245,31 +253,25 @@ namespace Bit.App.Services
return; return;
} }
var existingLocalFolder = localFolders.ContainsKey(serverFolder.Key) ? localFolders[serverFolder.Key] : null; try
if(existingLocalFolder == null)
{ {
var data = new FolderData(serverFolder.Value, _authService.UserId); var data = new FolderData(serverFolder.Value, _authService.UserId);
await _folderRepository.InsertAsync(data).ConfigureAwait(false); await _folderRepository.UpsertAsync(data).ConfigureAwait(false);
} }
else if(existingLocalFolder.RevisionDateTime != serverFolder.Value.RevisionDate) catch(SQLite.SQLiteException) { }
{
var data = new FolderData(serverFolder.Value, _authService.UserId);
await _folderRepository.UpdateAsync(data).ConfigureAwait(false);
}
}
if(!deleteMissing)
{
return;
} }
foreach(var folder in localFolders.Where(localFolder => !serverFolders.ContainsKey(localFolder.Key))) foreach(var folder in localFolders.Where(localFolder => !serverFolders.ContainsKey(localFolder.Key)))
{ {
await _folderRepository.DeleteAsync(folder.Value.Id).ConfigureAwait(false); try
{
await _folderRepository.DeleteAsync(folder.Value.Id).ConfigureAwait(false);
}
catch(SQLite.SQLiteException) { }
} }
} }
private async Task SyncLoginsAsync(IDictionary<string, CipherResponse> serverLogins, bool deleteMissing) private async Task SyncLoginsAsync(IDictionary<string, CipherResponse> serverLogins)
{ {
if(!_authService.IsAuthenticated) if(!_authService.IsAuthenticated)
{ {
@ -286,27 +288,21 @@ namespace Bit.App.Services
return; return;
} }
var existingLocalLogin = localLogins.ContainsKey(serverLogin.Key) ? localLogins[serverLogin.Key] : null; try
if(existingLocalLogin == null)
{ {
var data = new LoginData(serverLogin.Value, _authService.UserId); var data = new LoginData(serverLogin.Value, _authService.UserId);
await _loginRepository.InsertAsync(data).ConfigureAwait(false); await _loginRepository.UpsertAsync(data).ConfigureAwait(false);
} }
else if(existingLocalLogin.RevisionDateTime != serverLogin.Value.RevisionDate) catch(SQLite.SQLiteException) { }
{
var data = new LoginData(serverLogin.Value, _authService.UserId);
await _loginRepository.UpdateAsync(data).ConfigureAwait(false);
}
}
if(!deleteMissing)
{
return;
} }
foreach(var login in localLogins.Where(localLogin => !serverLogins.ContainsKey(localLogin.Key))) foreach(var login in localLogins.Where(localLogin => !serverLogins.ContainsKey(localLogin.Key)))
{ {
await _loginRepository.DeleteAsync(login.Value.Id).ConfigureAwait(false); try
{
await _loginRepository.DeleteAsync(login.Value.Id).ConfigureAwait(false);
}
catch(SQLite.SQLiteException) { }
} }
} }
@ -323,11 +319,15 @@ namespace Bit.App.Services
eqDomains.AddRange(serverDomains.GlobalEquivalentDomains.Select(d => d.Domains)); eqDomains.AddRange(serverDomains.GlobalEquivalentDomains.Select(d => d.Domains));
} }
await _settingsRepository.UpsertAsync(new SettingsData try
{ {
Id = _authService.UserId, await _settingsRepository.UpsertAsync(new SettingsData
EquivalentDomains = JsonConvert.SerializeObject(eqDomains) {
}); Id = _authService.UserId,
EquivalentDomains = JsonConvert.SerializeObject(eqDomains)
});
}
catch(SQLite.SQLiteException) { }
} }
private void SyncStarted() private void SyncStarted()