taler-android

Android apps for GNU Taler (wallet, PoS, cashier)
Log | Files | Refs | README | LICENSE

config-change-locks-the-wallet-out-of-its-database.diff (3128B)


      1 diff --git a/wallet/src/main/java/net/taler/wallet/backend/BackendManager.kt b/wallet/src/main/java/net/taler/wallet/backend/BackendManager.kt
      2 index b9ef17b5..f667e414 100644
      3 --- a/wallet/src/main/java/net/taler/wallet/backend/BackendManager.kt
      4 +++ b/wallet/src/main/java/net/taler/wallet/backend/BackendManager.kt
      5 @@ -70,6 +70,10 @@ class BackendManager(
      6  
      7      private var running = false
      8  
      9 +    /** Whether wallet-core is up in this process. */
     10 +    val isRunning: Boolean
     11 +        @Synchronized get() = running
     12 +
     13      private fun newScope() = CoroutineScope(Dispatchers.Default + SupervisorJob())
     14  
     15      @Synchronized
     16 diff --git a/wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt b/wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt
     17 index 26a8ed89..2a3c8925 100644
     18 --- a/wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt
     19 +++ b/wallet/src/main/java/net/taler/wallet/backend/WalletBackendApi.kt
     20 @@ -41,6 +41,9 @@ class WalletBackendApi(
     21  
     22      private val backendManager = BackendManager(notificationReceiver)
     23  
     24 +    /** Whether wallet-core is already up, and so must not be initialised again. */
     25 +    val isRunning: Boolean get() = backendManager.isRunning
     26 +
     27      fun startWallet() {
     28          backendManager.run()
     29          GlobalScope.launch(Dispatchers.IO) {
     30 diff --git a/wallet/src/main/java/net/taler/wallet/main/MainActivity.kt b/wallet/src/main/java/net/taler/wallet/main/MainActivity.kt
     31 index 4868fbca..367faa68 100644
     32 --- a/wallet/src/main/java/net/taler/wallet/main/MainActivity.kt
     33 +++ b/wallet/src/main/java/net/taler/wallet/main/MainActivity.kt
     34 @@ -238,7 +238,14 @@ class MainActivity : FragmentActivity() {
     35              }
     36          }
     37  
     38 -        model.startWallet()
     39 +        // wallet-core belongs to the retained MainViewModel, and onDestroy
     40 +        // deliberately leaves it running across a configuration change -- so
     41 +        // starting it again here sends a second "init", whose fresh wallet
     42 +        // cannot take the SQLite database from the instance still holding it
     43 +        // ("could not acquire exclusive ownership of the wallet database").
     44 +        // Changing the language, the font size or the display size recreates
     45 +        // this activity, which is how a user met that error screen.
     46 +        if (!model.walletRunning) model.startWallet()
     47  
     48          handleIntents(intent)
     49  
     50 diff --git a/wallet/src/main/java/net/taler/wallet/main/MainViewModel.kt b/wallet/src/main/java/net/taler/wallet/main/MainViewModel.kt
     51 index 9c2bf023..cd0e2c81 100644
     52 --- a/wallet/src/main/java/net/taler/wallet/main/MainViewModel.kt
     53 +++ b/wallet/src/main/java/net/taler/wallet/main/MainViewModel.kt
     54 @@ -165,6 +165,12 @@ class MainViewModel(
     55          MutableStateFlow<DatabaseMigrationState>(DatabaseMigrationState.None)
     56      val databaseMigrationState: StateFlow<DatabaseMigrationState> = mDatabaseMigrationState
     57  
     58 +    /**
     59 +     * Whether wallet-core is already running, so that an activity being
     60 +     * recreated does not start it a second time.
     61 +     */
     62 +    val walletRunning: Boolean get() = api.isRunning
     63 +
     64      fun startWallet() {
     65          api.startWallet()
     66      }