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 some things

Browse source
This commit is contained in:
Luna712 2023-10-29 11:26:18 -06:00
parent e1ab4c8062
commit 6deaf120a2
1 changed files with 27 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -234,7 +234,7 @@ object DataStoreHelper {
dialog?.dismissSafe() dialog?.dismissSafe()
} }
binding.profilePic.setImage(currentEditAccount.image) binding.profilePic.setImage(account.image)
binding.profilePic.setOnClickListener { binding.profilePic.setOnClickListener {
// Roll the image forwards once // Roll the image forwards once
currentEditAccount = currentEditAccount =
@ -245,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, false) { pin -> showPinInputDialog(context, currentEditAccount.lockPin, 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)
@ -262,6 +262,9 @@ object DataStoreHelper {
if (currentEditAccount.keyIndex == getDefaultAccount(context).keyIndex) { if (currentEditAccount.keyIndex == getDefaultAccount(context).keyIndex) {
binding.lockProfileCheckbox.isVisible = false binding.lockProfileCheckbox.isVisible = false
if (currentEditAccount.lockPin != null) {
currentEditAccount = currentEditAccount.copy(lockPin = null)
}
} }
var canSetPin = true var canSetPin = true
@ -283,14 +286,14 @@ object DataStoreHelper {
} else { } else {
if (currentEditAccount.lockPin != null) { if (currentEditAccount.lockPin != null) {
// Ask for the current PIN // Ask for the current PIN
showPinInputDialog(context, currentEditAccount, true) { pin -> showPinInputDialog(context, currentEditAccount.lockPin, 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
} else {
currentEditAccount = currentEditAccount.copy(lockPin = null)
} }
} }
} else {
currentEditAccount = currentEditAccount.copy(lockPin = null)
} }
} }
} }
@ -309,9 +312,9 @@ object DataStoreHelper {
currentAccounts.add(account) currentAccounts.add(account)
} }
val currentHomePage = DataStoreHelper.currentHomePage val currentHomePage = this.currentHomePage
setAccount(account, false) setAccount(account, false)
DataStoreHelper.currentHomePage = currentHomePage this.currentHomePage = currentHomePage
accounts = currentAccounts.toTypedArray() accounts = currentAccounts.toTypedArray()
} }
@ -344,7 +347,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, false) { pin -> showPinInputDialog(context, account.lockPin, 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)
@ -392,20 +395,16 @@ object DataStoreHelper {
private fun showPinInputDialog( private fun showPinInputDialog(
context: Context, context: Context,
account: Account?, currentPin: String?,
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)
@ -458,6 +457,17 @@ object DataStoreHelper {
true true
} }
// Only when setting pin
if (editAccount && currentPin == null) {
dialog.setButton(AlertDialog.BUTTON_POSITIVE, context.getString(R.string.setup_done)) { _, _ ->
if (isPinValid) {
val enteredPin = binding.pinEditText.text.toString()
callback.invoke(enteredPin)
dialog.dismiss()
}
}
}
dialog.setButton(AlertDialog.BUTTON_NEGATIVE, context.getString(R.string.cancel)) { _, _ -> dialog.setButton(AlertDialog.BUTTON_NEGATIVE, context.getString(R.string.cancel)) { _, _ ->
dialog.dismiss() dialog.dismiss()
} }
@ -468,6 +478,10 @@ object DataStoreHelper {
} }
} }
// We don't want to accidentally have the dialog dismiss when clicking outside of it.
// That is what the cancel button is for.
dialog.setCanceledOnTouchOutside(false)
dialog.show() dialog.show()
} }