From 7dd9233040339d494b0eeae486fb691c0b38be96 Mon Sep 17 00:00:00 2001 From: Florian <florian.taurer@gmx.at> Date: Tue, 20 Feb 2018 13:50:38 +0100 Subject: [PATCH] remove updates of locations --- .../main/java/at/ac/fhstp/sonicontrol/GPSTracker.java | 4 ++++ .../main/java/at/ac/fhstp/sonicontrol/Location.java | 10 ++++++++++ .../java/at/ac/fhstp/sonicontrol/MainActivity.java | 2 ++ 3 files changed, 16 insertions(+) diff --git a/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/GPSTracker.java b/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/GPSTracker.java index f5b9778c..f784ce80 100644 --- a/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/GPSTracker.java +++ b/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/GPSTracker.java @@ -308,4 +308,8 @@ public class GPSTracker extends Service implements LocationListener { ); } } + + public void removeGPSUpdates(){ + locationManager.removeUpdates(this); + } } \ No newline at end of file diff --git a/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/Location.java b/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/Location.java index d6e0fc5e..ccb4b040 100644 --- a/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/Location.java +++ b/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/Location.java @@ -333,4 +333,14 @@ public class Location { locationData.requestGPSUpdates(); } } + + public void removeGPSUpdates(){ + if (locationData == null) { + // Will call requestLocationUpdates + locationData = new GPSTracker(main); + } + else { + locationData.removeGPSUpdates(); + } + } } diff --git a/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/MainActivity.java b/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/MainActivity.java index bece45e5..907bb5fc 100644 --- a/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/MainActivity.java +++ b/SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/MainActivity.java @@ -298,6 +298,8 @@ public class MainActivity extends BaseActivity implements Scan.DetectionListener */ NotificationHelper.cancelDetectionAlertStatusNotification(getApplicationContext()); + locationFinder.removeGPSUpdates(); + detector.stopIO(); // release audio resources from the scanner Spoofer spoof = Spoofer.getInstance(); //get a spoofing object spoof.stopSpoofingComplete(); //stop the whole spoofing process -- GitLab