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

@@ -207,6 +207,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,7 @@ 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.SyncEngine
 import com.ethran.notable.ui.LocalSnackContext
 import com.ethran.notable.ui.SnackState
 import com.ethran.notable.ui.components.NotableApp
@@ -79,6 +80,9 @@ class MainActivity : ComponentActivity() {
     @Inject
     lateinit var pageDataManager: dagger.Lazy<PageDataManager>
 
+    @Inject
+    lateinit var syncEngine: dagger.Lazy<SyncEngine>
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableFullScreen()
@@ -112,6 +116,8 @@ class MainActivity : ComponentActivity() {
                             .registerComponentCallbacks(this@MainActivity.applicationContext)
                         editorSettingCacheManager.get().init()
                     }
+                    // Trigger initial sync on app startup (fails silently if offline)
+                    triggerInitialSync()
                 }
                 isInitialized = true
             }
@@ -133,6 +139,18 @@ class MainActivity : ComponentActivity() {
         }
     }
 
+
+    private suspend fun triggerInitialSync() {
+        try {
+            if (GlobalAppSettings.current.syncSettings.syncEnabled) {
+                Log.i(TAG, "Triggering initial sync on app startup")
+               syncEngine.get().syncAllNotebooks()
+            }
+        } catch (e: Exception) {
+            Log.i(TAG, "Initial sync failed (offline?): ${e.message}")
+        }
+    }
+
     override fun onRestart() {
         super.onRestart()
         // redraw after device sleep

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

@@ -21,6 +21,23 @@ object GlobalAppSettings {
 }
 
 
+@Serializable
+data class SyncSettings(
+    val syncEnabled: Boolean = false,
+    val serverUrl: String = "",
+    val username: String = "",
+    // Note: Password stored separately in EncryptedSharedPreferences for security
+    val autoSync: Boolean = true,
+    // Default must be >= 15 minutes due to WorkManager/JobScheduler minimum interval
+    val syncInterval: Int = 15,  // minutes
+    val lastSyncTime: String? = null,
+    val syncOnNoteClose: Boolean = true,
+    val wifiOnly: Boolean = false,
+    // Track which notebooks we've successfully synced to detect deletions
+    val syncedNotebookIds: Set<String> = emptySet()
+)
+
+
 @Serializable
 data class AppSettings(
     // General
@@ -47,7 +64,10 @@ data class AppSettings(
     val twoFingerSwipeRightAction: GestureAction? = defaultTwoFingerSwipeRightAction,
     val holdAction: GestureAction? = defaultHoldAction,
     val enableQuickNav: Boolean = true,
+    val renameOnCreate: Boolean = true,
 
+    // Sync
+    val syncSettings: SyncSettings = SyncSettings(),
 
     // Debug
     val showWelcome: Boolean = true,

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/editor/EditorControlTower.kt

@@ -18,6 +18,8 @@ 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.editor.utils.strokeBounds
+import com.ethran.notable.sync.SyncEngine
+import com.ethran.notable.sync.SyncLogger
 import com.ethran.notable.ui.showHint
 import io.shipbook.shipbooksdk.ShipBook
 import kotlinx.coroutines.CoroutineScope
@@ -34,7 +36,8 @@ class EditorControlTower(
     private val scope: CoroutineScope,
     val page: PageView,
     private var history: History,
-    private val state: EditorState
+    private val state: EditorState,
+    private val syncEngine: SyncEngine,
 ) {
     private var scrollInProgress = Mutex()
     private var scrollJob: Job? = null
@@ -97,6 +100,15 @@ 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 (if enabled)
+        val settings = GlobalAppSettings.current
+        if (settings.syncSettings.syncEnabled && settings.syncSettings.syncOnNoteClose) {
+            val oldPageId = page.currentPageId
+            scope.launch(Dispatchers.IO) {
+                triggerSyncForPage(oldPageId)
+            }
+        }
+
         // Switch to Main thread for Compose state mutations
         withContext(Dispatchers.Main) {
             state.viewModel.changePage(id)
@@ -109,6 +121,19 @@ class EditorControlTower(
 //        }
     }
 
+    /**
+     * Trigger sync for a specific page's notebook.
+     */
+    private suspend fun triggerSyncForPage(pageId: String?) {
+        if (pageId == null) return
+        try {
+            syncEngine.syncFromPageId(pageId)
+        } catch (e: Exception) {
+            // Log but don't crash the UI thread
+            SyncLogger.e("EditorControlTower", "Sync failed: ${e.message}")
+        }
+    }
+
     fun setIsDrawing(value: Boolean) {
         if (state.isDrawing == value) {
             logEditorControlTower.w("IsDrawing already set to $value")

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

@@ -16,6 +16,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.ethran.notable.data.datastore.GlobalAppSettings
 import com.ethran.notable.editor.canvas.CanvasEventBus
 import com.ethran.notable.editor.state.EditorState
 import com.ethran.notable.editor.state.History
@@ -26,6 +27,8 @@ import com.ethran.notable.editor.ui.SelectedBitmap
 import com.ethran.notable.editor.ui.toolbar.PositionedToolbar
 import com.ethran.notable.gestures.EditorGestureReceiver
 import com.ethran.notable.navigation.NavigationDestination
+import dagger.hilt.android.EntryPointAccessors
+import com.ethran.notable.sync.SyncEngineEntryPoint
 import com.ethran.notable.ui.LocalSnackContext
 import com.ethran.notable.ui.SnackConf
 import com.ethran.notable.ui.convertDpToPixel
@@ -55,7 +58,6 @@ object EditorDestination : NavigationDestination {
 }
 
 
-
 @Composable
 fun EditorView(
     initialPageId: String,
@@ -114,7 +116,12 @@ fun EditorView(
         }
 
         val editorControlTower = remember {
-            EditorControlTower(scope, page, history, editorState)
+            // Obtain SyncEngine from Hilt entry point for use in non-Hilt-managed objects
+            val entry = EntryPointAccessors.fromApplication(
+                context.applicationContext, SyncEngineEntryPoint::class.java
+            )
+            val syncEngine = entry.syncEngine()
+            EditorControlTower(scope, page, history, editorState, syncEngine)
         }
 
 
@@ -124,6 +131,8 @@ fun EditorView(
             viewModel.updateDrawingState()
         }
 
+//         val editorControlTower = remember {
+//             EditorControlTower(scope, page, history, editorState, context, appRepository).apply { registerObservers() }
         DisposableEffect(editorControlTower) {
             editorControlTower.registerObservers()
             onDispose {
@@ -198,9 +207,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")
@@ -216,8 +223,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)
@@ -226,6 +232,29 @@ fun EditorView(
 
         DisposableEffect(Unit) {
             onDispose {
+// TODO
+//                 // finish selection operation
+//                 viewModel.selectionState.applySelectionDisplace(page)
+//                 if (bookId != null) exportToLinkedFile(
+//                     exportEngine,
+//                     bookId,
+//                     appRepository.bookRepository
+//                 )
+//                 page.disposeOldPage()
+
+//                 // Trigger sync on note close if enabled
+//                 val settings = GlobalAppSettings.current
+//                 if (settings.syncSettings.syncEnabled && settings.syncSettings.syncOnNoteClose && bookId != null) {
+//                     // Use a new coroutine scope since the composition scope is being disposed
+//                     kotlinx.coroutines.CoroutineScope(Dispatchers.IO).launch {
+//                         try {
+//                             SyncLogger.i("EditorSync", "Auto-syncing on editor close")
+//                             SyncEngine(context).syncNotebook(bookId)
+//                         } catch (e: Exception) {
+//                             SyncLogger.e("EditorSync", "Auto-sync failed: ${e.message}")
+//                         }
+//                     }
+//                 }
                 viewModel.onDispose(page)
             }
         }

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

@@ -339,12 +339,45 @@ class PageView(
         }
     }
 
+// TODO: fix this
+//     private fun saveStrokesToPersistLayer(strokes: List<Stroke>) {
+//         coroutineScope.launch(Dispatchers.IO) {
+//             try {
+//                 dbStrokes.create(strokes)
+//             } catch (_: SQLiteConstraintException) {
+//                 logAndShowError(
+//                     "saveStrokesToPersistLayer",
+//                     "Attempted to create strokes that already exist"
+//                 )
+//                 dbStrokes.update(strokes)
+//             }
+//             updateParentNotebookTimestamp()
+//         }
+//     }
+
+//     private fun saveImagesToPersistLayer(image: List<Image>) {
+//         coroutineScope.launch(Dispatchers.IO) {
+//             dbImages.create(image)
+//             updateParentNotebookTimestamp()
+//         }
+//     }
+
+//     /**
+//      * Update the parent notebook's updatedAt timestamp so sync knows it has changes.
+//      */
+//     private suspend fun updateParentNotebookTimestamp() {
+//         val notebookId = pageFromDb?.notebookId ?: return
+//         val notebook = appRepository.bookRepository.getById(notebookId) ?: return
+//         appRepository.bookRepository.update(notebook)
+//     }
+
     private fun saveStrokesToPersistLayer(strokes: List<Stroke>) =
         pageDataManager.saveStrokesToDb(strokes)
 
 
     private fun saveImagesToPersistLayer(image: List<Image>) = pageDataManager.saveImagesToDb(image)
 
+
     fun addImage(imageToAdd: Image) {
         images += listOf(imageToAdd)
         val bottomPlusPadding = imageToAdd.x + imageToAdd.height + 50
@@ -387,6 +420,21 @@ class PageView(
     private fun removeImagesFromPersistLayer(imageIds: List<String>) =
         pageDataManager.removeImagesFromDb(imageIds)
 
+ // TODO:
+//     private fun removeStrokesFromPersistLayer(strokeIds: List<String>) {
+//         coroutineScope.launch(Dispatchers.IO) {
+//             appRepository.strokeRepository.deleteAll(strokeIds)
+//             updateParentNotebookTimestamp()
+//         }
+//     }
+
+//     private fun removeImagesFromPersistLayer(imageIds: List<String>) {
+//         coroutineScope.launch(Dispatchers.IO) {
+//             appRepository.imageRepository.deleteAll(imageIds)
+//             updateParentNotebookTimestamp()
+//         }
+//     }
+// =======
 
     // load background, fast, if it is accurate enough.
     private fun loadInitialBitmap(): Boolean {