mobile: add editor lock safety

apps/mobile/app/screens/editor/tiptap/use-editor.ts

@@ -145,8 +145,9 @@ export const useEditor = (
 
   useEffect(() => {
     const event = eSubscribeEvent(eEditorTabFocused, (tabId) => {
+      console.log("Editot tab focus changed", lastTabFocused.current, tabId);
+      if (lastTabFocused.current !== tabId) lock.current = false;
       lastTabFocused.current = tabId as number;
-      console.log(tabId);
     });
     return () => {
       event?.unsubscribe();
@@ -573,6 +574,8 @@ export const useEditor = (
       data: Note | ContentItem | TrashItem | DeletedItem,
       isLocal?: boolean
     ) => {
+      try {
+        await (async () => {
           if (SettingsService.get().disableRealtimeSync && !isLocal) return;
           if (!data) return;
 
@@ -596,7 +599,8 @@ export const useEditor = (
 
           const tab = useTabStore.getState().getTab(tabId);
 
-      const note = data.type === "note" ? data : await db.notes?.note(noteId);
+          const note =
+            data.type === "note" ? data : await db.notes?.note(noteId);
 
           lock.current = true;
 
@@ -654,12 +658,14 @@ export const useEditor = (
 
           if (data.type === "tiptap" && note && !isLocal) {
             if (lastContentChangeTime.current[noteId] >= data.dateEdited) {
-          lock.current = false;
               return;
             }
 
             if (locked && isEncryptedContent(data)) {
-          const decryptedContent = await db.vault?.decryptContent(data);
+              const decryptedContent = await db.vault?.decryptContent(
+                data,
+                noteId
+              );
               if (!decryptedContent) {
                 useTabStore.getState().updateTab(tabId, {
                   locked: true,
@@ -680,17 +686,22 @@ export const useEditor = (
             } else {
               const _nextContent = data.data;
               if (_nextContent === currentContents.current?.data) {
-            lock.current = false;
                 return;
               }
               lastContentChangeTime.current[note.id] = note.dateEdited;
               await postMessage(EditorEvents.updatehtml, _nextContent, tabId);
               if (!isEncryptedContent(data)) {
-            currentContents.current[note.id] = data as UnencryptedContentItem;
+                currentContents.current[note.id] =
+                  data as UnencryptedContentItem;
               }
             }
           }
+        })();
+      } catch (e) {
+        DatabaseLogger.error(e as Error, "Error when applying sync changes");
+      } finally {
         lock.current = false;
+      }
     },
     [postMessage, commands]
   );
@@ -728,11 +739,19 @@ export const useEditor = (
         (currentLoadingNoteId.current &&
           currentLoadingNoteId.current === noteId)
       ) {
-        DatabaseLogger.log(`Skipped saving conent:
+        DatabaseLogger.log(`Skipped saving content:
 
           lock.current: ${lock.current}
           currentLoadingNoteId.current: ${currentLoadingNoteId.current}
         `);
+        if (lock.current) {
+          setTimeout(() => {
+            if (lock.current) {
+              DatabaseLogger.warn("Editor force removed lock after 5 seconds");
+              lock.current = false;
+            }
+          }, 5000);
+        }
         return;
       }
 

apps/mobile/native/ios/Podfile.lock

@@ -958,4 +958,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 2b8b28a341b202bf3ca5f231b75bb05893486ed8
 
-COCOAPODS: 1.14.2
+COCOAPODS: 1.12.1

packages/editor-mobile/src/hooks/useEditorController.ts

@@ -219,7 +219,6 @@ export function useEditorController({
           tabRef.current.noteId &&
           tabRef.current.noteId === useTabStore.getState().getCurrentNoteId()
         ) {
-          logger("info", tabRef.current.noteId, value);
           useTabStore.getState().setNoteState(tabRef.current.noteId, {
             top: value
           });