Feature/webdav sync

.gitignore

@@ -1,15 +1,12 @@
 *.iml
 .gradle
 /local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
+/.idea/
 .DS_Store
 /build
 /captures
 .externalNativeBuild
 .cxx
 local.properties
+.claude-context.md
+comments.md

app/build.gradle

@@ -196,6 +196,11 @@ dependencies {
     ksp "com.google.dagger:hilt-compiler:2.59.2"
     implementation "androidx.hilt:hilt-navigation-compose:1.3.0"
 
+    // WebDAV sync dependencies
+    implementation "androidx.work:work-runtime-ktx:2.9.0"  // Background sync
+    implementation "com.squareup.okhttp3:okhttp:4.12.0"    // HTTP/WebDAV client
+    implementation "androidx.security:security-crypto:1.1.0-alpha06"  // Encrypted credential storage
+
     // Added so that R8 optimization don't fail
     // SLF4J backend: provides a simple logger so (probably) ShipBook can output logs.
     // Needed because SLF4J is just an API; without a binding, logging calls are ignored.

app/src/main/AndroidManifest.xml

@@ -5,6 +5,8 @@
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
     <application
         android:name=".NotableApp"

app/src/main/java/com/ethran/notable/MainActivity.kt

@@ -34,6 +34,8 @@ import com.ethran.notable.data.db.KvProxy
 import com.ethran.notable.data.db.StrokeMigrationHelper
 import com.ethran.notable.editor.canvas.CanvasEventBus
 import com.ethran.notable.io.ExportEngine
+import com.ethran.notable.sync.CredentialManager
+import com.ethran.notable.sync.SyncScheduler
 import com.ethran.notable.ui.AppEventUiBridge
 import com.ethran.notable.ui.LocalSnackContext
 import com.ethran.notable.ui.SnackDispatcher
@@ -81,6 +83,9 @@ class MainActivity : ComponentActivity() {
     @Inject
     lateinit var pageDataManager: dagger.Lazy<PageDataManager>
 
+    @Inject
+    lateinit var credentialManager: dagger.Lazy<CredentialManager>
+
     @Inject
     lateinit var snackDispatcher: SnackDispatcher
 
@@ -99,7 +104,6 @@ class MainActivity : ComponentActivity() {
         SCREEN_WIDTH = applicationContext.resources.displayMetrics.widthPixels
         SCREEN_HEIGHT = applicationContext.resources.displayMetrics.heightPixels
 
-
         val snackState = SnackState()
 
         setContent {
@@ -119,6 +123,9 @@ class MainActivity : ComponentActivity() {
                             .registerComponentCallbacks(this@MainActivity.applicationContext)
                         editorSettingCacheManager.get().init()
                     }
+                    restorePeriodicSyncSchedule()
+                    // Trigger initial sync on app startup (fails silently if offline)
+                    triggerInitialSync()
                 }
                 isInitialized = true
             }
@@ -141,6 +148,28 @@ class MainActivity : ComponentActivity() {
         }
     }
 
+
+    private fun triggerInitialSync() {
+        try {
+            val settings = credentialManager.get().settings.value
+            if (settings.syncEnabled) {
+                Log.i(TAG, "Triggering one-time sync on app startup via WorkManager")
+                SyncScheduler.triggerImmediateSync(applicationContext)
+            }
+        } catch (e: Exception) {
+            Log.i(TAG, "Initial sync setup failed: ${e.message}")
+        }
+    }
+
+    private fun restorePeriodicSyncSchedule() {
+        try {
+            val settings = credentialManager.get().settings.value
+            SyncScheduler.reconcilePeriodicSync(applicationContext, settings)
+        } catch (e: Exception) {
+            Log.i(TAG, "Periodic sync reconcile failed: ${e.message}")
+        }
+    }
+
     override fun onRestart() {
         super.onRestart()
         // redraw after device sleep

app/src/main/java/com/ethran/notable/data/PageDataManager.kt

@@ -185,7 +185,10 @@ class PageDataManager @Inject constructor(
      */
     suspend fun requestCurrentPageLoadJoin(
     ) {
-        assert(currentPage == pageFromDb?.id)
+        if (currentPage != pageFromDb?.id) {
+            log.e("Skipping load for invalid current page: current=$currentPage db=${pageFromDb?.id}")
+            return
+        }
         val bookId = pageFromDb?.notebookId
         log.d("requestCurrentPageLoadJoin($currentPage)")
         getOrStartLoadingJob(currentPage, bookId).join()
@@ -208,7 +211,10 @@ class PageDataManager @Inject constructor(
     }
 
     suspend fun cacheNeighbors() {
-        assert(currentPage == pageFromDb?.id)
+        if (currentPage != pageFromDb?.id) {
+            log.e("Skipping neighbors cache for invalid current page: current=$currentPage db=${pageFromDb?.id}")
+            return
+        }
         val bookId = pageFromDb?.notebookId ?: return
 
         log.d("cacheNeighbors($currentPage)")
@@ -573,6 +579,7 @@ class PageDataManager @Inject constructor(
     fun updateStrokesInDb(strokes: List<Stroke>) {
         dataScope.launch {
             appRepository.strokeRepository.update(strokes)
+            updateParentNotebookTimestamp()
         }
     }
 
@@ -591,27 +598,37 @@ class PageDataManager @Inject constructor(
                 )
                 appRepository.strokeRepository.update(strokes)
             }
+            updateParentNotebookTimestamp()
         }
     }
 
     fun saveImagesToDb(images: List<Image>) {
         dataScope.launch {
             appRepository.imageRepository.create(images)
+            updateParentNotebookTimestamp()
         }
     }
 
     fun removeStrokesFromDb(strokes: List<String>) {
         dataScope.launch {
             appRepository.strokeRepository.deleteAll(strokes)
+            updateParentNotebookTimestamp()
         }
     }
 
     fun removeImagesFromDb(images: List<String>) {
         dataScope.launch {
             appRepository.imageRepository.deleteAll(images)
+            updateParentNotebookTimestamp()
         }
     }
 
+    private suspend fun updateParentNotebookTimestamp() {
+        val notebookId = pageFromDb?.notebookId ?: return
+        val notebook = appRepository.bookRepository.getById(notebookId) ?: return
+        appRepository.bookRepository.update(notebook)
+    }
+
     fun setScrollInDb() {
         dataScope.launch {
             appRepository.pageRepository.updateScroll(

app/src/main/java/com/ethran/notable/data/datastore/AppSettings.kt

@@ -20,7 +20,6 @@ object GlobalAppSettings {
     }
 }
 
-
 @Serializable
 data class AppSettings(
     // General
@@ -47,7 +46,7 @@ data class AppSettings(
     val twoFingerSwipeRightAction: GestureAction? = defaultTwoFingerSwipeRightAction,
     val holdAction: GestureAction? = defaultHoldAction,
     val enableQuickNav: Boolean = true,
-
+    val renameOnCreate: Boolean = true,
 
     // Debug
     val showWelcome: Boolean = true,
@@ -76,4 +75,4 @@ data class AppSettings(
     enum class Position {
         Top, Bottom, // Left,Right,
     }
-}
+}

app/src/main/java/com/ethran/notable/data/db/Folder.kt

@@ -49,6 +49,8 @@ interface FolderDao {
     @Query("SELECT * FROM folder WHERE id IS :folderId")
     fun getLive(folderId: String): LiveData<Folder?>
 
+    @Query("SELECT * FROM folder")
+    fun getAll(): List<Folder>
 
     @Insert
     suspend fun create(folder: Folder): Long
@@ -74,6 +76,10 @@ class FolderRepository @Inject constructor(
         db.update(folder)
     }
 
+    fun getAll(): List<Folder> {
+        return db.getAll()
+    }
+
     fun getAllInFolder(folderId: String? = null): LiveData<List<Folder>> {
         return db.getChildrenFolders(folderId)
     }

app/src/main/java/com/ethran/notable/data/db/Notebook.kt

@@ -50,6 +50,9 @@ interface NotebookDao {
     @Query("SELECT * FROM notebook WHERE parentFolderId is :folderId")
     fun getAllInFolder(folderId: String? = null): LiveData<List<Notebook>>
 
+    @Query("SELECT * FROM notebook")
+    fun getAll(): List<Notebook>
+
     @Query("SELECT * FROM notebook WHERE id = (:notebookId)")
     fun getByIdLive(notebookId: String): LiveData<Notebook>
 
@@ -78,6 +81,10 @@ class BookRepository @Inject constructor(
 ) {
     private val log = ShipBook.getLogger("BookRepository")
 
+    fun getAll(): List<Notebook> {
+        return notebookDao.getAll()
+    }
+
     suspend fun create(notebook: Notebook) {
         notebookDao.create(notebook)
         val page = Page(
@@ -101,6 +108,14 @@ class BookRepository @Inject constructor(
         notebookDao.update(updatedNotebook)
     }
 
+    /**
+     * Update notebook without modifying the timestamp.
+     * Used during sync when downloading from server to preserve remote timestamp.
+     */
+    suspend fun updatePreservingTimestamp(notebook: Notebook) {
+        notebookDao.update(notebook)
+    }
+
     fun getAllInFolder(folderId: String? = null): LiveData<List<Notebook>> {
         return notebookDao.getAllInFolder(folderId)
     }

app/src/main/java/com/ethran/notable/di/CoroutinesModule.kt

@@ -56,4 +56,4 @@ object CoroutinesModule {
     fun provideApplicationScope(
         @IoDispatcher ioDispatcher: CoroutineDispatcher
     ): CoroutineScope = CoroutineScope(SupervisorJob() + ioDispatcher)
-}
+}

app/src/main/java/com/ethran/notable/editor/EditorControlTower.kt

@@ -14,6 +14,7 @@ import com.ethran.notable.editor.state.SelectionState
 import com.ethran.notable.editor.utils.offsetStroke
 import com.ethran.notable.editor.utils.refreshScreen
 import com.ethran.notable.editor.utils.selectImagesAndStrokes
+import com.ethran.notable.sync.SyncLogger
 import io.shipbook.shipbooksdk.ShipBook
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -94,6 +95,12 @@ class EditorControlTower(
      * @param id The unique identifier of the page to switch to.
      */
     private suspend fun switchPage(id: String) {
+        // Trigger sync on the page we're leaving (sync logic inside syncOrchestrator.syncFromPageId)
+        val oldPageId = page.currentPageId
+        scope.launch(Dispatchers.IO) {
+            triggerSyncForPage(oldPageId)
+        }
+
         // Switch to Main thread for Compose state mutations
         withContext(Dispatchers.Main) {
             viewModel.changePage(id)
@@ -106,6 +113,18 @@ class EditorControlTower(
 //        }
     }
 
+    /**
+     * Trigger sync for a specific page's notebook.
+     */
+    private suspend fun triggerSyncForPage(pageId: String?) {
+        if (pageId == null) return
+        try {
+            viewModel.syncFromPageId(pageId)
+        } catch (e: Exception) {
+            SyncLogger.e("EditorControlTower", "Sync failed: ${e.message}")
+        }
+    }
+
     fun setIsDrawing(value: Boolean) {
         if (viewModel.toolbarState.value.isDrawing == value) {
             logEditorControlTower.w("IsDrawing already set to $value")
@@ -300,4 +319,4 @@ class EditorControlTower(
     }
 
     fun showHint(text: String) = viewModel.showHint(text)
-}
+}

app/src/main/java/com/ethran/notable/editor/EditorView.kt

@@ -121,6 +121,8 @@ fun EditorView(
             viewModel.updateDrawingState()
         }
 
+//         val editorControlTower = remember {
+//             EditorControlTower(scope, page, history, editorState, context, appRepository).apply { registerObservers() }
         DisposableEffect(editorControlTower) {
             editorControlTower.registerObservers()
             onDispose {
@@ -196,9 +198,7 @@ fun EditorView(
 
         // Observe pageId changes from ViewModel state for navigation
         LaunchedEffect(viewModel) {
-            snapshotFlow { toolbarState.pageId }
-                .filterNotNull()
-                .distinctUntilChanged()
+            snapshotFlow { toolbarState.pageId }.filterNotNull().distinctUntilChanged()
                 .drop(1) // Skip initial emission from loadBookData
                 .collect { newPageId ->
                     log.v("EditorView: snapshotFlow detected pageId change to $newPageId, triggering onPageChange")
@@ -214,8 +214,7 @@ fun EditorView(
         val zoomLevel by page.zoomLevel.collectAsStateWithLifecycle()
         val selectionActive = viewModel.selectionState.isNonEmpty()
         LaunchedEffect(
-            zoomLevel,
-            selectionActive
+            zoomLevel, selectionActive
         ) {
             log.v("EditorView: zoomLevel=$zoomLevel, selectionActive=$selectionActive")
             viewModel.setShowResetView(zoomLevel != 1.0f)