diff options
author | Torsten Grote <t@grobox.de> | 2024-02-02 15:43:45 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2024-02-02 15:43:45 -0300 |
commit | 4c70379547179b33768b22f51a90c1a93be67b2b (patch) | |
tree | 8879f49d14e87362e275c0d0eb2c358e93204704 /wallet/src/main | |
parent | 162e9068566e5068cd804183815c416e082070ab (diff) | |
download | taler-android-4c70379547179b33768b22f51a90c1a93be67b2b.tar.gz taler-android-4c70379547179b33768b22f51a90c1a93be67b2b.tar.bz2 taler-android-4c70379547179b33768b22f51a90c1a93be67b2b.zip |
[wallet] use expected DB file extension
Diffstat (limited to 'wallet/src/main')
-rw-r--r-- | wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt b/wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt index ea58dd7..4e179bb 100644 --- a/wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt +++ b/wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt @@ -27,18 +27,18 @@ import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.decodeFromJsonElement import net.taler.wallet.backend.TalerErrorCode.NONE import org.json.JSONObject +import java.io.File -const val WALLET_DB = "talerwalletdb.sql" +private const val WALLET_DB = "talerwalletdb.sqlite3" @OptIn(DelicateCoroutinesApi::class) class WalletBackendApi( - app: Application, + private val app: Application, private val versionReceiver: VersionReceiver, notificationReceiver: NotificationReceiver, ) { private val backendManager = BackendManager(notificationReceiver) - private val dbPath = "${app.filesDir}/${WALLET_DB}" init { GlobalScope.launch(Dispatchers.IO) { @@ -48,8 +48,14 @@ class WalletBackendApi( } private suspend fun sendInitMessage() { + val db = if (File(app.filesDir, "talerwalletdb.sql").isFile) { + // can be removed after a reasonable migration period (2024-02-02) + "${app.filesDir}/talerwalletdb.sql" + } else { + "${app.filesDir}/${WALLET_DB}" + } request("init", InitResponse.serializer()) { - put("persistentStoragePath", dbPath) + put("persistentStoragePath", db) put("logLevel", "INFO") }.onSuccess { response -> versionReceiver.onVersionReceived(response.versionInfo) @@ -77,6 +83,7 @@ class WalletBackendApi( } ?: Unit as T WalletResponse.Success(t) } + is ApiResponse.Error -> { val error: TalerErrorInfo = json.decodeFromJsonElement(response.error) WalletResponse.Error(error) @@ -99,6 +106,7 @@ class WalletBackendApi( is ApiResponse.Response -> { WalletResponse.Success(response.result) } + is ApiResponse.Error -> { val error: TalerErrorInfo = json.decodeFromJsonElement(response.error) WalletResponse.Error(error) |