Skip to content
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

Jump to bottom

Fix racey dialog dismissal in PlacePickerActivity #13461

Closed
wants to merge 4 commits into from
Closed

Fix racey dialog dismissal in PlacePickerActivity #13461

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b93e6fb
Dismiss progress dialog `onDestroy` of `PlacePickerActivity`
fynngodau Mar 5, 2024
02a4247
Avoid dismissing `SimpleProgressDialog` a second time
fynngodau Mar 5, 2024
10a0f64
Automatically remove dialog when its parent's lifecycle ends
fynngodau Mar 7, 2024
42cee93
Use `getViewLifecycleOwner` according to review
fynngodau Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 15 additions & 8 deletions app/src/main/java/org/thoughtcrime/securesms/maps/PlacePickerActivity.java
View file
Open in desktop
Expand Up @@ -68,12 +68,13 @@ public final class PlacePickerActivity extends AppCompatActivity {

private final DynamicTheme dynamicTheme = new DynamicNoActionBarTheme();

private SingleAddressBottomSheet bottomSheet;
private Address currentAddress;
private LatLng initialLocation;
private LatLng currentLocation = new LatLng(0, 0);
private AddressLookup addressLookup;
private GoogleMap googleMap;
private SingleAddressBottomSheet bottomSheet;
private Address currentAddress;
private LatLng initialLocation;
private LatLng currentLocation = new LatLng(0, 0);
private AddressLookup addressLookup;
private GoogleMap googleMap;
private SimpleProgressDialog.DismissibleDialog dismissibleDialog;

public static void startActivityForResultAtCurrentLocation(@NonNull Fragment fragment, int requestCode, @ColorInt int chatColor) {
fragment.startActivityForResult(new Intent(fragment.requireActivity(), PlacePickerActivity.class).putExtra(KEY_CHAT_COLOR, chatColor), requestCode);
Expand Down Expand Up @@ -190,12 +191,11 @@ private void finishWithAddress() {
String address = currentAddress != null && currentAddress.getAddressLine(0) != null ? currentAddress.getAddressLine(0) : "";
AddressData addressData = new AddressData(currentLocation.latitude, currentLocation.longitude, address);

SimpleProgressDialog.DismissibleDialog dismissibleDialog = SimpleProgressDialog.showDelayed(this);
dismissibleDialog = SimpleProgressDialog.showDelayed(this);
MapView mapView = findViewById(R.id.map_view);
SignalMapView.snapshot(currentLocation, mapView).addListener(new ListenableFuture.Listener<>() {
@Override
public void onSuccess(Bitmap result) {
dismissibleDialog.dismiss();
byte[] blob = BitmapUtil.toByteArray(result);
Uri uri = BlobProvider.getInstance()
.forData(blob)
Expand Down Expand Up @@ -240,6 +240,13 @@ protected void onPause() {
}
}

@Override protected void onDestroy() {
fynngodau marked this conversation as resolved.
Show resolved Hide resolved
if (dismissibleDialog != null) {
dismissibleDialog.dismissNow();
}
super.onDestroy();
}

@SuppressLint("StaticFieldLeak")
private class AddressLookup extends AsyncTask<LatLng, Void, Address> {

Expand Down
12 changes: 11 additions & 1 deletion app/src/main/java/org/thoughtcrime/securesms/util/views/SimpleProgressDialog.java
View file
Open in desktop
Expand Up @@ -68,6 +68,8 @@ private SimpleProgressDialog() {}

ThreadUtil.runOnMainDelayed(showRunnable, delayMs);

final AtomicReference<Runnable> dismissRunnable = new AtomicReference<>(null);

return new DismissibleDialog() {
@Override
public void dismiss() {
Expand All @@ -79,7 +81,8 @@ public void dismiss() {
long remainingTimeMs = minimumShowTimeMs - beenShowingForMs;

if (remainingTimeMs > 0) {
ThreadUtil.runOnMainDelayed(alertDialog::dismiss, remainingTimeMs);
dismissRunnable.set(alertDialog::dismiss);
ThreadUtil.runOnMainDelayed(dismissRunnable.get(), remainingTimeMs);
} else {
alertDialog.dismiss();
}
Expand All @@ -90,6 +93,13 @@ public void dismiss() {
@Override
public void dismissNow() {
ThreadUtil.cancelRunnableOnMain(showRunnable);

// Avoid dismissing the dialog a second time, potentially after its activity is already destroyed
Runnable cancelDismissRunnable = dismissRunnable.getAndSet(null);
if (cancelDismissRunnable != null) {
ThreadUtil.cancelRunnableOnMain(cancelDismissRunnable);
}

ThreadUtil.runOnMain(() -> {
AlertDialog alertDialog = dialogAtomicReference.getAndSet(null);
if (alertDialog != null) {
Expand Down