From a796ef5c664c5f7aa99e13d08b199e22eae7ae0f Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Fri, 16 Feb 2018 17:55:50 +0000 Subject: [PATCH] All: Fixed: Notify DecryptionWorker when item added due to conflict, to make sure it is decrypted as early as possible --- ReactNativeClient/lib/synchronizer.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ReactNativeClient/lib/synchronizer.js b/ReactNativeClient/lib/synchronizer.js index d1beaa5e35..dd76e74ba0 100644 --- a/ReactNativeClient/lib/synchronizer.js +++ b/ReactNativeClient/lib/synchronizer.js @@ -378,6 +378,8 @@ class Synchronizer { local = remoteContent; const syncTimeQueries = BaseItem.updateSyncTimeQueries(syncTargetId, local, time.unixMs()); await ItemClass.save(local, { autoTimestamp: false, nextQueries: syncTimeQueries }); + + if (!!local.encryption_applied) this.dispatch({ type: 'SYNC_GOT_ENCRYPTED_ITEM' }); } else { // Remote no longer exists (note deleted) so delete local one too await ItemClass.delete(local.id);