1
0
mirror of https://github.com/Kopano-dev/kopano-ol-extension.git synced 2023-10-10 13:37:40 +02:00

Added extra null checks for sync data and sharing public folder

This commit is contained in:
Patrick Simpson 2017-10-18 16:20:24 +03:00
parent 57244e8be1
commit 89cb450bb2
2 changed files with 23 additions and 17 deletions

View File

@ -356,6 +356,8 @@ namespace Acacia.Features.SyncState
HashSet<string> syncingNow = new HashSet<string>(); HashSet<string> syncingNow = new HashSet<string>();
// Check all syncing data // Check all syncing data
if (details.Content != null)
{
foreach (KeyValuePair<string, DeviceDetails.ContentData> contentEntry in details.Content) foreach (KeyValuePair<string, DeviceDetails.ContentData> contentEntry in details.Content)
{ {
DeviceDetails.ContentData content = contentEntry.Value; DeviceDetails.ContentData content = contentEntry.Value;
@ -379,6 +381,7 @@ namespace Acacia.Features.SyncState
content.Key, content.IsSyncing, content.Sync.done, content.Sync.total)); content.Key, content.IsSyncing, content.Sync.done, content.Sync.total));
} }
} }
}
// Clean up any done items // Clean up any done items
bool _syncingNow = false; bool _syncingNow = false;

View File

@ -81,6 +81,9 @@ namespace Acacia.ZPush
if (result != null && result != contact) if (result != null && result != contact)
result.Dispose(); result.Dispose();
if (contact == null)
return null;
return new ContactStringReplacer(contact); return new ContactStringReplacer(contact);
} }