change when the database listeners are attached and remove them in on…

…Destroy
MANZARACI · Mar 7, 2023 · eacb150 · eacb150
1 parent 5bf1c05
commit eacb150
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/app/src/main/java/com/example/blindassistant_blindapp/EventListenerActivity.java b/app/src/main/java/com/example/blindassistant_blindapp/EventListenerActivity.java
@@ -62,6 +62,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mAuth = FirebaseAuth.getInstance();
         mDatabase = FirebaseDatabase.getInstance().getReference();
+        currentUser = mAuth.getCurrentUser();
 
         queue = Volley.newRequestQueue(this);
 
@@ -126,6 +127,12 @@ public void onCancelled(@NonNull DatabaseError error) {
 
             }
         };
+
+        mDetectedFacesRef = mDatabase.child("users").child(currentUser.getUid()).child("detectedFaces");
+        mDetectedFacesRef.addValueEventListener(detectedFacesListener);
+
+        mLocationRequestRef = mDatabase.child("users").child(currentUser.getUid()).child("locationRequest");
+        mLocationRequestRef.addValueEventListener(locationRequestListener);
     }
 
     private void sendLocation() {
@@ -242,20 +249,9 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
     }
 
     @Override
-    protected void onStart() {
-        super.onStart();
-        currentUser = mAuth.getCurrentUser();
-        if (currentUser != null) {
-            if (mDetectedFacesRef == null) {
-                mDetectedFacesRef = mDatabase.child("users").child(currentUser.getUid()).child("detectedFaces");
-                mDetectedFacesRef.addValueEventListener(detectedFacesListener);
-            }
-
-            if (mLocationRequestRef == null) {
-                mLocationRequestRef = mDatabase.child("users").child(currentUser.getUid()).child("locationRequest");
-                mLocationRequestRef.addValueEventListener(locationRequestListener);
-            }
-
-        }
+    protected void onDestroy() {
+        super.onDestroy();
+        mDetectedFacesRef.removeEventListener(detectedFacesListener);
+        mLocationRequestRef.removeEventListener(locationRequestListener);
     }
 }