diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 5b3f5640ac6c3d2a02d8a4fb8d5e5790ef031a67..4a47f2600b02f8968e05abb956c7b3641d7d423d 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -4,18 +4,6 @@
     <value>
       <entry key="app">
         <State>
-          <runningDeviceTargetSelectedWithDropDown>
-            <Target>
-              <type value="RUNNING_DEVICE_TARGET" />
-              <deviceKey>
-                <Key>
-                  <type value="SERIAL_NUMBER" />
-                  <value value="SDEDU20221000821" />
-                </Key>
-              </deviceKey>
-            </Target>
-          </runningDeviceTargetSelectedWithDropDown>
-          <timeTargetWasSelectedWithDropDown value="2024-04-01T15:15:05.723927900Z" />
           <targetsSelectedWithDialog>
             <Target>
               <type value="QUICK_BOOT_TARGET" />
diff --git a/app/src/main/java/com/example/pbd_jwr/LoginActivity.kt b/app/src/main/java/com/example/pbd_jwr/LoginActivity.kt
index 1d535f85e7eb688215035c535c3ffeb6ef40248d..238340df6670d7b737518fe7c570958537cd6867 100644
--- a/app/src/main/java/com/example/pbd_jwr/LoginActivity.kt
+++ b/app/src/main/java/com/example/pbd_jwr/LoginActivity.kt
@@ -46,7 +46,10 @@ class LoginActivity : AppCompatActivity() {
 
         sharedPreferences = EncryptedSharedPref.create(applicationContext,"login")
         // Check if the user credential is already stored
+        connectivityManager = getSystemService(CONNECTIVITY_SERVICE) as ConnectivityManager
+        networkCallback = NetworkCallbackImplementation(this)
 
+        registerNetworkCallback()
 
         if (isLoggedIn()) {
             // If the user credential is stored, login and start the MainActivity
@@ -59,9 +62,8 @@ class LoginActivity : AppCompatActivity() {
 
         }
 
-        connectivityManager = getSystemService(CONNECTIVITY_SERVICE) as ConnectivityManager
-        networkCallback = NetworkCallbackImplementation(this)
-        registerNetworkCallback()
+
+
 
         binding = ActivityLoginBinding.inflate(layoutInflater)
         setContentView(binding.root)
@@ -98,11 +100,20 @@ class LoginActivity : AppCompatActivity() {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+        registerNetworkCallback()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        unregisterNetworkCallback()
+    }
+
     override fun onDestroy() {
         super.onDestroy()
-        if(!isLoggedIn()){
-            unregisterNetworkCallback()
-        }
+
+        unregisterNetworkCallback()
     }
 
     private fun isLoggedIn(): Boolean {
diff --git a/app/src/main/java/com/example/pbd_jwr/MainActivity.kt b/app/src/main/java/com/example/pbd_jwr/MainActivity.kt
index 6f6cc399c8078ef5c83973e80b9ca4935dfd160e..26899faf3979cb4909d86188b3951b800b0ffdfa 100644
--- a/app/src/main/java/com/example/pbd_jwr/MainActivity.kt
+++ b/app/src/main/java/com/example/pbd_jwr/MainActivity.kt
@@ -40,10 +40,6 @@ class MainActivity : AppCompatActivity() {
         val serviceIntent = Intent(this, JWTValidationService::class.java)
         startService(serviceIntent)
 
-        connectivityManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
-        networkCallback = NetworkCallbackImplementation(this)
-        registerNetworkCallback()
-
         sharedPreferences = EncryptedSharedPref.create(applicationContext,"login")
         sharedPreferencesEditor = sharedPreferences.edit()
         binding = ActivityMainBinding.inflate(layoutInflater)
@@ -105,6 +101,17 @@ class MainActivity : AppCompatActivity() {
 
     }
 
+    override fun onStart() {
+        super.onStart()
+
+    }
+
+    override fun onResume() {
+        super.onResume()
+        connectivityManager = getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
+        networkCallback = NetworkCallbackImplementation(this)
+        registerNetworkCallback()
+    }
     private fun isLocationPermissionGranted(): Boolean {
         return ContextCompat.checkSelfPermission(
             this,
@@ -153,12 +160,15 @@ class MainActivity : AppCompatActivity() {
         editor.apply()
     }
 
+    override fun onPause() {
+        super.onPause()
+        unregisterNetworkCallback()
+    }
+
     override fun onDestroy() {
         super.onDestroy()
         val serviceIntent = Intent(this, JWTValidationService::class.java)
         stopService(serviceIntent)
-        unregisterNetworkCallback()
-
     }
 
     private fun registerNetworkCallback() {