justinzeus/Wholphin
1
0
Fork 0
mirror of https://github.com/JustinZeus/Wholphin.git synced 2026-07-08 23:51:21 +02:00
Code Issues Projects Packages Wiki Activity Actions

Remove PIN & sign-in auto settings (#397)

Browse source 
Unfortunately, I think the PIN and automatic sign-in features require
more thought before it should be rolled out as a stable feature.

This PR disables the two settings and removes them from the UI.

See discussions in #321 and will reopen #268
This commit is contained in:
damontecres 2025-12-08 10:13:51 -05:00 • committed by GitHub
parent fa141adc60
commit 82927d1968
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 50 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

79
app/src/main/java/com/github/damontecres/wholphin/MainActivity.kt
View file

@ -1,7 +1,6 @@
package com.github.damontecres.wholphin package com.github.damontecres.wholphin
import android.os.Bundle import android.os.Bundle
import android.view.WindowManager
import androidx.activity.compose.setContent import androidx.activity.compose.setContent
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.compose.foundation.background import androidx.compose.foundation.background
@ -10,7 +9,6 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.size
import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.CompositionLocalProvider
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue import androidx.compose.runtime.getValue
@ -45,7 +43,6 @@ import com.github.damontecres.wholphin.services.UpdateChecker
import com.github.damontecres.wholphin.services.hilt.AuthOkHttpClient import com.github.damontecres.wholphin.services.hilt.AuthOkHttpClient
import com.github.damontecres.wholphin.ui.CoilConfig import com.github.damontecres.wholphin.ui.CoilConfig
import com.github.damontecres.wholphin.ui.LocalImageUrlService import com.github.damontecres.wholphin.ui.LocalImageUrlService
import com.github.damontecres.wholphin.ui.isNotNullOrBlank
import com.github.damontecres.wholphin.ui.launchIO import com.github.damontecres.wholphin.ui.launchIO
import com.github.damontecres.wholphin.ui.nav.ApplicationContent import com.github.damontecres.wholphin.ui.nav.ApplicationContent
import com.github.damontecres.wholphin.ui.nav.Destination import com.github.damontecres.wholphin.ui.nav.Destination
@ -53,8 +50,6 @@ import com.github.damontecres.wholphin.ui.theme.WholphinTheme
import com.github.damontecres.wholphin.util.DebugLogTree import com.github.damontecres.wholphin.util.DebugLogTree
import dagger.hilt.android.AndroidEntryPoint import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.firstOrNull
import kotlinx.coroutines.runBlocking
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import okhttp3.OkHttpClient import okhttp3.OkHttpClient
import org.jellyfin.sdk.model.serializer.toUUIDOrNull import org.jellyfin.sdk.model.serializer.toUUIDOrNull
@ -146,16 +141,17 @@ class MainActivity : AppCompatActivity() {
) { ) {
var isRestoringSession by remember { mutableStateOf(true) } var isRestoringSession by remember { mutableStateOf(true) }
LaunchedEffect(Unit) { LaunchedEffect(Unit) {
if (appPreferences.signInAutomatically) { // TODO PIN-related
try { // if (appPreferences.signInAutomatically) {
serverRepository.restoreSession( try {
appPreferences.currentServerId?.toUUIDOrNull(), serverRepository.restoreSession(
appPreferences.currentUserId?.toUUIDOrNull(), appPreferences.currentServerId?.toUUIDOrNull(),
) appPreferences.currentUserId?.toUUIDOrNull(),
} catch (ex: Exception) { )
Timber.e(ex, "Exception restoring session") } catch (ex: Exception) {
} Timber.e(ex, "Exception restoring session")
} }
// }
isRestoringSession = false isRestoringSession = false
} }
val current by serverRepository.current.observeAsState() val current by serverRepository.current.observeAsState()
@ -177,32 +173,34 @@ class MainActivity : AppCompatActivity() {
) )
} }
} else { } else {
DisposableEffect(Unit) { // TODO PIN-related
onDispose { // DisposableEffect(Unit) {
if (!appPreferences.signInAutomatically || current?.user?.hasPin == true) { // onDispose {
serverRepository.closeSession() // if (!appPreferences.signInAutomatically || current?.user?.hasPin == true) {
} // serverRepository.closeSession()
} // }
} // }
// }
key(current?.server?.id, current?.user?.id) { key(current?.server?.id, current?.user?.id) {
LaunchedEffect(current?.user?.pin) { // TODO PIN-related
if (current?.user?.pin?.isNotNullOrBlank() == true) { // LaunchedEffect(current?.user?.pin) {
// If user has a pin, then obscure the window in previews // if (current?.user?.pin?.isNotNullOrBlank() == true) {
window?.setFlags( // // If user has a pin, then obscure the window in previews
WindowManager.LayoutParams.FLAG_SECURE, // window?.setFlags(
WindowManager.LayoutParams.FLAG_SECURE, // WindowManager.LayoutParams.FLAG_SECURE,
) // WindowManager.LayoutParams.FLAG_SECURE,
} else { // )
window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE) // } else {
} // window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
} // }
// }
val initialDestination = val initialDestination =
when { when {
current != null -> Destination.Home() current != null -> Destination.Home()
!appPreferences.signInAutomatically -> Destination.ServerList // TODO PIN-related
// !appPreferences.signInAutomatically -> Destination.ServerList
// TODO user list?
else -> Destination.ServerList else -> Destination.ServerList
} }
val backStack = rememberNavBackStack(initialDestination) val backStack = rememberNavBackStack(initialDestination)
@ -249,11 +247,12 @@ class MainActivity : AppCompatActivity() {
override fun onRestart() { override fun onRestart() {
super.onRestart() super.onRestart()
val signInAutomatically = // TODO PIN-related
runBlocking { userPreferencesDataStore.data.firstOrNull()?.signInAutomatically } ?: true // val signInAutomatically =
Timber.i("onRestart: signInAutomatically=$signInAutomatically") // runBlocking { userPreferencesDataStore.data.firstOrNull()?.signInAutomatically } ?: true
if (!signInAutomatically || serverRepository.currentUser.value?.hasPin == true) { // Timber.i("onRestart: signInAutomatically=$signInAutomatically")
serverRepository.closeSession() // if (!signInAutomatically || serverRepository.currentUser.value?.hasPin == true) {
} // serverRepository.closeSession()
// }
} }
} }

6
app/src/main/java/com/github/damontecres/wholphin/preferences/AppPreference.kt
View file

@ -793,7 +793,8 @@ val basicPreferences =
title = R.string.ui_interface, title = R.string.ui_interface,
preferences = preferences =
listOf( listOf(
AppPreference.SignInAuto, // TODO PIN-related
// AppPreference.SignInAuto,
AppPreference.HomePageItems, AppPreference.HomePageItems,
AppPreference.CombineContinueNext, AppPreference.CombineContinueNext,
AppPreference.RewatchNextUp, AppPreference.RewatchNextUp,
@ -826,7 +827,8 @@ val basicPreferences =
title = R.string.profile_specific_settings, title = R.string.profile_specific_settings,
preferences = preferences =
listOf( listOf(
AppPreference.RequireProfilePin, // TODO PIN-related
// AppPreference.RequireProfilePin,
AppPreference.UserPinnedNavDrawerItems, AppPreference.UserPinnedNavDrawerItems,
), ),
), ),

12
app/src/main/java/com/github/damontecres/wholphin/ui/setup/SwitchUserContent.kt
View file

@ -119,11 +119,13 @@ fun SwitchUserContent(
users = users, users = users,
currentUser = currentUser, currentUser = currentUser,
onSwitchUser = { user -> onSwitchUser = { user ->
if (user.pin.isNotNullOrBlank()) { // TODO PIN-related
switchUserWithPin = user // if (user.pin.isNotNullOrBlank()) {
} else { // switchUserWithPin = user
viewModel.switchUser(user) // } else {
} // viewModel.switchUser(user)
// }
viewModel.switchUser(user)
}, },
onAddUser = { showAddUser = true }, onAddUser = { showAddUser = true },
onRemoveUser = { user -> onRemoveUser = { user ->