@@ -32,7 +32,7 @@ Application.android.on(AndroidApplication.activityResultEvent, function (args: a
32
32
} ) ;
33
33
34
34
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 ;
36
36
}
37
37
38
38
function isProviderEnabled ( provider : string ) : boolean {
@@ -131,16 +131,18 @@ function _requestLocationPermissions(always: boolean): Promise<void> {
131
131
} ) ;
132
132
} else {
133
133
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 ] )
135
136
. then ( ( value ) => {
136
137
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' ] ) {
139
141
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' ] ) {
141
143
resolve ( ) ;
142
144
}
143
- } )
145
+ } ) ;
144
146
}
145
147
}
146
148
} ) ;
@@ -183,7 +185,7 @@ export function watchLocation(successCallback: successCallbackType, errorCallbac
183
185
const zonedSuccessCallback = zonedCallback ( successCallback ) ;
184
186
const zonedErrorCallback = zonedCallback ( errorCallback ) ;
185
187
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 ( ) ) {
187
189
throw new Error ( 'Cannot watch location. Call "enableLocationRequest" first' ) ;
188
190
}
189
191
@@ -341,7 +343,7 @@ function _permissionIsGiven(always: boolean): boolean {
341
343
342
344
export function isEnabled ( options ?: Options ) : Promise < boolean > {
343
345
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 ) ) ) {
345
347
resolve ( false ) ;
346
348
} else {
347
349
_isLocationServiceEnabled ( options ) . then (
0 commit comments