Skip to content

Two more bug fixes #1521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
damontecres merged 2 commits into from
Jun 5, 2026
+25 −14
Merged

Two more bug fixes #1521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d47afc2
Fix 400 vs 404 for missing collections
damontecres Jun 4, 2026
3b599e3
Ensure setting/clearing secure flag is on the main thread
damontecres Jun 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions app/src/main/java/com/github/damontecres/wholphin/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ import com.github.damontecres.wholphin.services.hilt.AuthOkHttpClient
import com.github.damontecres.wholphin.services.tvprovider.TvProviderSchedulerService
import com.github.damontecres.wholphin.ui.CoilConfig
import com.github.damontecres.wholphin.ui.LocalImageUrlService
import com.github.damontecres.wholphin.ui.collectLatestIn
import com.github.damontecres.wholphin.ui.components.LoadingPage
import com.github.damontecres.wholphin.ui.detail.series.SeasonEpisodeIds
import com.github.damontecres.wholphin.ui.launchDefault
Expand Down Expand Up @@ -169,16 +168,19 @@ class MainActivity : AppCompatActivity() {
navigationManager.backStack = NavBackStack(startDestination)
}

viewModel.serverRepository.currentUserFlow.collectLatestIn(lifecycleScope) { user ->
if (user?.hasPin == true) {
window?.setFlags(
WindowManager.LayoutParams.FLAG_SECURE,
WindowManager.LayoutParams.FLAG_SECURE,
)
} else {
window?.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
}
}
viewModel.serverRepository.currentUserFlow
.onEach { user ->
withContext(Dispatchers.Main) {
if (user?.hasPin == true) {
window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
} else {
window.clearFlags(WindowManager.LayoutParams.FLAG_SECURE)
}
}
}.catch { ex ->
Timber.e(ex, "Error with settings flag secure")
}.launchIn(lifecycleScope)

screensaverService.keepScreenOn
.onEach { keepScreenOn ->
Timber.v("keepScreenOn: %s", keepScreenOn)
Expand Down
15 changes: 12 additions & 3 deletions app/src/main/java/com/github/damontecres/wholphin/services/HomeSettingsService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,8 +553,10 @@ class HomeSettingsService
): StringProvider =
try {
api.userLibraryApi
.getItem(itemId = itemId)
.content.name
.getItem(
userId = serverRepository.currentUser?.id,
itemId = itemId,
).content.name
?.let {
if (stringRes == null) {
StringStringProvider(it)
Expand Down Expand Up @@ -876,8 +878,15 @@ class HomeSettingsService
fields = DefaultItemFields,
)

// Not using getItemName because we want to throw the 404
val title =
getItemName(null, row.parentId, ResStringProvider(R.string.collection))
api.userLibraryApi
.getItem(
userId = serverRepository.currentUser?.id,
itemId = row.parentId,
).content.name
?.let { StringStringProvider(it) }
?: ResStringProvider(R.string.collection)
if (usePaging) {
ApiRequestPager(
api,
Expand Down
Loading