Skip to content

MOBILE-4470 location: Improve handling approximate location #4098

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 17, 2024
Merged

MOBILE-4470 location: Improve handling approximate location #4098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 11 additions & 45 deletions cordova-plugin-moodleapp/src/ts/plugins/Diagnostic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,20 @@ export class Diagnostic {
permission.accessFineLocation,
permission.accessBackgroundLocation,
]).then(statuses => {
const coarseStatus = statuses[permission.accessCoarseLocation];
const fineStatus = statuses[permission.accessFineLocation];
const backgroundStatus = typeof statuses[permission.accessBackgroundLocation] !== 'undefined' ?
statuses[permission.accessBackgroundLocation] : true;

let status = this.combinePermissionStatuses({
[permission.accessCoarseLocation]: statuses[permission.accessCoarseLocation],
[permission.accessFineLocation]: statuses[permission.accessFineLocation],
});
if (status === permissionStatus.granted && backgroundStatus !== permissionStatus.granted) {
status = permissionStatus.grantedWhenInUse;
let status: string = permissionStatus.notRequested;

if (coarseStatus === permissionStatus.granted || fineStatus === permissionStatus.granted) {
status = backgroundStatus === permissionStatus.granted ?
permissionStatus.granted : permissionStatus.grantedWhenInUse;
} else if (coarseStatus === permissionStatus.deniedOnce || fineStatus === permissionStatus.deniedOnce) {
status = permissionStatus.deniedOnce;
} else if (coarseStatus === permissionStatus.deniedAlways || fineStatus === permissionStatus.deniedAlways) {
status = permissionStatus.deniedAlways;
}

resolve(status);
Expand Down Expand Up @@ -204,45 +209,6 @@ export class Diagnostic {
});
}

/**
* Given a list of permissions and their statuses, returns the combined status.
*
* @param statuses Permissions with statuses.
* @returns Combined status.
*/
protected combinePermissionStatuses(statuses: Record<string, string>): string {
if (this.anyStatusIs(statuses, permissionStatus.deniedAlways)) {
return permissionStatus.deniedAlways;
}

if (this.anyStatusIs(statuses, permissionStatus.deniedOnce)) {
return permissionStatus.deniedOnce;
}

if (this.anyStatusIs(statuses, permissionStatus.granted)) {
return permissionStatus.granted;
}

return permissionStatus.notRequested;
}

/**
* Check if any of the permissions in the statuses object has the specified status.
*
* @param statuses Permissions with status for each permission.
* @param status Status to check.
* @returns True if any permission has the specified status.
*/
protected anyStatusIs(statuses: Record<string, string>, status: string): boolean {
for (const permission in statuses) {
if (statuses[permission] === status) {
return true;
}
}

return false;
}

/**
* Android only. Requests app to be granted authorisation for a runtime permission.
*
Expand Down
2 changes: 1 addition & 1 deletion src/core/services/geolocation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export class CoreGeolocationProvider {
case diagnostic.permissionStatus.granted:
case diagnostic.permissionStatus.grantedWhenInUse:
// Location is authorized.
return;
return;

case diagnostic.permissionStatus.deniedOnce:
if (failOnDeniedOnce) {
Expand Down