Skip to content

security: migrate Android secrets to EncryptedSharedPreferences #75

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

Open
juliosuas wants to merge 2 commits into
base: main
Choose a base branch
from
Open

security: migrate Android secrets to EncryptedSharedPreferences #75

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
41ff064
security: migrate Android secrets to EncryptedSharedPreferences
Apr 6, 2026
7f6458b
Merge upstream main and adapt encrypted preferences
juliosuas Sep 5, 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
1 change: 1 addition & 0 deletions samples/CameraAccessAndroid/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ dependencies {
implementation(libs.datastore.preferences)
implementation(libs.gson)
implementation(libs.lifecycle.process)
implementation(libs.security.crypto)
androidTestImplementation(libs.androidx.ui.test.junit4)
androidTestImplementation(libs.androidx.test.uiautomator)
androidTestImplementation(libs.androidx.test.rules)
Expand Down
29 changes: 26 additions & 3 deletions ...in/java/com/meta/wearable/dat/externalsampleapps/cameraaccess/settings/SettingsManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package com.meta.wearable.dat.externalsampleapps.cameraaccess.settings

import android.content.Context
import android.content.SharedPreferences
import androidx.security.crypto.EncryptedSharedPreferences
import androidx.security.crypto.MasterKey
import com.meta.wearable.dat.externalsampleapps.cameraaccess.Secrets
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
Expand Down Expand Up @@ -40,9 +42,11 @@ enum class CaptureSource(val value: String, val label: String) {

object SettingsManager {
private const val PREFS_NAME = "visionclaw_settings"
private const val SECURE_PREFS_NAME = "visionclaw_secure"
private const val DEFAULT_SIGNALING_URL = "wss://YOUR_SIGNALING_SERVER"

private lateinit var prefs: SharedPreferences
private lateinit var securePrefs: SharedPreferences

private val _captureSourceFlow = MutableStateFlow(CaptureSource.PHONE)
val captureSourceFlow: StateFlow<CaptureSource> = _captureSourceFlow.asStateFlow()
Expand All @@ -55,10 +59,28 @@ object SettingsManager {

fun init(context: Context) {
prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
val masterKey = MasterKey.Builder(context)
.setKeyScheme(MasterKey.KeyScheme.AES256_GCM)
.build()
securePrefs = EncryptedSharedPreferences.create(
context,
SECURE_PREFS_NAME,
masterKey,
EncryptedSharedPreferences.PrefKeyEncryptionScheme.AES256_SIV,
EncryptedSharedPreferences.PrefValueEncryptionScheme.AES256_GCM,
)
migrateGatewayToken()
_captureSourceFlow.value = CaptureSource.fromValue(prefs.getString("captureSource", null))
refreshUnlocked()
}

private fun migrateGatewayToken() {
val legacyToken = prefs.getString("gatewayToken", null) ?: return
if (securePrefs.edit().putString("gatewayToken", legacyToken).commit()) {
prefs.edit().remove("gatewayToken").apply()
}
}

fun refreshUnlocked() {
_unlockedFlow.value = isUnlocked
}
Expand All @@ -76,9 +98,9 @@ object SettingsManager {
set(value) = prefs.edit().putString("gatewayBaseUrl", value).apply()

var gatewayToken: String
get() = prefs.getString("gatewayToken", null) ?: Secrets.gatewayToken
get() = securePrefs.getString("gatewayToken", null) ?: Secrets.gatewayToken
set(value) {
prefs.edit().putString("gatewayToken", value).apply()
securePrefs.edit().putString("gatewayToken", value).apply()
refreshUnlocked()
}

Expand All @@ -104,8 +126,8 @@ object SettingsManager {
get() = isGatewayConfigured && accountStatus != "pending"

fun signOut() {
securePrefs.edit().remove("gatewayToken").apply()
prefs.edit()
.remove("gatewayToken")
.remove("accountEmail")
.remove("accountUserId")
.remove("accountStatus")
Expand Down Expand Up @@ -134,6 +156,7 @@ object SettingsManager {
set(value) = prefs.edit().putString("webrtcSignalingURL", value).apply()

fun resetAll() {
securePrefs.edit().clear().apply()
prefs.edit().clear().apply()
_captureSourceFlow.value = CaptureSource.PHONE
refreshUnlocked()
Expand Down
2 changes: 2 additions & 0 deletions samples/CameraAccessAndroid/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ camerax = "1.4.1"
datastore = "1.1.1"
gson = "2.11.0"
lifecycleProcess = "2.8.7"
securityCrypto = "1.1.0-alpha06"

[libraries]
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
Expand Down Expand Up @@ -46,6 +47,7 @@ camerax-view = { group = "androidx.camera", name = "camera-view", version.ref =
datastore-preferences = { group = "androidx.datastore", name = "datastore-preferences", version.ref = "datastore" }
gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
lifecycle-process = { group = "androidx.lifecycle", name = "lifecycle-process", version.ref = "lifecycleProcess" }
security-crypto = { group = "androidx.security", name = "security-crypto", version.ref = "securityCrypto" }

[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
Expand Down