recloudstream/cloudstream
2
2
Fork 1
mirror of https://github.com/recloudstream/cloudstream.git synced 2024-08-15 01:53:11 +00:00
Code Issues Releases Wiki Activity

Fix bug and don't allow pin on default account

Browse source
This commit is contained in:
Luna712 2023-10-28 20:31:39 -06:00
parent 737fa75d28
commit bc8a481817
1 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

24
app/src/main/java/com/lagradost/cloudstream3/utils/DataStoreHelper.kt
View file

@ -9,6 +9,7 @@ import android.view.View
import android.view.inputmethod.EditorInfo import android.view.inputmethod.EditorInfo
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.core.view.isGone import androidx.core.view.isGone
import androidx.core.view.isVisible
import androidx.core.widget.doOnTextChanged import androidx.core.widget.doOnTextChanged
import com.fasterxml.jackson.annotation.JsonProperty import com.fasterxml.jackson.annotation.JsonProperty
import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialog
@ -244,7 +245,7 @@ object DataStoreHelper {
binding.applyBtt.setOnClickListener { binding.applyBtt.setOnClickListener {
if (currentEditAccount.lockPin != null) { if (currentEditAccount.lockPin != null) {
// Ask for the current PIN // Ask for the current PIN
showPinInputDialog(context, currentEditAccount.lockPin, false) { pin -> showPinInputDialog(context, currentEditAccount, false) { pin ->
if (pin == null) return@showPinInputDialog if (pin == null) return@showPinInputDialog
// PIN is correct, proceed to update the account // PIN is correct, proceed to update the account
performAccountUpdate(currentEditAccount) performAccountUpdate(currentEditAccount)
@ -258,6 +259,11 @@ object DataStoreHelper {
} }
// Handle setting or changing the PIN // Handle setting or changing the PIN
if (currentEditAccount.keyIndex == getDefaultAccount(context).keyIndex) {
binding.lockProfileCheckbox.isVisible = false
}
var canSetPin = true var canSetPin = true
binding.lockProfileCheckbox.isChecked = currentEditAccount.lockPin != null binding.lockProfileCheckbox.isChecked = currentEditAccount.lockPin != null
@ -266,14 +272,18 @@ object DataStoreHelper {
if (isChecked) { if (isChecked) {
if (canSetPin) { if (canSetPin) {
showPinInputDialog(context, null, true) { pin -> showPinInputDialog(context, null, true) { pin ->
if (pin == null) return@showPinInputDialog if (pin == null) {
binding.lockProfileCheckbox.isChecked = false
return@showPinInputDialog
}
currentEditAccount = currentEditAccount.copy(lockPin = pin) currentEditAccount = currentEditAccount.copy(lockPin = pin)
} }
} }
} else { } else {
if (currentEditAccount.lockPin != null) { if (currentEditAccount.lockPin != null) {
// Ask for the current PIN // Ask for the current PIN
showPinInputDialog(context, currentEditAccount.lockPin, true) { pin -> showPinInputDialog(context, currentEditAccount, true) { pin ->
if (pin == null || pin != currentEditAccount.lockPin) { if (pin == null || pin != currentEditAccount.lockPin) {
canSetPin = false canSetPin = false
binding.lockProfileCheckbox.isChecked = true binding.lockProfileCheckbox.isChecked = true
@ -334,7 +344,7 @@ object DataStoreHelper {
// Check if the selected account has a lock PIN set // Check if the selected account has a lock PIN set
if (account.lockPin != null) { if (account.lockPin != null) {
// Prompt for the lock pin // Prompt for the lock pin
showPinInputDialog(context, account.lockPin, false) { pin -> showPinInputDialog(context, account, false) { pin ->
if (pin == null) return@showPinInputDialog if (pin == null) return@showPinInputDialog
// Pin is correct, unlock the profile // Pin is correct, unlock the profile
setAccount(account, true) setAccount(account, true)
@ -382,16 +392,20 @@ object DataStoreHelper {
private fun showPinInputDialog( private fun showPinInputDialog(
context: Context, context: Context,
currentPin: String?, account: Account?,
editAccount: Boolean, editAccount: Boolean,
callback: (String?) -> Unit callback: (String?) -> Unit
) { ) {
if (account?.keyIndex == getDefaultAccount(context).keyIndex) return
val binding: LockPinDialogBinding = LockPinDialogBinding.inflate(LayoutInflater.from(context)) val binding: LockPinDialogBinding = LockPinDialogBinding.inflate(LayoutInflater.from(context))
val builder = AlertDialog.Builder(context, R.style.AlertDialogCustom) val builder = AlertDialog.Builder(context, R.style.AlertDialogCustom)
.setView(binding.root) .setView(binding.root)
val dialog = builder.create() val dialog = builder.create()
val currentPin = account?.lockPin
if (editAccount && currentPin != null) { if (editAccount && currentPin != null) {
dialog.setTitle(R.string.enter_current_pin) dialog.setTitle(R.string.enter_current_pin)
} else dialog.setTitle(R.string.enter_pin) } else dialog.setTitle(R.string.enter_pin)