|
23 | 23 | import com.google.android.gms.location.LocationResult;
|
24 | 24 | import com.google.android.gms.location.LocationServices;
|
25 | 25 | import com.google.android.gms.location.LocationSettingsRequest;
|
| 26 | +import com.google.android.gms.location.Priority; |
26 | 27 | import com.google.android.gms.location.SettingsClient;
|
27 | 28 |
|
28 | 29 | @SuppressLint("MissingPermission")
|
@@ -100,22 +101,22 @@ public void stopObserving() {
|
100 | 101 |
|
101 | 102 | private void checkLocationSettings(ReadableMap options, LocationCallback locationCallback, Callback error) {
|
102 | 103 | LocationOptions locationOptions = LocationOptions.fromReactMap(options);
|
103 |
| - LocationRequest locationRequest = LocationRequest.create(); |
104 |
| - locationRequest.setInterval(locationOptions.interval); |
| 104 | + LocationRequest.Builder requestBuilder = new LocationRequest.Builder(locationOptions.interval); |
| 105 | + requestBuilder.setPriority(locationOptions.highAccuracy ? Priority.PRIORITY_HIGH_ACCURACY : Priority.PRIORITY_LOW_POWER); |
| 106 | + requestBuilder.setMaxUpdateAgeMillis((long) locationOptions.maximumAge); |
| 107 | + |
105 | 108 | if (locationOptions.fastestInterval >= 0) {
|
106 |
| - locationRequest.setFastestInterval(locationOptions.fastestInterval); |
| 109 | + requestBuilder.setMinUpdateIntervalMillis(locationOptions.fastestInterval); |
107 | 110 | }
|
108 |
| - locationRequest.setExpirationDuration((long) locationOptions.maximumAge); |
| 111 | + |
109 | 112 | if (locationOptions.distanceFilter >= 0) {
|
110 |
| - locationRequest.setSmallestDisplacement(locationOptions.distanceFilter); |
| 113 | + requestBuilder.setMinUpdateDistanceMeters(locationOptions.distanceFilter); |
111 | 114 | }
|
112 |
| - locationRequest.setPriority( |
113 |
| - locationOptions.highAccuracy ? LocationRequest.PRIORITY_HIGH_ACCURACY : LocationRequest.PRIORITY_LOW_POWER |
114 |
| - ); |
| 115 | + LocationRequest locationRequest = requestBuilder.build(); |
115 | 116 |
|
116 |
| - LocationSettingsRequest.Builder builder = new LocationSettingsRequest.Builder(); |
117 |
| - builder.addLocationRequest(locationRequest); |
118 |
| - LocationSettingsRequest locationSettingsRequest = builder.build(); |
| 117 | + LocationSettingsRequest.Builder settingsBuilder = new LocationSettingsRequest.Builder(); |
| 118 | + settingsBuilder.addLocationRequest(locationRequest); |
| 119 | + LocationSettingsRequest locationSettingsRequest = settingsBuilder.build(); |
119 | 120 | mLocationServicesSettingsClient.checkLocationSettings(locationSettingsRequest)
|
120 | 121 | .addOnSuccessListener(locationSettingsResponse -> requestLocationUpdates(locationRequest, locationCallback))
|
121 | 122 | .addOnFailureListener(err -> {
|
|
0 commit comments