johannesjo · johannesjo · Apr 17, 2025 · Mar 17, 2025 · Mar 17, 2025 · Mar 17, 2025
diff --git a/.gitignore b/.gitignore
@@ -73,3 +73,5 @@ electron-builder.win-store.yaml
 
 # ignore changes
 ./src/environments/versions.ts
+/src/environments/environment.js
+/src/environments/environment.js.map
diff --git a/android/.idea/gradle.xml b/android/.idea/gradle.xml
diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle
@@ -10,7 +10,8 @@ android {
 apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle"
 dependencies {
     implementation project(':capacitor-app')
-
+    implementation project(':capacitor-filesystem')
+    implementation project(':capawesome-capacitor-background-task')
 }
 
 

diff --git a/.../app/src/main/java/com/superproductivity/superproductivity/webview/JavaScriptInterface.kt b/.../app/src/main/java/com/superproductivity/superproductivity/webview/JavaScriptInterface.kt
@@ -432,6 +432,33 @@ class JavaScriptInterface(
         return sb
     }
 
+    @JavascriptInterface
+    fun removeFile(filePath: String) {
+        Log.d("SuperProductivity", "removeFile: trying to remove filePath: $filePath")
+        // Get folder path
+        val sp = activity.getPreferences(Context.MODE_PRIVATE)
+        val folderPath = sp.getString("filesyncFolder", "") ?: ""
+
+        // Scoped storage permission management for Android 10+, but also works for Android < 10
+        // Open file with write access, using DocumentFile URI
+        val folder = DocumentFile.fromTreeUri(activity, Uri.parse(folderPath))
+        val file = folder?.findFile(filePath)
+        Log.d("SuperProductivity", "removeFile: trying to remove: $file")
+
+        if (file != null && file.exists()) {
+            // File exists, attempt to delete it
+            val deleted = file.delete()
+
+            if (deleted) {
+                Log.d("SuperProductivity", "File deleted successfully: $filePath")
+            } else {
+                Log.e("SuperProductivity", "Failed to delete the file: $filePath")
+            }
+        } else {
+            Log.d("SuperProductivity", "File does not exist: $filePath")
+        }
+    }
+
     @Suppress("unused")
     @JavascriptInterface
     fun writeFile(filePath: String, data: String) {

diff --git a/...pp/src/main/java/com/superproductivity/superproductivity/webview/WebViewRequestHandler.kt b/...pp/src/main/java/com/superproductivity/superproductivity/webview/WebViewRequestHandler.kt
@@ -15,6 +15,7 @@ import java.io.ByteArrayInputStream
  * Strip the original WebViewClient logic to ensure that both types share the same logic
  */
 class WebViewRequestHandler(private val activity: Activity, private val serviceHost: String) {
+    private val CORS_SKIP_HEADER = "sp_cors_skip"
 
     @Deprecated("Deprecated in Java")
     fun handleUrlLoading(view: WebView, url: String): Boolean {
@@ -36,11 +37,17 @@ class WebViewRequestHandler(private val activity: Activity, private val serviceH
 
 
     fun interceptWebRequest(request: WebResourceRequest?): WebResourceResponse? {
+
         try {
             if (request == null || request.isForMainFrame) {
                 return null
             }
 
+            if (!request.requestHeaders.containsKey(CORS_SKIP_HEADER)) {
+                Log.v("TW", "_______________________________________")
+                return null
+            }
+
             if (request.url?.path?.contains("assets/icons/favicon") == true) {
                 try {
                     return WebResourceResponse("image/png", null, null)
@@ -64,14 +71,15 @@ class WebViewRequestHandler(private val activity: Activity, private val serviceH
                 return null
             }
 
+
             val client = OkHttpClient()
             val newRequestBuilder = Request.Builder()
                 .url(request.url.toString())
                 .method(request.method, null)
 
             for ((key, value) in request.requestHeaders) {
                 Log.v("TW", "interceptRequest header:${key} – ${value}")
-                if (key == "User-Agent" || key == "Origin" || key == "Referer" || key == "Sec-Fetch-Mode") {
+                if (key == CORS_SKIP_HEADER || key == "User-Agent" || key == "Origin" || key == "Referer" || key == "Sec-Fetch-Mode") {
                     continue
                 }
                 newRequestBuilder.addHeader(key, value)

diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle
@@ -4,3 +4,9 @@ project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/
 
 include ':capacitor-app'
 project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android')
+
+include ':capacitor-filesystem'
+project(':capacitor-filesystem').projectDir = new File('../node_modules/@capacitor/filesystem/android')
+
+include ':capawesome-capacitor-background-task'
+project(':capawesome-capacitor-background-task').projectDir = new File('../node_modules/@capawesome/capacitor-background-task/android')
diff --git a/capacitor.config.ts b/capacitor.config.ts
@@ -4,6 +4,11 @@ const config: CapacitorConfig = {
   appId: 'com.superproductivity.superproductivity',
   appName: 'super-productivity',
   webDir: 'dist/browser',
+  plugins: {
+    CapacitorHttp: {
+      enabled: true,
+    },
+  },
 };
 
 export default config;
diff --git a/electron/backup.ts b/electron/backup.ts
@@ -11,7 +11,7 @@ import { IPC } from './shared-with-frontend/ipc-events.const';
 import { LocalBackupMeta } from '../src/app/imex/local-backup/local-backup.model';
 import * as path from 'path';
 import { error, log } from 'electron-log/main';
-import { AppDataComplete } from '../src/app/imex/sync/sync.model';
+import { AppDataCompleteLegacy } from '../src/app/imex/sync/sync.model';
 
 export const BACKUP_DIR = path.join(app.getPath('userData'), `backups`);
 
@@ -58,7 +58,7 @@ export function initBackupAdapter(): void {
 }
 
 // eslint-disable-next-line prefer-arrow/prefer-arrow-functions
-function backupData(ev: IpcMainEvent, data: AppDataComplete): void {
+function backupData(ev: IpcMainEvent, data: AppDataCompleteLegacy): void {
   if (!existsSync(BACKUP_DIR)) {
     mkdirSync(BACKUP_DIR);
   }

diff --git a/electron/electronAPI.d.ts b/electron/electronAPI.d.ts
@@ -5,9 +5,10 @@ import {
 } from '../src/app/features/config/global-config.model';
 import { KeyboardConfig } from '../src/app/features/config/keyboard-config.model';
 import { JiraCfg } from '../src/app/features/issue/providers/jira/jira.model';
-import { AppDataComplete, SyncGetRevResult } from '../src/app/imex/sync/sync.model';
+import { AppDataCompleteLegacy, SyncGetRevResult } from '../src/app/imex/sync/sync.model';
 import { Task } from '../src/app/features/tasks/task.model';
 import { LocalBackupMeta } from '../src/app/imex/local-backup/local-backup.model';
+import { AppDataCompleteNew } from '../src/app/pfapi/pfapi-config';
 
 export interface ElectronAPI {
   on(channel: string, listener: (event: IpcRendererEvent, ...args: any[]) => void): void;
@@ -38,6 +39,8 @@ export interface ElectronAPI {
     localRev: string | null;
   }): Promise<{ rev: string; dataStr: string | undefined } | Error>;
 
+  fileSyncRemove(args: { filePath: string }): Promise<unknown | Error>;
+
   checkDirExists(args: { dirPath: string }): Promise<true | Error>;
 
   pickDirectory(): Promise<string | undefined>;
@@ -106,7 +109,7 @@ export interface ElectronAPI {
 
   jiraSetupImgHeaders(args: { jiraCfg: JiraCfg }): void;
 
-  backupAppData(appData: AppDataComplete): void;
+  backupAppData(appData: AppDataCompleteLegacy | AppDataCompleteNew): void;
 
   updateCurrentTask(task: Task | null);
 

diff --git a/electron/local-file-sync.ts b/electron/local-file-sync.ts
@@ -1,6 +1,6 @@
 import { IPC } from './shared-with-frontend/ipc-events.const';
 import { SyncGetRevResult } from '../src/app/imex/sync/sync.model';
-import { readdirSync, readFileSync, statSync, writeFileSync } from 'fs';
+import { readdirSync, readFileSync, statSync, writeFileSync, unlinkSync } from 'fs';
 import { error, log } from 'electron-log/main';
 import { dialog, ipcMain } from 'electron';
 import { getWin } from './main-window';
@@ -92,6 +92,28 @@ export const initLocalFileSyncAdapter = (): void => {
     },
   );
 
+  ipcMain.handle(
+    IPC.FILE_SYNC_REMOVE,
+    (
+      ev,
+      {
+        filePath,
+      }: {
+        filePath: string;
+      },
+    ): void | Error => {
+      try {
+        console.log(IPC.FILE_SYNC_REMOVE, filePath);
+        unlinkSync(filePath);
+        return;
+      } catch (e) {
+        log('ERR: Sync error while loading file from ' + filePath);
+        error(e);
+        return new Error(e as string);
-        return new Error(e as string);
+        return new Error(e.toString());
-        return new Error(e as string);
+        return new Error(e.toString());
+      }
+    },
+  );
+
   ipcMain.handle(
     IPC.CHECK_DIR_EXISTS,
     (

diff --git a/electron/preload.ts b/electron/preload.ts
@@ -35,6 +35,7 @@ const ea: ElectronAPI = {
       rev: string;
       dataStr: string | undefined;
     }>,
+  fileSyncRemove: (filePath) => _invoke('FILE_SYNC_REMOVE', filePath) as Promise<void>,
   checkDirExists: (dirPath) =>
     _invoke('CHECK_DIR_EXISTS', dirPath) as Promise<true | Error>,
 

diff --git a/electron/shared-with-frontend/ipc-events.const.ts b/electron/shared-with-frontend/ipc-events.const.ts
@@ -50,6 +50,7 @@ export enum IPC {
 
   FILE_SYNC_LOAD = 'FILE_SYNC_LOAD',
   FILE_SYNC_SAVE = 'FILE_SYNC_SAVE',
+  FILE_SYNC_REMOVE = 'FILE_SYNC_REMOVE',
   FILE_SYNC_GET_REV_AND_CLIENT_UPDATE = 'FILE_SYNC_GET_REV_AND_CLIENT_UPDATE',
 
   CHECK_DIR_EXISTS = 'CHECK_DIR_EXISTS',

diff --git a/electron/tsconfig.electron.json b/electron/tsconfig.electron.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "allowSyntheticDefaultImports": true,
     "sourceMap": true,
-    "resolveJsonModule": false,
+    "resolveJsonModule": true,
     "declaration": false,
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,