Skip to content

Reset pin on Backup #252

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
ovitrif merged 3 commits into from
Jul 23, 2025
Merged

Reset pin on Backup #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
998d792
refactor: create resetPin extension function
jvsena42 Jul 23, 2025
82efdce
fix: reset pin on backup restore
jvsena42 Jul 23, 2025
3b6de24
fix: reset pin on settings backup
jvsena42 Jul 23, 2025
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
8 changes: 8 additions & 0 deletions app/src/main/java/to/bitkit/data/SettingsStore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,11 @@ data class SettingsData(
val electrumServer: ElectrumServer = Env.defaultElectrumServer,
val rgsServerUrl: String? = Env.ldkRgsServerUrl,
)

fun SettingsData.resetPin() = this.copy(
isPinEnabled = false,
isPinOnLaunchEnabled = true,
isPinOnIdleEnabled = false,
isPinForPaymentsEnabled = false,
isBiometricEnabled = false,
)
5 changes: 3 additions & 2 deletions app/src/main/java/to/bitkit/repositories/BackupsRepo.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import to.bitkit.data.WidgetsData
import to.bitkit.data.WidgetsStore
import to.bitkit.data.backup.VssBackupsClient
import to.bitkit.data.backup.VssObjectInfo
import to.bitkit.data.resetPin
import to.bitkit.di.BgDispatcher
import to.bitkit.di.json
import to.bitkit.ext.formatPlural
Expand Down Expand Up @@ -243,7 +244,7 @@ class BackupsRepo @Inject constructor(

private suspend fun getBackupDataBytes(category: BackupCategory): ByteArray = when (category) {
BackupCategory.SETTINGS -> {
val data = settingsStore.data.first()
val data = settingsStore.data.first().resetPin()
json.encodeToString(data).toByteArray()
}

Expand Down Expand Up @@ -295,7 +296,7 @@ class BackupsRepo @Inject constructor(

return@withContext try {
performRestore(BackupCategory.SETTINGS) { dataBytes ->
val parsed = json.decodeFromString<SettingsData>(String(dataBytes))
val parsed = json.decodeFromString<SettingsData>(String(dataBytes)).resetPin()
settingsStore.update { parsed }
}
performRestore(BackupCategory.WIDGETS) { dataBytes ->
Expand Down
9 changes: 2 additions & 7 deletions app/src/main/java/to/bitkit/viewmodels/AppViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import org.lightningdevkit.ldknode.Txid
import to.bitkit.R
import to.bitkit.data.SettingsStore
import to.bitkit.data.keychain.Keychain
import to.bitkit.data.resetPin
import to.bitkit.di.BgDispatcher
import to.bitkit.env.Env
import to.bitkit.ext.WatchResult
Expand Down Expand Up @@ -1132,13 +1133,7 @@ class AppViewModel @Inject constructor(
fun removePin() {
viewModelScope.launch(bgDispatcher) {
settingsStore.update {
it.copy(
isPinEnabled = false,
isPinOnLaunchEnabled = true,
isPinOnIdleEnabled = false,
isPinForPaymentsEnabled = false,
isBiometricEnabled = false,
)
it.resetPin()
}
keychain.delete(Keychain.Key.PIN.name)
keychain.upsertString(Keychain.Key.PIN_ATTEMPTS_REMAINING.name, Env.PIN_ATTEMPTS.toString())
Expand Down
Loading