restart background service properly

Nyabsi · Nov 4, 2024 · 78c11e2 · 78c11e2
1 parent 2f96d7d
commit 78c11e2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/app/src/main/java/cc/sovellus/vrcaa/activity/MainActivity.kt b/app/src/main/java/cc/sovellus/vrcaa/activity/MainActivity.kt
@@ -51,6 +51,7 @@ class MainActivity : ComponentActivity() {
 
         val invalidSession = intent.extras?.getBoolean("INVALID_SESSION")
         val terminateSession = intent.extras?.getBoolean("TERMINATE_SESSION")
+        val restartSession = intent.extras?.getBoolean("RESTART_SESSION")
 
         if (invalidSession == true) {
 
@@ -66,6 +67,12 @@ class MainActivity : ComponentActivity() {
             ).show()
         }
 
+        if (restartSession == true) {
+            val intent = Intent(this, PipelineService::class.java)
+            stopService(intent)
+            startService(intent)
+        }
+
         val token = preferences.authToken
         api.setToken(token)
 

diff --git a/app/src/main/java/cc/sovellus/vrcaa/ui/screen/navigation/NavigationScreen.kt b/app/src/main/java/cc/sovellus/vrcaa/ui/screen/navigation/NavigationScreen.kt
@@ -2,6 +2,7 @@ package cc.sovellus.vrcaa.ui.screen.navigation
 
 import android.app.Activity
 import android.content.Context
+import android.content.Intent
 import android.widget.Toast
 import androidx.activity.compose.BackHandler
 import androidx.compose.foundation.clickable
@@ -32,8 +33,6 @@ import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.ListItem
-import androidx.compose.material3.ListItemColors
-import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.NavigationBar
@@ -42,7 +41,6 @@ import androidx.compose.material3.OutlinedButton
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SearchBar
-import androidx.compose.material3.SearchBarColors
 import androidx.compose.material3.SearchBarDefaults
 import androidx.compose.material3.SearchBarDefaults.InputField
 import androidx.compose.material3.Switch
@@ -59,16 +57,14 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.DpOffset
-import androidx.compose.ui.unit.LayoutDirection
 import androidx.compose.ui.unit.dp
+import androidx.core.os.bundleOf
 import cafe.adriel.voyager.core.model.rememberNavigatorScreenModel
 import cafe.adriel.voyager.core.screen.Screen
 import cafe.adriel.voyager.core.screen.uniqueScreenKey
@@ -79,6 +75,7 @@ import cafe.adriel.voyager.navigator.tab.CurrentTab
 import cafe.adriel.voyager.navigator.tab.TabDisposable
 import cafe.adriel.voyager.navigator.tab.TabNavigator
 import cc.sovellus.vrcaa.R
+import cc.sovellus.vrcaa.activity.MainActivity
 import cc.sovellus.vrcaa.manager.CacheManager
 import cc.sovellus.vrcaa.ui.components.dialog.NoInternetDialog
 import cc.sovellus.vrcaa.ui.components.dialog.ProfileEditDialog
@@ -112,8 +109,12 @@ class NavigationScreen : Screen {
         if (model.hasNoInternet.value) {
             NoInternetDialog(
                 onClick = {
-                    if (context is Activity)
-                        context.finish()
+                    val bundle = bundleOf()
+                    bundle.putBoolean("RESTART_SESSION", true)
+
+                    val intent = Intent(context, MainActivity::class.java)
+                    intent.putExtras(bundle)
+                    context.startActivity(intent)
                 }
             )
         }