Browse Source

fix: decrypt file content if there're diffs

Tienson Qin 4 years ago
parent
commit
5dd0b60f53
2 changed files with 4 additions and 2 deletions
  1. 2 1
      src/main/frontend/fs/nfs.cljs
  2. 2 1
      src/main/frontend/fs/node.cljs

+ 2 - 1
src/main/frontend/fs/nfs.cljs

@@ -176,7 +176,8 @@
                          (not (contains? #{"excalidraw" "edn"} ext))
                          (not (string/includes? path "/.recycle/"))
                          (zero? pending-writes))
-                      (state/pub-event! [:file/not-matched-from-disk path local-content content])
+                      (p/let [local-content (encrypt/decrypt local-content)]
+                        (state/pub-event! [:file/not-matched-from-disk path local-content content]))
                       (p/let [_ (verify-permission repo file-handle true)
                               _ (utils/writeFile file-handle content)
                               file (.getFile file-handle)]

+ 2 - 1
src/main/frontend/fs/node.cljs

@@ -69,7 +69,8 @@
           (when (util/electron?)
             (debug/set-ack-step! path :saved-successfully)
             (debug/ack-file-write! path))
-          (state/pub-event! [:file/not-matched-from-disk path disk-content content]))
+          (let [disk-content (encrypt/decrypt disk-content)]
+            (state/pub-event! [:file/not-matched-from-disk path disk-content content])))
 
         :else
         (->