Merge pull request #108 from svvashishtha/fix_npe

Fixed NPE in FusedLocationProvider.java
maddevsio · Feb 25, 2021 · 73b1e61 · 73b1e61
2 parents a5f06b5 + 2d10c69
commit 73b1e61
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...ocationmanager/src/main/java/mad/location/manager/lib/Services/KalmanLocationService.java b/...ocationmanager/src/main/java/mad/location/manager/lib/Services/KalmanLocationService.java
@@ -385,7 +385,7 @@ public KalmanLocationService() {
     @Override
     public void onCreate() {
         super.onCreate();
-        fusedLocationProvider = new FusedLocationProvider(this);
+        fusedLocationProvider = new FusedLocationProvider(this,this);
         gpsLocationProvider = new GPSLocationProvider(this, this, this);
         m_sensorManager = (SensorManager) getSystemService(SENSOR_SERVICE);
         m_powerManager = (PowerManager) getSystemService(POWER_SERVICE);

diff --git a/...nager/src/main/java/mad/location/manager/lib/locationProviders/FusedLocationProvider.java b/...nager/src/main/java/mad/location/manager/lib/locationProviders/FusedLocationProvider.java
@@ -45,6 +45,9 @@ public void onLocationResult(LocationResult locationResult) {
 
         @Override
         public void onLocationAvailability(LocationAvailability locationAvailability) {
+            builder =new LocationSettingsRequest.Builder()
+                    .addLocationRequest(m_locationRequest);
+            client = LocationServices.getSettingsClient(context);
             task = client.checkLocationSettings(builder.build());
             task.addOnSuccessListener(new OnSuccessListener<LocationSettingsResponse>() {
                 @Override
@@ -62,9 +65,10 @@ public void onFailure(@NonNull Exception e) {
         }
     };
 
-    public FusedLocationProvider(Context context) {
+    public FusedLocationProvider(Context context,LocationProviderCallback m_locationProvider ) {
         this.m_fusedLocationProviderClient = LocationServices.getFusedLocationProviderClient(context);
         this.context = context;
+        this.m_locationProvider = m_locationProvider;
     }
 
     @RequiresPermission(
@@ -88,9 +92,5 @@ public void stop() {
     public boolean isProviderEnabled() {
         return LocationManagerCompat.isLocationEnabled((LocationManager) context.getSystemService(Context.LOCATION_SERVICE));
     }
-    public interface CheckLocationSettingCallback{
-        void onSuccess(LocationSettingsResponse locationSettingsResponse);
-        void onFailure(@NonNull Exception e);
-    }
 }