Răsfoiți Sursa

fix: encrypted graph

close #2691
Tienson Qin 4 ani în urmă
părinte
comite
73d141ed76

+ 2 - 1
src/main/frontend/components/encryption.cljs

@@ -161,7 +161,8 @@
                            (p/let [repo (state/get-current-repo)
                                    keys (e/decrypt-with-passphrase value db-encrypted-secret)]
                              (e/save-key-pair! repo keys)
-                             (close-fn true)))))}
+                             (close-fn true)
+                             (state/set-state! :encryption/graph-parsing? false)))))}
           "Submit"]]]])))
 
 (defn encryption-input-secret-dialog

+ 3 - 1
src/main/frontend/fs/watcher_handler.cljs

@@ -30,7 +30,9 @@
     (let [repo (config/get-local-repo dir)
           {:keys [mtime]} stat
           db-content (or (db/get-file repo path) "")]
-      (when (and content (not (encrypt/content-encrypted? content)))
+      (when (and content
+                 (not (encrypt/content-encrypted? content))
+                 (not (:encryption/graph-parsing? @state/state)))
         (cond
           (and (= "add" type)
                (not= (string/trim content) (string/trim db-content))

+ 1 - 0
src/main/frontend/handler/repo.cljs

@@ -256,6 +256,7 @@
           db-encrypted-secret (if db-encrypted? (:db/encrypted-secret metadata) nil)]
       (if db-encrypted?
         (let [close-fn #(parse-files-and-create-default-files! repo-url files delete-files delete-blocks file-paths first-clone? db-encrypted? re-render? re-render-opts metadata opts)]
+          (state/set-state! :encryption/graph-parsing? true)
           (state/pub-event! [:modal/encryption-input-secret-dialog repo-url
                              db-encrypted-secret
                              close-fn]))

+ 3 - 1
src/main/frontend/state.cljs

@@ -167,7 +167,9 @@
 
       :view/components {}
 
-      :debug/write-acks {}})))
+      :debug/write-acks {}
+
+      :encryption/graph-parsing? false})))
 
 
 (defn sub