Skip to content

chore: Update Core for fake Block Store support #324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tevincent merged 2 commits into from
Oct 6, 2026
+10 −19
Merged

chore: Update Core for fake Block Store support #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45fc03a
chore: Update Core for fake Block Store support
LouisCAD Oct 6, 2026
4ec3976
chore: Remove commented code
LouisCAD Oct 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Core
Open in desktop
Submodule Core updated 7 files
+1 −0 Auth/build.gradle.kts
+7 −0 Auth/src/fdroid/kotlin/com/infomaniak/core/auth/backup/BlockStoreBackup.kt
+3 −0 Auth/src/main/kotlin/com/infomaniak/core/auth/backup/BlockStoreCredentialsBackup.kt
+42 −0 Auth/src/standard/kotlin/com/infomaniak/core/auth/backup/BlockStore.kt
+17 −23 Auth/src/standard/kotlin/com/infomaniak/core/auth/backup/BlockStoreBackup.kt
+62 −0 Auth/src/standard/kotlin/com/infomaniak/core/auth/backup/BlockStorePlayServicesImpl.kt
+84 −0 Auth/src/standard/kotlin/com/infomaniak/core/auth/backup/BlockStoreTestingImpl.kt
1 change: 1 addition & 0 deletions app/src/standard/kotlin/com/infomaniak/auth/backup/AuthenticatorFullBackupAgent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class AuthenticatorFullBackupAgent : FullBackupAgent(RestorationPolicy.AllBacked
}

override fun onFullBackup(data: FullBackupDataOutput) = withBlockStoreCredentialsBackup(
data = data,
backupCredentials = { BlockStoreBackup.backupPasskeys() }
) {
super.onFullBackup(data)
Expand Down
26 changes: 8 additions & 18 deletions app/src/standard/kotlin/com/infomaniak/auth/backup/BlockStoreBackup.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,21 @@

package com.infomaniak.auth.backup

import com.google.android.gms.auth.blockstore.Blockstore
import com.google.android.gms.auth.blockstore.BlockstoreClient
import com.google.android.gms.auth.blockstore.RetrieveBytesRequest
import com.google.android.gms.auth.blockstore.StoreBytesData
import com.infomaniak.core.auth.backup.BlockStore
import com.infomaniak.core.common.cancellable
import com.infomaniak.core.sentry.SentryLog
import com.infomaniak.multiplatform_authenticator.core.PasskeysStorageLocation
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.invoke
import kotlinx.coroutines.tasks.await
import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.decodeFromByteArray
import kotlinx.serialization.encodeToByteArray
import kotlinx.serialization.protobuf.ProtoBuf
import splitties.init.appCtx
import java.io.File

object BlockStoreBackup {
private val blockstoreClient = Blockstore.getClient(appCtx)
private val blockStore = BlockStore.instance
private const val PASSKEYS_KEY = "pk"
private const val TAG = "BlockStoreBackup"

Expand Down Expand Up @@ -65,13 +61,12 @@ object BlockStoreBackup {
}
return false
}
val storeRequest = StoreBytesData.Builder()
.setKey(PASSKEYS_KEY)
.setShouldBackupToCloud(true)
.setBytes(protobufEncodedBytes)
.build()
return runCatching {
blockstoreClient.storeBytes(storeRequest).await()
blockStore.storeBytes(
key = PASSKEYS_KEY,
shouldBackupToCloud = true,
bytes = protobufEncodedBytes
)
true
}.cancellable().getOrElse { throwable ->
SentryLog.wtf(TAG, "Failed to backup passkeys", throwable)
Expand All @@ -93,10 +88,7 @@ object BlockStoreBackup {
}

private suspend fun readPasskeysBackup(): PasskeysBackup? {
val retrieveRequest = RetrieveBytesRequest.Builder()
.setKeys(listOf(PASSKEYS_KEY))
.build()
val bytes = blockstoreClient.retrieveBytes(retrieveRequest).await().blockstoreDataMap[PASSKEYS_KEY]?.bytes
val bytes = blockStore.retrieveBytes(listOf(PASSKEYS_KEY))[PASSKEYS_KEY]
?: return null
return ProtoBuf.decodeFromByteArray<PasskeysBackup>(bytes)
}
Expand Down Expand Up @@ -133,8 +125,6 @@ object BlockStoreBackup {
isPublic = isPublic,
)

private suspend fun isE2eeAvailable(): Boolean = blockstoreClient.isEndToEndEncryptionAvailable.await()

private data class KeyPairReference(
val userId: Long,
val keyId: String,
Expand Down
Loading