diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index c5c0ff3b..0897082f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,17 +4,15 @@
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index bae407fa..183b8697 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -208,6 +208,7 @@ dependencies {
implementation("androidx.palette:palette-ktx:1.0.0") // Palette For Images -> Colors
implementation("androidx.tvprovider:tvprovider:1.0.0")
implementation("com.github.discord:OverlappingPanels:0.1.5") // Gestures
+ implementation ("androidx.biometric:biometric:1.2.0-alpha05") // Fingerprint Authentication
implementation("com.github.rubensousa:previewseekbar-media3:1.1.1.0") // SeekBar Preview
// Extensions & Other Libs
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e665c3bc..a23ef725 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
-
+
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
index 6083f5ab..03608533 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -127,6 +127,9 @@ import com.lagradost.cloudstream3.utils.AppUtils.loadSearchResult
import com.lagradost.cloudstream3.utils.AppUtils.setDefaultFocus
import com.lagradost.cloudstream3.utils.BackupUtils.backup
import com.lagradost.cloudstream3.utils.BackupUtils.setUpBackup
+import com.lagradost.cloudstream3.utils.BiometricAuthenticator
+import com.lagradost.cloudstream3.utils.BiometricAuthenticator.isTruePhone
+import com.lagradost.cloudstream3.utils.BiometricAuthenticator.promptInfo
import com.lagradost.cloudstream3.utils.Coroutines.ioSafe
import com.lagradost.cloudstream3.utils.Coroutines.main
import com.lagradost.cloudstream3.utils.DataStore.getKey
@@ -1152,6 +1155,16 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
changeStatusBarState(isEmulatorSettings())
+ /** Biometric Stuff **/
+ val authEnabled = settingsManager.getBoolean(
+ getString(R.string.biometric_enabled_key), false)
+
+ if (isTruePhone() && authEnabled) {
+ BiometricAuthenticator.initializeBiometrics(this@MainActivity)
+ BiometricAuthenticator.checkBiometricAvailability(this@MainActivity)
+ BiometricAuthenticator.biometricPrompt.authenticate(promptInfo)
+ }
+
// Automatically enable jsdelivr if cant connect to raw.githubusercontent.com
if (this.getKey(getString(R.string.jsdelivr_proxy_key)) == null && isNetworkAvailable()) {
main {
diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/BiometricAuthenticator.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/BiometricAuthenticator.kt
new file mode 100644
index 00000000..fd7aa525
--- /dev/null
+++ b/app/src/main/java/com/lagradost/cloudstream3/utils/BiometricAuthenticator.kt
@@ -0,0 +1,141 @@
+package com.lagradost.cloudstream3.utils
+
+import android.content.Context
+import android.os.Build
+import android.util.Log
+import android.widget.Toast
+import androidx.biometric.BiometricManager
+import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_STRONG
+import androidx.biometric.BiometricManager.Authenticators.BIOMETRIC_WEAK
+import androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL
+import androidx.biometric.BiometricPrompt
+import androidx.core.content.ContextCompat
+import com.lagradost.cloudstream3.AcraApplication.Companion.context
+import com.lagradost.cloudstream3.MainActivity
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isEmulatorSettings
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTrueTvSettings
+import com.lagradost.cloudstream3.ui.settings.SettingsFragment.Companion.isTvSettings
+
+object BiometricAuthenticator {
+
+ private lateinit var biometricManager: BiometricManager
+ lateinit var biometricPrompt: BiometricPrompt
+ lateinit var promptInfo: BiometricPrompt.PromptInfo
+
+ fun initializeBiometrics(activity: MainActivity) {
+ val executor = ContextCompat.getMainExecutor(activity)
+ biometricManager = BiometricManager.from(activity)
+
+ biometricPrompt = BiometricPrompt(activity, executor, object : BiometricPrompt.AuthenticationCallback() {
+
+ override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
+ super.onAuthenticationError(errorCode, errString)
+ Toast.makeText(context?.applicationContext, "Authentication error: $errString", Toast.LENGTH_SHORT).show()
+ activity.finish()
+ }
+
+ override fun onAuthenticationSucceeded(result: BiometricPrompt.AuthenticationResult) {
+ super.onAuthenticationSucceeded(result)
+ Log.d("Cs3Auth", "Biometric succeeded.")
+ }
+
+ override fun onAuthenticationFailed() {
+ super.onAuthenticationFailed()
+ Toast.makeText(context?.applicationContext, "Authentication failed", Toast.LENGTH_SHORT).show()
+ activity.finish()
+ }
+ })
+
+ promptInfo = BiometricPrompt.PromptInfo.Builder()
+ .setTitle("CloudStream")
+ .setSubtitle("Log in using your biometric credential")
+ //.setNegativeButtonText("Use account password")
+ .setAllowedAuthenticators(BIOMETRIC_WEAK or BIOMETRIC_STRONG or DEVICE_CREDENTIAL)
+ .build()
+ }
+
+ fun checkBiometricAvailability(context: Context) {
+
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+
+ // Strong and credential bundle cannot be checked at same time in API < 11
+ when (biometricManager.canAuthenticate(BIOMETRIC_WEAK or BIOMETRIC_STRONG or DEVICE_CREDENTIAL)) {
+ BiometricManager.BIOMETRIC_SUCCESS ->
+ Log.d("Cs3Auth", "App can authenticate.")
+
+ BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE ->
+ Log.d("Cs3Auth", "No biometric sensor found.")
+
+ BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE ->
+ Log.d("Cs3Auth", "Biometric authentication is currently unavailable.")
+
+ BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED ->
+ Toast.makeText(
+ context,
+ "No biometric credentials are enrolled",
+ Toast.LENGTH_SHORT
+ ).show()
+
+ BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED -> {
+ Toast.makeText(
+ context,
+ "Please update your software and security patches.",
+ Toast.LENGTH_SHORT
+ ).show()
+ }
+
+ BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED -> {
+ Toast.makeText(
+ context,
+ "Please update your software and security patches.",
+ Toast.LENGTH_SHORT
+ ).show()
+ }
+
+ BiometricManager.BIOMETRIC_STATUS_UNKNOWN -> {
+ Log.d("Cs3Auth", "Unknown error encountered(Biometric data failed).")
+ }
+ }
+ }
+
+ else {
+
+ when (biometricManager.canAuthenticate(BIOMETRIC_WEAK or BIOMETRIC_STRONG)) {
+
+ BiometricManager.BIOMETRIC_SUCCESS ->
+ Log.d("Cs3Auth", "App can authenticate using biometrics.")
+ BiometricManager.BIOMETRIC_ERROR_NO_HARDWARE ->
+ Log.e("Cs3Auth", "No biometric features available on this device.")
+ BiometricManager.BIOMETRIC_ERROR_HW_UNAVAILABLE ->
+ Log.e("Cs3Auth", "Biometric features are currently unavailable.")
+ BiometricManager.BIOMETRIC_ERROR_NONE_ENROLLED ->
+ Log.e("Cs3Auth", "Biometric features are currently unavailable.")
+
+ BiometricManager.BIOMETRIC_ERROR_SECURITY_UPDATE_REQUIRED -> {
+ Toast.makeText(
+ context,
+ "Please update your software and security patches.",
+ Toast.LENGTH_SHORT
+ ).show()
+ }
+
+ BiometricManager.BIOMETRIC_ERROR_UNSUPPORTED -> {
+ Toast.makeText(
+ context,
+ "Please update your software and security patches.",
+ Toast.LENGTH_SHORT
+ ).show()
+ }
+
+ BiometricManager.BIOMETRIC_STATUS_UNKNOWN -> {
+ Log.d("Cs3Auth", "Unknown error encountered(Biometric data failed).")
+ }
+ }
+ }
+ }
+
+ // yes, this feature is phone exclusive
+ fun isTruePhone(): Boolean {
+ return !isTrueTvSettings() && !isTvSettings() && context?.isEmulatorSettings() != true
+ }
+}
diff --git a/app/src/main/res/drawable/ic_fingerprint.xml b/app/src/main/res/drawable/ic_fingerprint.xml
new file mode 100644
index 00000000..5c96e5a5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_fingerprint.xml
@@ -0,0 +1,11 @@
+
+
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6048d5cc..062a7285 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -67,6 +67,7 @@
enable_nsfw_on_providers_key
skip_startup_account_select_key
enable_skip_op_from_database
+ biometric_key
%d %s | %s
%s • %s
@@ -240,7 +241,7 @@
Error backing up %s
Search
Library
- Accounts
+ Accounts and Security
Updates and backup
Info
Advanced Search
@@ -740,4 +741,5 @@
auto_rotate_video_key
Enable automatic switching of screen orientation based on video orientation
Auto rotate
+ Use Fingerprint authentication
diff --git a/app/src/main/res/xml/settings_account.xml b/app/src/main/res/xml/settings_account.xml
index ec882088..d0316f96 100644
--- a/app/src/main/res/xml/settings_account.xml
+++ b/app/src/main/res/xml/settings_account.xml
@@ -1,11 +1,5 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
\ No newline at end of file