Skip to content

FIX: Prevent multiple dialog showing issue in FusedLocationClient.java; Add min interval to show #1744

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

Closed
iv-ni wants to merge 1 commit into from
+14 −0
Closed

FIX: Prevent multiple dialog showing issue in FusedLocationClient.java; Add min interval to show #1744

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
14 changes: 14 additions & 0 deletions ...r_android/android/src/main/java/com/baseflow/geolocator/location/FusedLocationClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@

class FusedLocationClient implements LocationClient {
private static final String TAG = "FlutterGeolocator";
private static final long DIALOG_SHOW_INTERVAL_MS = 30 * 60 * 1000; // 30 minutes
private static boolean isDialogShowing = false;
private static long lastDialogShowTime = 0;

private final Context context;
private final LocationCallback locationCallback;
Expand Down Expand Up @@ -200,6 +203,8 @@ public void getLastKnownPosition(
}

public boolean onActivityResult(int requestCode, int resultCode) {
isDialogShowing = false;

if (requestCode == activityRequestCode) {
if (resultCode == Activity.RESULT_OK) {
if (this.locationOptions == null
Expand Down Expand Up @@ -252,10 +257,19 @@ public void startPositionUpdates(
int statusCode = rae.getStatusCode();
if (statusCode == LocationSettingsStatusCodes.RESOLUTION_REQUIRED) {
try {
long currentTime = System.currentTimeMillis();
if (isDialogShowing || (lastDialogShowTime != 0 && (currentTime - lastDialogShowTime) < DIALOG_SHOW_INTERVAL_MS)) {
return;
}

// Show the dialog by calling startResolutionForResult(), and check the
// result in onActivityResult().
rae.startResolutionForResult(activity, activityRequestCode);

isDialogShowing = true;
lastDialogShowTime = currentTime;
} catch (IntentSender.SendIntentException sie) {
isDialogShowing = false;
errorCallback.onError(ErrorCodes.locationServicesDisabled);
}
} else {
Expand Down