mirror/aliasvault
1
0
Fork 0
mirror of https://github.com/aliasvault/aliasvault.git synced 2026-03-27 19:14:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Return proper expected error codes in Android NativeVaultManager (#1360)

Browse Source
This commit is contained in:
Leendert de Borst
2025-11-14 18:43:38 +01:00
committed by Leendert de Borst
parent 94bad91411
commit dbfee0f5b6
1 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
apps/mobile-app/android/app/src/main/java/net/aliasvault/app/nativevaultmanager/NativeVaultManager.kt
View File

@@ -22,6 +22,7 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext
import net.aliasvault.app.vaultstore.VaultStore
import net.aliasvault.app.vaultstore.VaultSyncError
import net.aliasvault.app.vaultstore.keystoreprovider.AndroidKeystoreProvider
import net.aliasvault.app.vaultstore.storageprovider.AndroidStorageProvider
import net.aliasvault.app.webapi.WebApiService
@@ -1218,10 +1219,17 @@ class NativeVaultManager(reactContext: ReactApplicationContext) :
withContext(Dispatchers.Main) {
promise.resolve(resultMap)
}
} catch (e: VaultSyncError) {
withContext(Dispatchers.Main) {
Log.e(TAG, "Vault sync error checking vault version", e)
// Map VaultSyncError to proper error codes for React Native
promise.reject(e.code, e.message, e)
}
} catch (e: Exception) {
withContext(Dispatchers.Main) {
Log.e(TAG, "Error checking vault version", e)
promise.reject("ERR_CHECK_VAULT_VERSION", "Failed to check vault version: ${e.message}", e)
// Fallback for unknown errors
promise.reject("VAULT_CHECK_VERSION_ERROR", "Failed to check vault version: ${e.message}", e)
}
}
}
@@ -1240,10 +1248,17 @@ class NativeVaultManager(reactContext: ReactApplicationContext) :
withContext(Dispatchers.Main) {
promise.resolve(success)
}
} catch (e: VaultSyncError) {
withContext(Dispatchers.Main) {
Log.e(TAG, "Vault sync error downloading vault", e)
// Map VaultSyncError to proper error codes for React Native
promise.reject(e.code, e.message, e)
}
} catch (e: Exception) {
withContext(Dispatchers.Main) {
Log.e(TAG, "Error downloading vault", e)
promise.reject("ERR_DOWNLOAD_VAULT", "Failed to download vault: ${e.message}", e)
// Fallback for unknown errors
promise.reject("VAULT_DOWNLOAD_ERROR", "Failed to download vault: ${e.message}", e)
}
}
}
@@ -1261,10 +1276,17 @@ class NativeVaultManager(reactContext: ReactApplicationContext) :
withContext(Dispatchers.Main) {
promise.resolve(success)
}
} catch (e: VaultSyncError) {
withContext(Dispatchers.Main) {
Log.e(TAG, "Vault sync error mutating vault", e)
// Map VaultSyncError to proper error codes for React Native
promise.reject(e.code, e.message, e)
}
} catch (e: Exception) {
withContext(Dispatchers.Main) {
Log.e(TAG, "Error mutating vault", e)
promise.reject("ERR_MUTATE_VAULT", "Failed to mutate vault: ${e.message}", e)
// Fallback for unknown errors
promise.reject("VAULT_MUTATE_ERROR", "Failed to mutate vault: ${e.message}", e)
}
}
}