From cba7580f2630fef8c4f2f73e76f56eaf3273b747 Mon Sep 17 00:00:00 2001
From: Louis CAD <louis.cognault@infomaniak.com>
Date: Mon, 28 Sep 2026 11:21:02 +0200
Subject: [PATCH] fix: Replace appCtx usage from BackupAgent

Now, we're passing the Context.
We could also use the injectAsAppCtx() extension.
---
 .../infomaniak/core/auth/backup/BlockStoreBackup.kt |  8 ++++++--
 .../core/auth/backup/BlockStoreCredentialsBackup.kt |  4 ++--
 .../infomaniak/core/auth/backup/BlockStoreBackup.kt | 13 +++++++------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/Auth/src/fdroid/kotlin/com/infomaniak/core/auth/backup/BlockStoreBackup.kt b/Auth/src/fdroid/kotlin/com/infomaniak/core/auth/backup/BlockStoreBackup.kt
index c6b2d5753..2a063815a 100644
--- a/Auth/src/fdroid/kotlin/com/infomaniak/core/auth/backup/BlockStoreBackup.kt
+++ b/Auth/src/fdroid/kotlin/com/infomaniak/core/auth/backup/BlockStoreBackup.kt
@@ -17,8 +17,12 @@
  */
 package com.infomaniak.core.auth.backup
 
-object BlockStoreBackup {
-    const val isSupported: Boolean = false
+class BlockStoreBackup(context: Context) {
+
+    companion object {
+        const val isSupported: Boolean = false
+    }
+
     suspend fun backupTokens(): Boolean = false
     suspend fun restoreTokens(): Boolean = false
 }
diff --git a/Auth/src/main/kotlin/com/infomaniak/core/auth/backup/BlockStoreCredentialsBackup.kt b/Auth/src/main/kotlin/com/infomaniak/core/auth/backup/BlockStoreCredentialsBackup.kt
index ebd3fcdb3..28d0b55d0 100644
--- a/Auth/src/main/kotlin/com/infomaniak/core/auth/backup/BlockStoreCredentialsBackup.kt
+++ b/Auth/src/main/kotlin/com/infomaniak/core/auth/backup/BlockStoreCredentialsBackup.kt
@@ -25,9 +25,9 @@ import com.infomaniak.core.auth.room.UserDatabase
 import com.infomaniak.core.common.backup.FullBackupAgent
 import kotlinx.coroutines.runBlocking
 
-context(_: FullBackupAgent)
+context(backupAgent: FullBackupAgent)
 inline fun withBlockStoreCredentialsBackup(
-    crossinline backupCredentials: suspend () -> Boolean = { BlockStoreBackup.backupTokens() },
+    crossinline backupCredentials: suspend () -> Boolean = { BlockStoreBackup(backupAgent).backupTokens() },
     crossinline defaultBackupCalls: () -> Unit
 ): Unit = runBlocking {
     if (BlockStoreBackup.isSupported.not()) {
diff --git a/Auth/src/standard/kotlin/com/infomaniak/core/auth/backup/BlockStoreBackup.kt b/Auth/src/standard/kotlin/com/infomaniak/core/auth/backup/BlockStoreBackup.kt
index 362d8e586..a230004b6 100644
--- a/Auth/src/standard/kotlin/com/infomaniak/core/auth/backup/BlockStoreBackup.kt
+++ b/Auth/src/standard/kotlin/com/infomaniak/core/auth/backup/BlockStoreBackup.kt
@@ -17,6 +17,7 @@
  */
 package com.infomaniak.core.auth.backup
 
+import android.content.Context
 import androidx.collection.LongObjectMap
 import androidx.collection.buildLongObjectMap
 import androidx.room.immediateTransaction
@@ -29,17 +30,17 @@ import com.infomaniak.core.auth.room.UserDatabase
 import com.infomaniak.core.common.cancellable
 import com.infomaniak.core.sentry.SentryLog
 import kotlinx.coroutines.tasks.await
-import splitties.init.appCtx
 
-object BlockStoreBackup {
+class BlockStoreBackup(context: Context) {
 
-    private const val TAG = "BlockStoreBackup"
+    companion object {
+        const val isSupported: Boolean = true
+        private const val TAG = "BlockStoreBackup"
+    }
 
-    private val blockstoreClient = Blockstore.getClient(appCtx)
+    private val blockstoreClient = Blockstore.getClient(context)
     private val db = UserDatabase.instance
 
-    const val isSupported: Boolean = true
-
     suspend fun backupTokens(): Boolean {
         val backupContent = dumpTokens()
         val alreadyBackedUpContent = readTokensBackup()