Skip to content

Cherry pick upstream #7

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
maxjivi05 merged 2 commits into from
Jan 19, 2026
Merged

Cherry pick upstream #7

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
b48d64d
Move Steam login to Settings and allow library access without mandato…
maxjivi05 Jan 19, 2026
f057ca7
Fix custom game icons, stability issues, and UI refresh logic
maxjivi05 Jan 19, 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
5 changes: 5 additions & 0 deletions app/src/main/java/app/gamenative/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,11 @@ class MainActivity : ComponentActivity() {
// Initialize the controller management system
ControllerManager.getInstance().init(getApplicationContext())

// Start services
SteamService.start(this)
if (GOGService.hasStoredCredentials(this)) GOGService.start(this)
if (app.gamenative.service.epic.EpicService.hasStoredCredentials(this)) app.gamenative.service.epic.EpicService.start(this)

ContainerUtils.setContainerDefaults(applicationContext)

handleLaunchIntent(intent)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/app/gamenative/PrefManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ object PrefManager {
private val LIBRARY_FILTER = intPreferencesKey("library_filter")
var libraryFilter: EnumSet<AppFilter>
get() {
val value = getPref(LIBRARY_FILTER, AppFilter.toFlags(EnumSet.of(AppFilter.GAME, AppFilter.SHARED)))
val value = getPref(LIBRARY_FILTER, AppFilter.toFlags(EnumSet.of(AppFilter.GAME, AppFilter.INSTALLED, AppFilter.SHARED)))
return AppFilter.fromFlags(value)
}
set(value) {
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/java/app/gamenative/service/SteamService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2036,6 +2036,18 @@ class SteamService : Service(), IChallengeUrlChanged {
isWaitingForQRAuth = false
}

fun start(context: Context) {
Timber.tag("Steam").i("[SteamService.start] Called. isRunning=$isRunning")
if (!isRunning) {
Timber.tag("Steam").i("[SteamService.start] Starting foreground service...")
val intent = Intent(context, SteamService::class.java)
context.startForegroundService(intent)
Timber.tag("Steam").i("[SteamService.start] startForegroundService called")
} else {
Timber.tag("Steam").i("[SteamService.start] Service already running, skipping")
}
}

fun stopService() {
instance?.let {
Timber.i("Stopping service.")
Expand Down
18 changes: 11 additions & 7 deletions app/src/main/java/app/gamenative/ui/PluviaMain.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,10 @@ fun PluviaMain(

if (navController.currentDestination?.route != PluviaScreen.Home.route) {
navController.navigate(PluviaScreen.Home.route) {
popUpTo(PluviaScreen.LoginUser.route) {
inclusive = true
navController.graph.findNode(PluviaScreen.LoginUser.route)?.let {
popUpTo(it.id) {
inclusive = true
}
}
}
}
Expand All @@ -284,11 +286,13 @@ fun PluviaMain(
onSuccess = viewModel::launchApp,
)
}
} else if (PluviaApp.xEnvironment == null) {
} else if (PluviaApp.xEnvironment == null && navController.currentDestination?.route == PluviaScreen.LoginUser.route) {
Timber.i("Navigating to library")
navController.navigate(PluviaScreen.Home.route) {
popUpTo(PluviaScreen.LoginUser.route) {
inclusive = true
navController.graph.findNode(PluviaScreen.LoginUser.route)?.let {
popUpTo(it.id) {
inclusive = true
}
}
}

Expand Down Expand Up @@ -922,7 +926,7 @@ fun PluviaMain(

NavHost(
navController = navController,
startDestination = PluviaScreen.LoginUser.route,
startDestination = PluviaScreen.Home.route,
) {
/** Login **/
/** Login **/
Expand Down Expand Up @@ -1004,7 +1008,7 @@ fun PluviaMain(
SteamService.logOut()
},
onGoOnline = {
navController.navigate(PluviaScreen.LoginUser.route)
navController.navigate(PluviaScreen.Settings.route)
},
isOffline = isOffline,
)
Expand Down
Loading
Loading