Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Remove unused NativeVaultManager exposed methods (#1404)

Leendert de Borst23414baf77b8
diff --git a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.kt b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.kt
index d2c753983..49b610779 100644
--- a/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.kt
+++ b/apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.kt
@@ -503,10 +503,9 @@ class NativeVaultManager(reactContext: ReactApplicationContext) :
/**
* Clear clipboard after a delay.
* @param delayInSeconds The delay in seconds after which to clear the clipboard
- * @param promise The promise to resolve
+ * @param promise Optional promise to resolve (for internal calls)
*/
- @ReactMethod
- override fun clearClipboardAfterDelay(delayInSeconds: Double, promise: Promise?) {
+ private fun clearClipboardAfterDelay(delayInSeconds: Double, promise: Promise?) {
Log.d(TAG, "Scheduling clipboard clear after $delayInSeconds seconds")
if (delayInSeconds <= 0) {
@@ -661,59 +660,6 @@ class NativeVaultManager(reactContext: ReactApplicationContext) :
}
}
- /**
- * Check if the app can schedule exact alarms.
- * @param promise The promise to resolve with boolean result
- */
- @ReactMethod
- override fun canScheduleExactAlarms(promise: Promise?) {
- try {
- val canSchedule = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
- val alarmManager = reactApplicationContext.getSystemService(android.content.Context.ALARM_SERVICE) as android.app.AlarmManager
- alarmManager.canScheduleExactAlarms()
- } else {
- true // Pre-Android 12 doesn't require permission
- }
- Log.d(TAG, "Can schedule exact alarms: $canSchedule")
- promise?.resolve(canSchedule)
- } catch (e: Exception) {
- Log.e(TAG, "Error checking exact alarm permission", e)
- promise?.reject("ERR_EXACT_ALARM_CHECK", "Failed to check exact alarm permission: ${e.message}", e)
- }
- }
-
- /**
- * Request exact alarm permission by opening system settings.
- * @param promise The promise to resolve
- */
- @ReactMethod
- override fun requestExactAlarmPermission(promise: Promise?) {
- try {
- if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
- val alarmManager = reactApplicationContext.getSystemService(android.content.Context.ALARM_SERVICE) as android.app.AlarmManager
-
- if (!alarmManager.canScheduleExactAlarms()) {
- val intent = Intent().apply {
- action = Settings.ACTION_REQUEST_SCHEDULE_EXACT_ALARM
- data = Uri.parse("package:${reactApplicationContext.packageName}")
- flags = Intent.FLAG_ACTIVITY_NEW_TASK
- }
- reactApplicationContext.startActivity(intent)
- promise?.resolve("Permission request sent - user will be taken to settings")
- } else {
- Log.d(TAG, "Exact alarm permission already granted")
- promise?.resolve("Permission already granted")
- }
- } else {
- Log.d(TAG, "Exact alarm permission not required on this Android version")
- promise?.resolve("Permission not required on this Android version")
- }
- } catch (e: Exception) {
- Log.e(TAG, "Error requesting exact alarm permission", e)
- promise?.reject("ERR_EXACT_ALARM_REQUEST", "Failed to request exact alarm permission: ${e.message}", e)
- }
- }
-
/**
* Check if the app is ignoring battery optimizations.
* @param promise The promise to resolve with boolean result
@@ -1440,43 +1386,6 @@ class NativeVaultManager(reactContext: ReactApplicationContext) :
}
}
- /**
- * Store encrypted vault with sync state atomically.
- * Two modes:
- * 1. markDirty=true: Local mutation - always succeeds, increments mutation sequence
- * 2. expectedMutationSeq provided: Sync operation - only succeeds if no mutations happened
- *
- * @param encryptedVault The encrypted vault blob.
- * @param markDirty If true, marks vault as dirty and increments mutation sequence.
- * @param serverRevision Optional server revision to set.
- * @param expectedMutationSeq If provided, only store if current sequence matches.
- * @param promise The promise to resolve with { success: boolean, mutationSequence: number }.
- */
- @ReactMethod
- fun storeEncryptedVaultWithSyncState(
- encryptedVault: String,
- markDirty: Boolean,
- serverRevision: Double?,
- expectedMutationSeq: Double?,
- promise: Promise,
- ) {
- try {
- val result = vaultStore.storeEncryptedVaultWithSyncState(
- encryptedVault = encryptedVault,
- markDirty = markDirty,
- serverRevision = serverRevision?.toInt(),
- expectedMutationSeq = expectedMutationSeq?.toInt(),
- )
- val response = Arguments.createMap()
- response.putBoolean("success", result.success)
- response.putInt("mutationSequence", result.mutationSequence)
- promise.resolve(response)
- } catch (e: Exception) {
- Log.e(TAG, "Error storing vault with sync state", e)
- promise.reject("ERR_STORE_VAULT_SYNC", "Failed to store vault with sync state: ${e.message}", e)
- }
- }
-
/**
* Mark the vault as clean after successful sync.
* Only clears dirty flag if no mutations happened during sync.
@@ -1498,53 +1407,4 @@ class NativeVaultManager(reactContext: ReactApplicationContext) :
promise.reject("ERR_MARK_VAULT_CLEAN", "Failed to mark vault clean: ${e.message}", e)
}
}
-
- /**
- * Upload the vault to the server.
- * This is used for sync operations where race detection is needed.
- *
- * @param promise The promise to resolve with upload result.
- */
- @ReactMethod
- fun uploadVault(promise: Promise) {
- CoroutineScope(Dispatchers.IO).launch {
- try {
- val result = vaultStore.uploadVault(webApiService)
- withContext(Dispatchers.Main) {
- val response = Arguments.createMap()
- response.putBoolean("success", result.success)
- response.putInt("status", result.status)
- response.putInt("newRevisionNumber", result.newRevisionNumber)
- response.putInt("mutationSeqAtStart", result.mutationSeqAtStart)
- if (result.error != null) {
- response.putString("error", result.error)
- } else {
- response.putNull("error")
- }
- promise.resolve(response)
- }
- } catch (e: Exception) {
- withContext(Dispatchers.Main) {
- Log.e(TAG, "Error uploading vault", e)
- promise.reject("ERR_UPLOAD_VAULT", "Failed to upload vault: ${e.message}", e)
- }
- }
- }
- }
-
- /**
- * Persist the in-memory vault to storage and mark as dirty.
- * Combines getting the encrypted database and storing it with dirty flag in one call.
- * This is used after local mutations to persist changes.
- */
- @ReactMethod
- fun markVaultDirty(promise: Promise) {
- try {
- vaultStore.markVaultDirty()
- promise.resolve(null)
- } catch (e: Exception) {
- Log.e(TAG, "Error persisting vault", e)
- promise.reject("ERR_PERSIST_VAULT", "Failed to persist vault: ${e.message}", e)
- }
- }
}
diff --git a/apps/mobile-app/ios/NativeVaultManager/RCTNativeVaultManager.mm b/apps/mobile-app/ios/NativeVaultManager/RCTNativeVaultManager.mm
index 0f8c81d54..9c5bcf656 100644
--- a/apps/mobile-app/ios/NativeVaultManager/RCTNativeVaultManager.mm
+++ b/apps/mobile-app/ios/NativeVaultManager/RCTNativeVaultManager.mm
@@ -89,10 +89,6 @@
[vaultManager setAutoLockTimeout:timeout resolver:resolve rejecter:reject];
}
-- (void)clearClipboardAfterDelay:(double)delayInSeconds resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
- [vaultManager clearClipboardAfterDelay:delayInSeconds resolver:resolve rejecter:reject];
-}
-
- (void)storeMetadata:(NSString *)metadata resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
[vaultManager storeMetadata:metadata resolver:resolve rejecter:reject];
}
@@ -143,16 +139,6 @@
// MARK: - Android-specific methods (stubs for iOS)
-- (void)canScheduleExactAlarms:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
- // Only used by Android, return true.
- resolve(@(YES));
-}
-
-- (void)requestExactAlarmPermission:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
- // Only used by Android, return true.
- resolve(@"Not applicable on iOS");
-}
-
- (void)isIgnoringBatteryOptimizations:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
// Only used by Android, return true.
resolve(@(YES));
@@ -247,22 +233,10 @@
[vaultManager getSyncState:resolve rejecter:reject];
}
-- (void)storeEncryptedVaultWithSyncState:(NSString *)encryptedVault markDirty:(BOOL)markDirty serverRevision:(NSNumber *)serverRevision expectedMutationSeq:(NSNumber *)expectedMutationSeq resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
- [vaultManager storeEncryptedVaultWithSyncState:encryptedVault markDirty:markDirty serverRevision:serverRevision expectedMutationSeq:expectedMutationSeq resolver:resolve rejecter:reject];
-}
-
- (void)markVaultClean:(double)mutationSeqAtStart newServerRevision:(double)newServerRevision resolve:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
[vaultManager markVaultClean:(NSInteger)mutationSeqAtStart newServerRevision:(NSInteger)newServerRevision resolver:resolve rejecter:reject];
}
-- (void)uploadVault:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
- [vaultManager uploadVault:resolve rejecter:reject];
-}
-
-- (void)markVaultDirty:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
- [vaultManager markVaultDirty:resolve rejecter:reject];
-}
-
// MARK: - PIN Unlock
- (void)isPinEnabled:(RCTPromiseResolveBlock)resolve reject:(RCTPromiseRejectBlock)reject {
diff --git a/apps/mobile-app/ios/NativeVaultManager/VaultManager.swift b/apps/mobile-app/ios/NativeVaultManager/VaultManager.swift
index 8d5ba86dd..2f710a642 100644
--- a/apps/mobile-app/ios/NativeVaultManager/VaultManager.swift
+++ b/apps/mobile-app/ios/NativeVaultManager/VaultManager.swift
@@ -16,8 +16,6 @@ import AVFoundation
public class VaultManager: NSObject {
private let vaultStore = VaultStore()
private let webApiService = WebApiService()
- private var backgroundTaskIdentifier: UIBackgroundTaskIdentifier = .invalid
- private var clipboardClearTimer: DispatchSourceTimer?
override init() {
super.init()
@@ -236,55 +234,6 @@ public class VaultManager: NSObject {
}
}
- @objc
- func clearClipboardAfterDelay(_ delayInSeconds: Double,
- resolver resolve: @escaping RCTPromiseResolveBlock,
- rejecter reject: @escaping RCTPromiseRejectBlock) {
- NSLog("VaultManager: Scheduling clipboard clear after %.0f seconds", delayInSeconds)
-
- if delayInSeconds <= 0 {
- NSLog("VaultManager: Delay is 0 or negative, not scheduling clipboard clear")
- resolve(nil)
- return
- }
-
- // Cancel any existing clipboard clear operations
- cancelClipboardClear()
-
- // Start background task to keep app alive during clipboard clear
- backgroundTaskIdentifier = UIApplication.shared.beginBackgroundTask(withName: "ClipboardClear") { [weak self] in
- NSLog("VaultManager: Background task expired, cleaning up")
- self?.endBackgroundTask()
- }
-
- clipboardClearTimer = DispatchSource.makeTimerSource(queue: DispatchQueue.main)
- clipboardClearTimer?.schedule(deadline: .now() + delayInSeconds)
- clipboardClearTimer?.setEventHandler { [weak self] in
- NSLog("VaultManager: Clearing clipboard after %.0f seconds delay", delayInSeconds)
- UIPasteboard.general.string = ""
- NSLog("VaultManager: Clipboard cleared successfully")
- self?.endBackgroundTask()
- self?.clipboardClearTimer?.cancel()
- self?.clipboardClearTimer = nil
- }
- clipboardClearTimer?.resume()
-
- resolve(nil)
- }
-
- private func cancelClipboardClear() {
- clipboardClearTimer?.cancel()
- clipboardClearTimer = nil
- endBackgroundTask()
- }
-
- private func endBackgroundTask() {
- if backgroundTaskIdentifier != .invalid {
- UIApplication.shared.endBackgroundTask(backgroundTaskIdentifier)
- backgroundTaskIdentifier = .invalid
- }
- }
-
@objc
func setAutoLockTimeout(_ timeout: Int,
resolver resolve: @escaping RCTPromiseResolveBlock,
@@ -942,30 +891,6 @@ public class VaultManager: NSObject {
resolve(result)
}
- @objc
- func storeEncryptedVaultWithSyncState(_ encryptedVault: String,
- markDirty: Bool,
- serverRevision: NSNumber?,
- expectedMutationSeq: NSNumber?,
- resolver resolve: @escaping RCTPromiseResolveBlock,
- rejecter reject: @escaping RCTPromiseRejectBlock) {
- do {
- let result = try vaultStore.storeEncryptedVaultWithSyncState(
- encryptedVault: encryptedVault,
- markDirty: markDirty,
- serverRevision: serverRevision?.intValue,
- expectedMutationSeq: expectedMutationSeq?.intValue
- )
- let response: [String: Any] = [
- "success": result.success,
- "mutationSequence": result.mutationSequence
- ]
- resolve(response)
- } catch {
- reject("STORE_VAULT_ERROR", "Failed to store vault: \(error.localizedDescription)", error)
- }
- }
-
@objc
func markVaultClean(_ mutationSeqAtStart: Int,
newServerRevision: Int,
@@ -975,48 +900,6 @@ public class VaultManager: NSObject {
resolve(cleared)
}
- @objc
- func uploadVault(_ resolve: @escaping RCTPromiseResolveBlock,
- rejecter reject: @escaping RCTPromiseRejectBlock) {
- Task {
- do {
- let result = try await vaultStore.uploadVault(using: webApiService)
- await MainActor.run {
- let response: [String: Any] = [
- "success": result.success,
- "status": result.status,
- "newRevisionNumber": result.newRevisionNumber,
- "mutationSeqAtStart": result.mutationSeqAtStart,
- "error": result.error as Any
- ]
- resolve(response)
- }
- } catch {
- await MainActor.run {
- reject("UPLOAD_VAULT_ERROR", "Failed to upload vault: \(error.localizedDescription)", error)
- }
- }
- }
- }
-
- /// Persist the in-memory vault to storage and mark as dirty (for local mutations).
- @objc
- func markVaultDirty(_ resolve: @escaping RCTPromiseResolveBlock,
- rejecter reject: @escaping RCTPromiseRejectBlock) {
- Task {
- do {
- try vaultStore.markVaultDirty()
- await MainActor.run {
- resolve(nil)
- }
- } catch {
- await MainActor.run {
- reject("PERSIST_VAULT_ERROR", "Failed to persist vault: \(error.localizedDescription)", error)
- }
- }
- }
- }
-
@objc
func requiresMainQueueSetup() -> Bool {
return false
diff --git a/apps/mobile-app/specs/NativeVaultManager.ts b/apps/mobile-app/specs/NativeVaultManager.ts
index 3ef9370fd..b1b293113 100644
--- a/apps/mobile-app/specs/NativeVaultManager.ts
+++ b/apps/mobile-app/specs/NativeVaultManager.ts
@@ -27,11 +27,7 @@ export interface Spec extends TurboModule {
// Sync state management (kept for local mutation tracking)
getSyncState(): Promise<{isDirty: boolean; mutationSequence: number; serverRevision: number; isSyncing: boolean}>;
- storeEncryptedVaultWithSyncState(encryptedVault: string, markDirty: boolean, serverRevision: number | null, expectedMutationSeq: number | null): Promise<{ success: boolean; mutationSequence: number }>;
markVaultClean(mutationSeqAtStart: number, newServerRevision: number): Promise<boolean>;
- markVaultDirty(): Promise<void>;
-
- uploadVault(): Promise<{ success: boolean; status: number; newRevisionNumber: number; mutationSeqAtStart: number; error: string | null }>;
// Vault SQL operations
executeQuery(query: string, params: (string | number | null)[]): Promise<string[]>;
@@ -62,13 +58,8 @@ export interface Spec extends TurboModule {
setAutofillShowSearchText(showSearchText: boolean): Promise<void>;
// Clipboard management
- clearClipboardAfterDelay(delayInSeconds: number): Promise<void>;
copyToClipboardWithExpiration(text: string, expirationSeconds: number): Promise<void>;
- // Exact alarm permission management
- canScheduleExactAlarms(): Promise<boolean>;
- requestExactAlarmPermission(): Promise<string>;
-
// Battery optimization management
isIgnoringBatteryOptimizations(): Promise<boolean>;
requestIgnoreBatteryOptimizations(): Promise<string>;