Merge pull request #45 from Zameelnm96/master

By considering power consumption removed get location update from GPS…
ACM-student-chapter-UOM · May 25, 2020 · 960e41f · 960e41f
2 parents cb708c9 + 9d452e7
commit 960e41f
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/mobile-app/app/src/main/java/com/example/acmcovidapplication/services/CustomService.java b/mobile-app/app/src/main/java/com/example/acmcovidapplication/services/CustomService.java
@@ -131,12 +131,10 @@ public void onCreate() {
                 .getSystemService(Context.LOCATION_SERVICE);
         if (ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED
                 && ActivityCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
-            locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, LOCATION_UPDATE_INTERVAL * 1000, 100, mLocationListener);
+            //locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, LOCATION_UPDATE_INTERVAL * 1000, 100, mLocationListener);
             locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, LOCATION_UPDATE_INTERVAL * 1000, 100, mLocationListener);
             locationManager.requestLocationUpdates(LocationManager.PASSIVE_PROVIDER, LOCATION_UPDATE_INTERVAL * 1000, 100, mLocationListener);
-            isNetworkProviderEnable = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
-            isGpsProviderEnable = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
-            isPassiveProviderEnable = locationManager.isProviderEnabled(LocationManager.PASSIVE_PROVIDER);
+
             return;
         }
 
@@ -180,7 +178,9 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                 .build();
 
         startForeground(FOREGROUND_ID, notification);
-
+        isNetworkProviderEnable = locationManager.isProviderEnabled(LocationManager.NETWORK_PROVIDER);
+        isGpsProviderEnable = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER);
+        isPassiveProviderEnable = locationManager.isProviderEnabled(LocationManager.PASSIVE_PROVIDER);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             Util.scheduleJobHelper(this);
         }
@@ -252,13 +252,13 @@ public void didRangeBeaconsInRegion(Collection<Beacon> beacons, Region region) {
                                 longitude = location.getLongitude();
                                 Log.d(TAG, "didRangeBeaconsInRegion NETWORK:\n latitude - " + latitude + " longitude - " + longitude);
                             }
-                            else if(isGpsProviderEnable ) {
+                            /*else if(isGpsProviderEnable ) {
                                 Location location = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER);
                                 latitude = location.getLatitude();
                                 longitude = location.getLongitude();
                                 Log.d(TAG, "didRangeBeaconsInRegion GPS:\n latitude - " + latitude + " longitude - " + longitude);
 
-                            }
+                            }*/
                             else if(isPassiveProviderEnable){
                                 Location location = locationManager.getLastKnownLocation(LocationManager.PASSIVE_PROVIDER);
                                 latitude = location.getLatitude();