From 97e58f901841b17ae07366356d71b67ff1a175a6 Mon Sep 17 00:00:00 2001
From: zaydanA <13521104@std.stei.itb.ac.id>
Date: Tue, 2 Apr 2024 11:43:06 +0700
Subject: [PATCH] uregister network callback
---
.idea/deploymentTargetDropDown.xml | 12 ----------
.../java/com/example/pbd_jwr/LoginActivity.kt | 23 ++++++++++++++-----
.../java/com/example/pbd_jwr/MainActivity.kt | 22 +++++++++++++-----
3 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 5b3f564..4a47f26 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 1d535f8..238340d 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 6f6cc39..26899fa 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() {
--
GitLab