push conflict resolve

.gitignore

@@ -13,3 +13,8 @@
 .externalNativeBuild
 .cxx
 local.properties
+.idea/misc.xml
+.idea/.name
+.idea/copilot/chatSessions/00000000000.xd
+.idea/copilot/chatSessions/xd.lck
+.idea/vcs.xml

app/src/main/java/com/example/myapplication/MainActivity.kt

 package com.example.myapplication
 
+import android.content.Context
 import android.content.Intent
+import android.net.ConnectivityManager
+import android.net.NetworkCapabilities
 import android.net.Uri
 import android.os.Bundle
+import android.util.Log
 import android.view.LayoutInflater
 import android.widget.Button
 import android.widget.EditText
+import androidx.appcompat.app.AlertDialog
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.MutableLiveData
@@ -60,6 +65,23 @@ class MainActivity : AppCompatActivity(){
 
     }
 
+    override fun onStart() {
+        super.onStart()
+
+        // CHECK TOKEN for expiry
+        val backgroundWork = PeriodicWorkRequestBuilder<TokenExpiryWorker>(15, TimeUnit.MINUTES).build()
+        WorkManager.getInstance(this).enqueue(backgroundWork)
+
+        // event listener for token expiry
+        EventBus.subscribe("TOKEN_EXPIRED") {
+            Log.i("Development", "Token expired")
+            secretPreference = SecretPreference(this)
+            secretPreference.clearToken()
+            val loginIntent = Intent(this, LoginActivity::class.java)
+            startActivity(loginIntent)
+        }
+    }
+
     override fun onResume() {
         super.onResume()
         val connectionLostBuilder: AlertDialog.Builder = AlertDialog.Builder(this)
@@ -86,18 +108,6 @@ class MainActivity : AppCompatActivity(){
     fun getConnectionStatus(): Boolean {
         return connected.value == true
 
-        // CHECK TOKEN for expiry
-        val backgroundWork = PeriodicWorkRequestBuilder<TokenExpiryWorker>(15, TimeUnit.MINUTES).build()
-        WorkManager.getInstance(this).enqueue(backgroundWork)
-
-        // event listener for token expiry
-        EventBus.subscribe("TOKEN_EXPIRED") {
-            Log.i("Development", "Token expired")
-            secretPreference = SecretPreference(this)
-            secretPreference.clearToken()
-            val loginIntent = Intent(this, LoginActivity::class.java)
-            startActivity(loginIntent)
-        }
     }
 
     private fun isOnline(): Boolean {