Skip to content

Commit c8fa9f9

Browse files
committed
release(geolocation): 8.2.0
1 parent 62e4ffa commit c8fa9f9

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

packages/geolocation/index.android.ts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Application.android.on(AndroidApplication.activityResultEvent, function (args: a
3232
});
3333

3434
function isAirplaneModeOn(): boolean {
35-
return android.provider.Settings.System.getInt(Application.android.context.getContentResolver(), android.provider.Settings.System.AIRPLANE_MODE_ON) !== 0;
35+
return android.provider.Settings.System.getInt(Utils.android.getApplicationContext().getContentResolver(), android.provider.Settings.System.AIRPLANE_MODE_ON) !== 0;
3636
}
3737

3838
function isProviderEnabled(provider: string): boolean {
@@ -131,16 +131,18 @@ function _requestLocationPermissions(always: boolean): Promise<void> {
131131
});
132132
} else {
133133
ApplicationSettings.setBoolean('askedForWhileUsePermission', true);
134-
permissions.requestPermissions([(<any>android).Manifest.permission.ACCESS_FINE_LOCATION, (<any>android).Manifest.permission.ACCESS_COARSE_LOCATION])
134+
permissions
135+
.requestPermissions([(<any>android).Manifest.permission.ACCESS_FINE_LOCATION, (<any>android).Manifest.permission.ACCESS_COARSE_LOCATION])
135136
.then((value) => {
136137
resolve(value);
137-
}).catch((err) => {
138-
if (!err["android.permission.ACCESS_COARSE_LOCATION"] && !err["android.permission.ACCESS_FINE_LOCATION"]) {
138+
})
139+
.catch((err) => {
140+
if (!err['android.permission.ACCESS_COARSE_LOCATION'] && !err['android.permission.ACCESS_FINE_LOCATION']) {
139141
reject(err);
140-
} else if (!err["android.permission.ACCESS_FINE_LOCATION"] && err["android.permission.ACCESS_COARSE_LOCATION"]) {
142+
} else if (!err['android.permission.ACCESS_FINE_LOCATION'] && err['android.permission.ACCESS_COARSE_LOCATION']) {
141143
resolve();
142144
}
143-
})
145+
});
144146
}
145147
}
146148
});
@@ -183,7 +185,7 @@ export function watchLocation(successCallback: successCallbackType, errorCallbac
183185
const zonedSuccessCallback = zonedCallback(successCallback);
184186
const zonedErrorCallback = zonedCallback(errorCallback);
185187

186-
if ((!permissions.hasPermission((<any>android).Manifest.permission.ACCESS_FINE_LOCATION) && !permissions.hasPermission((<any>android).Manifest.permission.ACCESS_COARSE_LOCATION) || !_isGooglePlayServicesAvailable()) && !LocationManager.shouldSkipChecks()) {
188+
if (((!permissions.hasPermission((<any>android).Manifest.permission.ACCESS_FINE_LOCATION) && !permissions.hasPermission((<any>android).Manifest.permission.ACCESS_COARSE_LOCATION)) || !_isGooglePlayServicesAvailable()) && !LocationManager.shouldSkipChecks()) {
187189
throw new Error('Cannot watch location. Call "enableLocationRequest" first');
188190
}
189191

@@ -341,7 +343,7 @@ function _permissionIsGiven(always: boolean): boolean {
341343

342344
export function isEnabled(options?: Options): Promise<boolean> {
343345
return new Promise(function (resolve, reject) {
344-
if (!_isGooglePlayServicesAvailable() || !permissions.hasPermission((<any>android).Manifest.permission.ACCESS_FINE_LOCATION) && !permissions.hasPermission((<any>android).Manifest.permission.ACCESS_COARSE_LOCATION)) {
346+
if (!_isGooglePlayServicesAvailable() || (!permissions.hasPermission((<any>android).Manifest.permission.ACCESS_FINE_LOCATION) && !permissions.hasPermission((<any>android).Manifest.permission.ACCESS_COARSE_LOCATION))) {
345347
resolve(false);
346348
} else {
347349
_isLocationServiceEnabled(options).then(

packages/geolocation/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nativescript/geolocation",
3-
"version": "8.1.0",
3+
"version": "8.2.0",
44
"description": "Provides API for getting and monitoring location for NativeScript app.",
55
"main": "index",
66
"typings": "index.d.ts",

0 commit comments

Comments
 (0)