mirror of
https://github.com/recloudstream/cloudstream.git
synced 2024-08-15 01:53:11 +00:00
Add support for profile locks
This commit is contained in:
parent
4b93524e57
commit
9d957d7cc7
6 changed files with 242 additions and 39 deletions
|
@ -55,7 +55,6 @@ class WhoIsWatchingAdapter(
|
||||||
editCallBack = editCallBack,
|
editCallBack = editCallBack,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
override fun onBindViewHolder(holder: WhoIsWatchingHolder, position: Int) =
|
override fun onBindViewHolder(holder: WhoIsWatchingHolder, position: Int) =
|
||||||
holder.bind(currentList.getOrNull(position))
|
holder.bind(currentList.getOrNull(position))
|
||||||
|
|
||||||
|
@ -70,10 +69,15 @@ class WhoIsWatchingAdapter(
|
||||||
fun bind(card: DataStoreHelper.Account?) {
|
fun bind(card: DataStoreHelper.Account?) {
|
||||||
when (binding) {
|
when (binding) {
|
||||||
is WhoIsWatchingAccountBinding -> binding.apply {
|
is WhoIsWatchingAccountBinding -> binding.apply {
|
||||||
if(card == null) return@apply
|
if (card == null) return@apply
|
||||||
outline.isVisible = card.keyIndex == DataStoreHelper.selectedKeyIndex
|
outline.isVisible = card.keyIndex == DataStoreHelper.selectedKeyIndex
|
||||||
profileText.text = card.name
|
profileText.text = card.name
|
||||||
profileImageBackground.setImage(card.image)
|
profileImageBackground.setImage(card.image)
|
||||||
|
|
||||||
|
// Handle the lock indicator
|
||||||
|
val isLocked = card.lockPin != null
|
||||||
|
lockIcon.isVisible = isLocked
|
||||||
|
|
||||||
root.setOnClickListener {
|
root.setOnClickListener {
|
||||||
selectCallBack(card)
|
selectCallBack(card)
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,9 +3,15 @@ package com.lagradost.cloudstream3.utils
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.DialogInterface
|
import android.content.DialogInterface
|
||||||
import android.text.Editable
|
import android.text.Editable
|
||||||
|
import android.text.TextWatcher
|
||||||
import android.view.LayoutInflater
|
import android.view.LayoutInflater
|
||||||
|
import android.view.View
|
||||||
|
import android.view.inputmethod.EditorInfo
|
||||||
|
import android.widget.TextView
|
||||||
|
import androidx.annotation.StringRes
|
||||||
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
|
||||||
|
@ -19,6 +25,7 @@ import com.lagradost.cloudstream3.AcraApplication.Companion.removeKey
|
||||||
import com.lagradost.cloudstream3.AcraApplication.Companion.removeKeys
|
import com.lagradost.cloudstream3.AcraApplication.Companion.removeKeys
|
||||||
import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
|
import com.lagradost.cloudstream3.AcraApplication.Companion.setKey
|
||||||
import com.lagradost.cloudstream3.CommonActivity.showToast
|
import com.lagradost.cloudstream3.CommonActivity.showToast
|
||||||
|
import com.lagradost.cloudstream3.databinding.LockPinDialogBinding
|
||||||
import com.lagradost.cloudstream3.databinding.WhoIsWatchingAccountEditBinding
|
import com.lagradost.cloudstream3.databinding.WhoIsWatchingAccountEditBinding
|
||||||
import com.lagradost.cloudstream3.databinding.WhoIsWatchingBinding
|
import com.lagradost.cloudstream3.databinding.WhoIsWatchingBinding
|
||||||
import com.lagradost.cloudstream3.mvvm.logError
|
import com.lagradost.cloudstream3.mvvm.logError
|
||||||
|
@ -27,7 +34,6 @@ import com.lagradost.cloudstream3.syncproviders.SyncAPI
|
||||||
import com.lagradost.cloudstream3.ui.WatchType
|
import com.lagradost.cloudstream3.ui.WatchType
|
||||||
import com.lagradost.cloudstream3.ui.WhoIsWatchingAdapter
|
import com.lagradost.cloudstream3.ui.WhoIsWatchingAdapter
|
||||||
import com.lagradost.cloudstream3.ui.library.ListSorting
|
import com.lagradost.cloudstream3.ui.library.ListSorting
|
||||||
import com.lagradost.cloudstream3.ui.result.FOCUS_SELF
|
|
||||||
import com.lagradost.cloudstream3.ui.result.UiImage
|
import com.lagradost.cloudstream3.ui.result.UiImage
|
||||||
import com.lagradost.cloudstream3.ui.result.VideoWatchState
|
import com.lagradost.cloudstream3.ui.result.VideoWatchState
|
||||||
import com.lagradost.cloudstream3.ui.result.setImage
|
import com.lagradost.cloudstream3.ui.result.setImage
|
||||||
|
@ -136,6 +142,8 @@ object DataStoreHelper {
|
||||||
val customImage: String? = null,
|
val customImage: String? = null,
|
||||||
@JsonProperty("defaultImageIndex")
|
@JsonProperty("defaultImageIndex")
|
||||||
val defaultImageIndex: Int,
|
val defaultImageIndex: Int,
|
||||||
|
@JsonProperty("lockPin")
|
||||||
|
val lockPin: String? = null,
|
||||||
) {
|
) {
|
||||||
val image: UiImage
|
val image: UiImage
|
||||||
get() = customImage?.let { UiImage.Image(it) } ?: UiImage.Drawable(
|
get() = customImage?.let { UiImage.Image(it) } ?: UiImage.Drawable(
|
||||||
|
@ -230,36 +238,86 @@ object DataStoreHelper {
|
||||||
|
|
||||||
binding.profilePic.setImage(account.image)
|
binding.profilePic.setImage(account.image)
|
||||||
binding.profilePic.setOnClickListener {
|
binding.profilePic.setOnClickListener {
|
||||||
// rolls the image forwards once
|
// Roll the image forwards once
|
||||||
currentEditAccount =
|
currentEditAccount =
|
||||||
currentEditAccount.copy(defaultImageIndex = (currentEditAccount.defaultImageIndex + 1) % profileImages.size)
|
currentEditAccount.copy(defaultImageIndex = (currentEditAccount.defaultImageIndex + 1) % profileImages.size)
|
||||||
binding.profilePic.setImage(currentEditAccount.image)
|
binding.profilePic.setImage(currentEditAccount.image)
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.applyBtt.setOnClickListener {
|
binding.applyBtt.setOnClickListener {
|
||||||
val currentAccounts = accounts.toMutableList()
|
if (currentEditAccount.lockPin != null) {
|
||||||
|
// Ask for the current PIN
|
||||||
val overrideIndex =
|
showPinInputDialog(context, currentEditAccount.lockPin, false) { pin ->
|
||||||
currentAccounts.indexOfFirst { it.keyIndex == currentEditAccount.keyIndex }
|
if (pin == null) return@showPinInputDialog
|
||||||
|
// PIN is correct, proceed to update the account
|
||||||
// if an account is found that has the same keyIndex then override that one, if not then append it
|
performAccountUpdate(currentEditAccount)
|
||||||
if (overrideIndex != -1) {
|
dialog.dismissSafe()
|
||||||
currentAccounts[overrideIndex] = currentEditAccount
|
}
|
||||||
} else {
|
} else {
|
||||||
currentAccounts.add(currentEditAccount)
|
// No lock PIN set, proceed to update the account
|
||||||
|
performAccountUpdate(currentEditAccount)
|
||||||
|
dialog.dismissSafe()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Save the current homepage for new accounts
|
|
||||||
val currentHomePage = DataStoreHelper.currentHomePage
|
|
||||||
|
|
||||||
// set the new default account as well as add the key for the new account
|
|
||||||
setAccount(currentEditAccount, false)
|
|
||||||
DataStoreHelper.currentHomePage = currentHomePage
|
|
||||||
|
|
||||||
accounts = currentAccounts.toTypedArray()
|
|
||||||
|
|
||||||
dialog.dismissSafe()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Handle setting or changing the PIN
|
||||||
|
|
||||||
|
if (currentEditAccount.keyIndex == getDefaultAccount(context).keyIndex) {
|
||||||
|
binding.lockProfileCheckbox.isVisible = false
|
||||||
|
if (currentEditAccount.lockPin != null) {
|
||||||
|
currentEditAccount = currentEditAccount.copy(lockPin = null)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var canSetPin = true
|
||||||
|
|
||||||
|
binding.lockProfileCheckbox.isChecked = currentEditAccount.lockPin != null
|
||||||
|
|
||||||
|
binding.lockProfileCheckbox.setOnCheckedChangeListener { _, isChecked ->
|
||||||
|
if (isChecked) {
|
||||||
|
if (canSetPin) {
|
||||||
|
showPinInputDialog(context, null, true) { pin ->
|
||||||
|
if (pin == null) {
|
||||||
|
binding.lockProfileCheckbox.isChecked = false
|
||||||
|
return@showPinInputDialog
|
||||||
|
}
|
||||||
|
|
||||||
|
currentEditAccount = currentEditAccount.copy(lockPin = pin)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (currentEditAccount.lockPin != null) {
|
||||||
|
// Ask for the current PIN
|
||||||
|
showPinInputDialog(context, currentEditAccount.lockPin, true) { pin ->
|
||||||
|
if (pin == null || pin != currentEditAccount.lockPin) {
|
||||||
|
canSetPin = false
|
||||||
|
binding.lockProfileCheckbox.isChecked = true
|
||||||
|
} else {
|
||||||
|
currentEditAccount = currentEditAccount.copy(lockPin = null)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
canSetPin = true
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun performAccountUpdate(account: Account) {
|
||||||
|
val currentAccounts = accounts.toMutableList()
|
||||||
|
|
||||||
|
val overrideIndex = currentAccounts.indexOfFirst { it.keyIndex == account.keyIndex }
|
||||||
|
|
||||||
|
if (overrideIndex != -1) {
|
||||||
|
currentAccounts[overrideIndex] = account
|
||||||
|
} else {
|
||||||
|
currentAccounts.add(account)
|
||||||
|
}
|
||||||
|
|
||||||
|
val currentHomePage = this.currentHomePage
|
||||||
|
setAccount(account, false)
|
||||||
|
this.currentHomePage = currentHomePage
|
||||||
|
accounts = currentAccounts.toTypedArray()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun getDefaultAccount(context: Context): Account {
|
private fun getDefaultAccount(context: Context): Account {
|
||||||
|
@ -273,9 +331,9 @@ object DataStoreHelper {
|
||||||
}
|
}
|
||||||
|
|
||||||
fun showWhoIsWatching(context: Context) {
|
fun showWhoIsWatching(context: Context) {
|
||||||
val binding: WhoIsWatchingBinding = WhoIsWatchingBinding.inflate(
|
val binding: WhoIsWatchingBinding = WhoIsWatchingBinding.inflate(LayoutInflater.from(context))
|
||||||
LayoutInflater.from(context)
|
val builder = BottomSheetDialog(context)
|
||||||
)
|
builder.setContentView(binding.root)
|
||||||
|
|
||||||
val showAccount = accounts.toMutableList().apply {
|
val showAccount = accounts.toMutableList().apply {
|
||||||
val item = getDefaultAccount(context)
|
val item = getDefaultAccount(context)
|
||||||
|
@ -283,22 +341,25 @@ object DataStoreHelper {
|
||||||
add(0, item)
|
add(0, item)
|
||||||
}
|
}
|
||||||
|
|
||||||
val builder =
|
|
||||||
BottomSheetDialog(context)
|
|
||||||
builder.setContentView(binding.root)
|
|
||||||
val accountName = context.getString(R.string.account)
|
val accountName = context.getString(R.string.account)
|
||||||
|
|
||||||
binding.profilesRecyclerview.setLinearListLayout(
|
binding.profilesRecyclerview.setLinearListLayout(isHorizontal = true)
|
||||||
isHorizontal = true,
|
|
||||||
nextUp = FOCUS_SELF,
|
|
||||||
nextDown = FOCUS_SELF,
|
|
||||||
nextLeft = FOCUS_SELF,
|
|
||||||
nextRight = FOCUS_SELF
|
|
||||||
)
|
|
||||||
binding.profilesRecyclerview.adapter = WhoIsWatchingAdapter(
|
binding.profilesRecyclerview.adapter = WhoIsWatchingAdapter(
|
||||||
selectCallBack = { account ->
|
selectCallBack = { account ->
|
||||||
setAccount(account, true)
|
// Check if the selected account has a lock PIN set
|
||||||
builder.dismissSafe()
|
if (account.lockPin != null) {
|
||||||
|
// Prompt for the lock pin
|
||||||
|
showPinInputDialog(context, account.lockPin, false) { pin ->
|
||||||
|
if (pin == null) return@showPinInputDialog
|
||||||
|
// Pin is correct, unlock the profile
|
||||||
|
setAccount(account, true)
|
||||||
|
builder.dismissSafe()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// No lock PIN set, directly set the account
|
||||||
|
setAccount(account, true)
|
||||||
|
builder.dismissSafe()
|
||||||
|
}
|
||||||
},
|
},
|
||||||
addAccountCallback = {
|
addAccountCallback = {
|
||||||
val currentAccounts = accounts
|
val currentAccounts = accounts
|
||||||
|
@ -334,6 +395,96 @@ object DataStoreHelper {
|
||||||
builder.show()
|
builder.show()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun showPinInputDialog(
|
||||||
|
context: Context,
|
||||||
|
currentPin: String?,
|
||||||
|
editAccount: Boolean,
|
||||||
|
callback: (String?) -> Unit
|
||||||
|
) {
|
||||||
|
fun TextView.visibleWithText(@StringRes textRes: Int) {
|
||||||
|
visibility = View.VISIBLE
|
||||||
|
setText(textRes)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun View.isVisible() = visibility == View.VISIBLE
|
||||||
|
|
||||||
|
val binding = LockPinDialogBinding.inflate(LayoutInflater.from(context))
|
||||||
|
|
||||||
|
binding.pinEditTextError.visibility = View.GONE
|
||||||
|
|
||||||
|
val isPinSet = currentPin != null
|
||||||
|
val isNewPin = editAccount && !isPinSet
|
||||||
|
val isEditPin = editAccount && isPinSet
|
||||||
|
|
||||||
|
val titleRes = if (isEditPin) R.string.enter_current_pin else R.string.enter_pin
|
||||||
|
|
||||||
|
val dialog = AlertDialog.Builder(context, R.style.AlertDialogCustom)
|
||||||
|
.setView(binding.root)
|
||||||
|
.setTitle(titleRes)
|
||||||
|
.setNegativeButton(R.string.cancel) { _, _ ->
|
||||||
|
callback.invoke(null)
|
||||||
|
}
|
||||||
|
.setOnCancelListener {
|
||||||
|
callback.invoke(null)
|
||||||
|
}
|
||||||
|
.setOnDismissListener {
|
||||||
|
if (binding.pinEditTextError.isVisible()) {
|
||||||
|
callback.invoke(null)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.create()
|
||||||
|
|
||||||
|
var isPinValid = false
|
||||||
|
|
||||||
|
binding.pinEditText.addTextChangedListener(object : TextWatcher {
|
||||||
|
override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) {}
|
||||||
|
|
||||||
|
override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
|
||||||
|
val enteredPin = s.toString()
|
||||||
|
val isEnteredPinValid = enteredPin.length == 4
|
||||||
|
|
||||||
|
if (isEnteredPinValid) {
|
||||||
|
if (isPinSet) {
|
||||||
|
if (enteredPin != currentPin) {
|
||||||
|
binding.pinEditTextError.visibleWithText(R.string.pin_error_incorrect)
|
||||||
|
binding.pinEditText.text = null
|
||||||
|
isPinValid = false
|
||||||
|
} else {
|
||||||
|
binding.pinEditTextError.visibility = View.GONE
|
||||||
|
isPinValid = true
|
||||||
|
|
||||||
|
callback.invoke(enteredPin)
|
||||||
|
dialog.dismiss()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
binding.pinEditTextError.visibility = View.GONE
|
||||||
|
isPinValid = true
|
||||||
|
}
|
||||||
|
} else if (isNewPin) {
|
||||||
|
binding.pinEditTextError.visibleWithText(R.string.pin_error_length)
|
||||||
|
isPinValid = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun afterTextChanged(s: Editable?) {}
|
||||||
|
})
|
||||||
|
|
||||||
|
// Detect IME_ACTION_DONE
|
||||||
|
binding.pinEditText.setOnEditorActionListener { _, actionId, _ ->
|
||||||
|
if (actionId == EditorInfo.IME_ACTION_DONE && isPinValid) {
|
||||||
|
val enteredPin = binding.pinEditText.text.toString()
|
||||||
|
callback.invoke(enteredPin)
|
||||||
|
dialog.dismiss()
|
||||||
|
}
|
||||||
|
true
|
||||||
|
}
|
||||||
|
|
||||||
|
// 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()
|
||||||
|
}
|
||||||
|
|
||||||
data class PosDur(
|
data class PosDur(
|
||||||
@JsonProperty("position") val position: Long,
|
@JsonProperty("position") val position: Long,
|
||||||
|
|
25
app/src/main/res/layout/lock_pin_dialog.xml
Normal file
25
app/src/main/res/layout/lock_pin_dialog.xml
Normal file
|
@ -0,0 +1,25 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<LinearLayout
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:padding="16dp">
|
||||||
|
|
||||||
|
<EditText
|
||||||
|
android:id="@+id/pinEditText"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="16dp"
|
||||||
|
android:hint="@string/pin"
|
||||||
|
android:inputType="numberPassword"
|
||||||
|
android:maxLength="4" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:id="@+id/pinEditTextError"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginTop="8dp"
|
||||||
|
android:visibility="gone" />
|
||||||
|
|
||||||
|
</LinearLayout>
|
|
@ -35,6 +35,15 @@
|
||||||
android:background="@drawable/outline_card"
|
android:background="@drawable/outline_card"
|
||||||
android:visibility="gone" />
|
android:visibility="gone" />
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:id="@+id/lock_icon"
|
||||||
|
android:layout_width="24dp"
|
||||||
|
android:layout_height="24dp"
|
||||||
|
android:layout_gravity="top|end"
|
||||||
|
android:layout_margin="4dp"
|
||||||
|
android:src="@drawable/video_locked"
|
||||||
|
android:visibility="gone" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/profile_text"
|
android:id="@+id/profile_text"
|
||||||
tools:text="@string/mobile_data"
|
tools:text="@string/mobile_data"
|
||||||
|
|
|
@ -77,6 +77,12 @@
|
||||||
android:textColorHint="?attr/grayTextColor"
|
android:textColorHint="?attr/grayTextColor"
|
||||||
tools:ignore="LabelFor" />
|
tools:ignore="LabelFor" />
|
||||||
|
|
||||||
|
<CheckBox
|
||||||
|
android:id="@+id/lockProfileCheckbox"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/lock_profile" />
|
||||||
|
|
||||||
<androidx.cardview.widget.CardView
|
<androidx.cardview.widget.CardView
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
|
|
|
@ -714,4 +714,12 @@
|
||||||
|
|
||||||
|
|
||||||
<string name="tv_no_focus_tag" translatable="false">tv_no_focus_tag</string>
|
<string name="tv_no_focus_tag" translatable="false">tv_no_focus_tag</string>
|
||||||
|
|
||||||
|
|
||||||
|
<string name="enter_pin">Enter PIN</string>
|
||||||
|
<string name="enter_current_pin">Enter Current PIN</string>
|
||||||
|
<string name="lock_profile">Lock Profile</string>
|
||||||
|
<string name="pin">PIN</string>
|
||||||
|
<string name="pin_error_incorrect">Incorrect PIN. Please try again.</string>
|
||||||
|
<string name="pin_error_length">PIN must be 4 characters</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue