Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

fix(repo): expose decrypted credentials through ProviderRepository

Celtiore66ffbdd4898e
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModel.kt
index ab039874..4801f0cc 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModel.kt
@@ -7,7 +7,6 @@ import com.streamvault.data.remote.xtream.XtreamNetworkException
import com.streamvault.data.remote.xtream.XtreamParsingException
import com.streamvault.data.remote.xtream.XtreamRequestException
import com.streamvault.data.remote.xtream.XtreamResponseTooLargeException
-import com.streamvault.data.security.CredentialCrypto
import com.streamvault.data.security.CredentialDecryptionException
import com.streamvault.domain.manager.BackupConflictStrategy
import com.streamvault.domain.manager.DriveAuthState
@@ -56,7 +55,6 @@ class ProviderSetupViewModel @Inject constructor(
private val validateAndAddProvider: ValidateAndAddProvider,
private val importBackup: ImportBackup,
private val driveBackupSyncManager: DriveBackupSyncManager,
- private val credentialCrypto: CredentialCrypto,
) : ViewModel() {
enum class OnboardingCompletion {
@@ -172,17 +170,12 @@ class ProviderSetupViewModel @Inject constructor(
private suspend fun applyPendingDriveCredentials() {
val pending = _uiState.value.pendingDriveCredentials.orEmpty()
if (pending.isEmpty()) return
- val providers = providerRepository.getProviders().first()
pending.forEach { cred ->
- val match = providers.firstOrNull { provider ->
- provider.serverUrl == cred.serverUrl &&
- credentialCrypto.decryptIfNeeded(provider.username) == cred.username
- } ?: return@forEach
- val updated = match.copy(
- username = credentialCrypto.encryptIfNeeded(cred.username),
- password = credentialCrypto.encryptIfNeeded(cred.password),
+ providerRepository.updateProviderPassword(
+ serverUrl = cred.serverUrl,
+ username = cred.username,
+ cleartextPassword = cred.password,
)
- providerRepository.updateProvider(updated)
}
_uiState.update { it.copy(pendingDriveCredentials = null) }
}
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsDriveBackupActions.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsDriveBackupActions.kt
index aa3572b7..31bd9cbf 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsDriveBackupActions.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsDriveBackupActions.kt
@@ -3,11 +3,9 @@ package com.streamvault.app.ui.screens.settings
import androidx.activity.result.ActivityResultLauncher
import android.content.Intent
import android.util.Log
-import com.streamvault.data.security.CredentialCrypto
import com.streamvault.domain.manager.DriveAuthState
import com.streamvault.domain.manager.DriveBackupSyncManager
import com.streamvault.domain.manager.DriveSyncStatus
-import com.streamvault.domain.manager.ProviderCredentials
import com.streamvault.domain.model.Result
import com.streamvault.domain.repository.ProviderRepository
import com.streamvault.domain.usecase.ImportBackup
@@ -16,7 +14,6 @@ import com.streamvault.domain.usecase.InspectBackupResult
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.collect
-import kotlinx.coroutines.flow.first
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
@@ -33,7 +30,6 @@ internal class SettingsDriveBackupActions(
private val driveManager: DriveBackupSyncManager,
private val importBackup: ImportBackup,
private val providerRepository: ProviderRepository,
- private val credentialCrypto: CredentialCrypto,
private val uiState: MutableStateFlow<SettingsUiState>
) {
@@ -161,18 +157,10 @@ internal class SettingsDriveBackupActions(
}
return@launch
}
- // Chain credentials push (M3). Decrypt local-DB ciphertexts before
- // uploading: the Drive copy lives in appDataFolder cleartext.
- val providers = providerRepository.getProviders().first()
- val credentials = providers
- .filter { it.username.isNotBlank() && it.password.isNotBlank() }
- .map { provider ->
- ProviderCredentials(
- serverUrl = provider.serverUrl,
- username = credentialCrypto.decryptIfNeeded(provider.username),
- password = credentialCrypto.decryptIfNeeded(provider.password),
- )
- }
+ // Chain credentials push (M3). The repository handles decryption
+ // internally so the cleartext never crosses the data layer except
+ // via the typed ProviderCredentials payload returned here.
+ val credentials = providerRepository.getAllProviderCredentials()
val credsResult = driveManager.pushCredentials(credentials)
uiState.update { state ->
when (credsResult) {
@@ -246,19 +234,16 @@ internal class SettingsDriveBackupActions(
scope.launch {
val pending = uiState.value.pendingDriveCredentials.orEmpty()
if (pending.isEmpty()) return@launch
- val providers = providerRepository.getProviders().first()
var applied = 0
pending.forEach { cred ->
- val match = providers.firstOrNull { provider ->
- provider.serverUrl == cred.serverUrl &&
- credentialCrypto.decryptIfNeeded(provider.username) == cred.username
- } ?: return@forEach
- val updated = match.copy(
- username = credentialCrypto.encryptIfNeeded(cred.username),
- password = credentialCrypto.encryptIfNeeded(cred.password),
- )
- providerRepository.updateProvider(updated)
- applied++
+ if (providerRepository.updateProviderPassword(
+ serverUrl = cred.serverUrl,
+ username = cred.username,
+ cleartextPassword = cred.password,
+ )
+ ) {
+ applied++
+ }
}
Log.d("DriveSync", "applyPendingCredentials: $applied / ${pending.size} matched")
uiState.update { it.copy(pendingDriveCredentials = null) }
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt
index a5b36cf0..c19b0ee4 100644
--- a/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt
+++ b/app/src/main/java/com/streamvault/app/ui/screens/settings/SettingsViewModel.kt
@@ -23,7 +23,6 @@ import com.streamvault.data.local.dao.XtreamIndexJobDao
import com.streamvault.data.local.dao.XtreamLiveOnboardingDao
import com.streamvault.data.local.entity.XtreamIndexJobEntity
import com.streamvault.data.preferences.PreferencesRepository
-import com.streamvault.data.security.CredentialCrypto
import com.streamvault.data.sync.SyncManager
import com.streamvault.data.sync.SyncRepairSection
import com.streamvault.domain.manager.BackupConflictStrategy
@@ -95,7 +94,6 @@ class SettingsViewModel @Inject constructor(
private val internetSpeedTestRunner: InternetSpeedTestRunner,
private val backupManager: BackupManager,
private val driveBackupSyncManager: DriveBackupSyncManager,
- private val credentialCrypto: CredentialCrypto,
private val recordingManager: RecordingManager,
private val parentalControlManager: ParentalControlManager,
private val syncManager: SyncManager,
@@ -136,7 +134,6 @@ class SettingsViewModel @Inject constructor(
driveManager = driveBackupSyncManager,
importBackup = importBackup,
providerRepository = providerRepository,
- credentialCrypto = credentialCrypto,
uiState = _uiState
)
private val recordingActions = SettingsRecordingActions(
diff --git a/app/src/test/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModelTest.kt b/app/src/test/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModelTest.kt
index 579e7ab2..3fdf72d8 100644
--- a/app/src/test/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModelTest.kt
+++ b/app/src/test/java/com/streamvault/app/ui/screens/provider/ProviderSetupViewModelTest.kt
@@ -10,7 +10,6 @@ import com.streamvault.domain.repository.CombinedM3uRepository
import com.streamvault.domain.repository.ProviderRepository
import com.streamvault.domain.manager.BackupImportPlan
import com.streamvault.domain.manager.BackupImportResult
-import com.streamvault.data.security.CredentialCrypto
import com.streamvault.domain.manager.DriveAuthState
import com.streamvault.domain.manager.DriveBackupSyncManager
import com.streamvault.domain.usecase.ImportBackup
@@ -29,7 +28,6 @@ import org.junit.After
import org.junit.Before
import org.junit.Test
import org.mockito.kotlin.any
-import org.mockito.kotlin.doAnswer
import org.mockito.kotlin.eq
import org.mockito.kotlin.mock
import org.mockito.kotlin.verify
@@ -43,10 +41,6 @@ class ProviderSetupViewModelTest {
private val validateAndAddProvider: ValidateAndAddProvider = mock()
private val importBackup: ImportBackup = mock()
private val driveBackupSyncManager: DriveBackupSyncManager = mock()
- private val credentialCrypto: CredentialCrypto = mock {
- on { encryptIfNeeded(any()) } doAnswer { it.getArgument(0) }
- on { decryptIfNeeded(any()) } doAnswer { it.getArgument(0) }
- }
private val testDispatcher = StandardTestDispatcher()
@Before
@@ -88,7 +82,6 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
- credentialCrypto = credentialCrypto,
)
viewModel.addM3u("https://example.com/list.m3u", "Playlist 7", "", "")
@@ -123,7 +116,6 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
- credentialCrypto = credentialCrypto,
)
viewModel.loginXtream("https://example.com", "alice", "secret", "Premium", "", "")
@@ -156,7 +148,6 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
- credentialCrypto = credentialCrypto,
)
val field = ProviderSetupViewModel::class.java.getDeclaredField("_uiState").apply { isAccessible = true }
@Suppress("UNCHECKED_CAST")
@@ -183,7 +174,6 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
- credentialCrypto = credentialCrypto,
)
val seededState = viewModel.uiState.value.copy(
@@ -235,7 +225,6 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
- credentialCrypto = credentialCrypto,
)
viewModel.addM3u("https://example.com/list.m3u", "Playlist 7", "", "")
@@ -257,7 +246,6 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
- credentialCrypto = credentialCrypto,
)
viewModel.applySourceDefaults(ProviderSetupViewModel.SetupSourceType.STALKER)
@@ -275,7 +263,6 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
- credentialCrypto = credentialCrypto,
)
viewModel.applySourceDefaults(ProviderSetupViewModel.SetupSourceType.XTREAM)
@@ -293,7 +280,6 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
- credentialCrypto = credentialCrypto,
)
viewModel.applySourceDefaults(ProviderSetupViewModel.SetupSourceType.M3U)
@@ -311,7 +297,6 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
- credentialCrypto = credentialCrypto,
)
viewModel.updateEpgSyncMode(ProviderEpgSyncMode.SKIP)
@@ -344,7 +329,6 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
- credentialCrypto = credentialCrypto,
)
// Simulate being in edit mode for provider 7.
@@ -377,7 +361,6 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
- credentialCrypto = credentialCrypto,
)
viewModel.addM3u("https://example.com/list.m3u", "Playlist", "", "")
@@ -402,7 +385,6 @@ class ProviderSetupViewModelTest {
validateAndAddProvider = validateAndAddProvider,
importBackup = importBackup,
driveBackupSyncManager = driveBackupSyncManager,
- credentialCrypto = credentialCrypto,
)
viewModel.loginStalker(
diff --git a/data/src/main/java/com/streamvault/data/repository/ProviderRepositoryImpl.kt b/data/src/main/java/com/streamvault/data/repository/ProviderRepositoryImpl.kt
index 29af8fb9..cc34c591 100644
--- a/data/src/main/java/com/streamvault/data/repository/ProviderRepositoryImpl.kt
+++ b/data/src/main/java/com/streamvault/data/repository/ProviderRepositoryImpl.kt
@@ -18,6 +18,7 @@ import com.streamvault.data.sync.SyncManager
import com.streamvault.data.sync.hasUsableLiveCatalogForActivation
import com.streamvault.data.util.ProviderInputSanitizer
import com.streamvault.data.util.UrlSecurityPolicy
+import com.streamvault.domain.manager.ProviderCredentials
import com.streamvault.domain.model.*
import com.streamvault.domain.provider.IptvProvider
import com.streamvault.domain.repository.LiveStreamProgramRequest
@@ -86,6 +87,35 @@ class ProviderRepositoryImpl @Inject constructor(
Result.error("Failed to update provider: ${e.message}", e)
}
+ override suspend fun getAllProviderCredentials(): List<ProviderCredentials> {
+ return providerDao.getAllSync()
+ .map { entity ->
+ ProviderCredentials(
+ serverUrl = entity.serverUrl,
+ username = entity.username,
+ password = try {
+ credentialCrypto.decryptIfNeeded(entity.password)
+ } catch (e: Throwable) {
+ ""
+ },
+ )
+ }
+ .filter { it.username.isNotBlank() && it.password.isNotBlank() }
+ }
+
+ override suspend fun updateProviderPassword(
+ serverUrl: String,
+ username: String,
+ cleartextPassword: String,
+ ): Boolean {
+ val entity = providerDao.getAllSync().firstOrNull {
+ it.serverUrl == serverUrl && it.username == username
+ } ?: return false
+ val encrypted = credentialCrypto.encryptIfNeeded(cleartextPassword)
+ providerDao.update(entity.copy(password = encrypted))
+ return true
+ }
+
override suspend fun deleteProvider(id: Long): Result<Unit> = try {
val recordingRunIds = recordingRunDao.getIdsByProvider(id)
val reminderIds = programReminderDao.getIdsByProvider(id)
diff --git a/domain/src/main/java/com/streamvault/domain/repository/ProviderRepository.kt b/domain/src/main/java/com/streamvault/domain/repository/ProviderRepository.kt
index 45185b9e..f4319d79 100644
--- a/domain/src/main/java/com/streamvault/domain/repository/ProviderRepository.kt
+++ b/domain/src/main/java/com/streamvault/domain/repository/ProviderRepository.kt
@@ -1,5 +1,6 @@
package com.streamvault.domain.repository
+import com.streamvault.domain.manager.ProviderCredentials
import com.streamvault.domain.model.Program
import com.streamvault.domain.model.Provider
import com.streamvault.domain.model.ProviderEpgSyncMode
@@ -19,6 +20,26 @@ interface ProviderRepository {
suspend fun addProvider(provider: Provider): Result<Long>
suspend fun updateProvider(provider: Provider): Result<Unit>
suspend fun deleteProvider(id: Long): Result<Unit>
+
+ /**
+ * Returns cleartext credentials for all providers that have both a
+ * username and a password. Used by the Drive credentials sync path
+ * (M3). Decryption happens inside the `:data` layer — the cleartext
+ * payload is only ever exposed via this single typed method.
+ */
+ suspend fun getAllProviderCredentials(): List<ProviderCredentials>
+
+ /**
+ * Applies a cleartext password to the provider matched by
+ * `(serverUrl, username)`. Encryption happens inside the `:data`
+ * layer. Returns true if a matching provider was found and updated.
+ */
+ suspend fun updateProviderPassword(
+ serverUrl: String,
+ username: String,
+ cleartextPassword: String,
+ ): Boolean
+
suspend fun setActiveProvider(id: Long): Result<Unit>
suspend fun loginXtream(serverUrl: String, username: String, password: String, name: String, httpUserAgent: String = "", httpHeaders: String = "", xtreamFastSyncEnabled: Boolean, epgSyncMode: ProviderEpgSyncMode = ProviderEpgSyncMode.BACKGROUND, xtreamLiveSyncMode: ProviderXtreamLiveSyncMode = ProviderXtreamLiveSyncMode.AUTO, onProgress: ((String) -> Unit)? = null, id: Long? = null): Result<Provider>
suspend fun validateM3u(url: String, name: String, httpUserAgent: String = "", httpHeaders: String = "", epgSyncMode: ProviderEpgSyncMode = ProviderEpgSyncMode.BACKGROUND, m3uVodClassificationEnabled: Boolean = false, onProgress: ((String) -> Unit)? = null, id: Long? = null): Result<Provider>