Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-09-28 07:51:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix progress dialog being left on-screen when backgrounding the app.

Browse Source 
Co-authored-by: Greyson Parrelli <greyson@signal.org>
This commit is contained in:
Cody Henthorne
2026-09-23 16:00:20 -04:00
committed by Michelle Tang
co-authored by Greyson Parrelli
parent e2d96d1f2f
commit 0d87ed08c2
1 changed files with 41 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/util/views/SimpleProgressDialog.java
+41 -25
View File
@@ -7,8 +7,8 @@ import androidx.annotation.AnyThread;
import androidx.annotation.MainThread;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleOwner;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -67,7 +67,7 @@ public final class SimpleProgressDialog {
AtomicLong shownAt = new AtomicLong();
Runnable showRunnable = () -> {
if (!isContextValid(context)) {
if (!canShowDialog(context)) {
Log.w(TAG, "Context is no longer valid. Not showing dialog.");
return;
}
@@ -84,28 +84,17 @@ public final class SimpleProgressDialog {
public void dismiss() {
ThreadUtil.cancelRunnableOnMain(showRunnable);
ThreadUtil.runOnMain(() -> {
if (!isContextValid(context)) {
Log.w(TAG, "Context is no longer valid. Not dismissing dialog.");
if (dialogAtomicReference.get() == null) {
return;
}
AlertDialog alertDialog = dialogAtomicReference.getAndSet(null);
if (alertDialog != null) {
long beenShowingForMs = System.currentTimeMillis() - shownAt.get();
long remainingTimeMs = minimumShowTimeMs - beenShowingForMs;
long beenShowingForMs = System.currentTimeMillis() - shownAt.get();
long remainingTimeMs = minimumShowTimeMs - beenShowingForMs;
if (remainingTimeMs > 0) {
ThreadUtil.runOnMainDelayed(() -> {
if (!isContextValid(context)) {
Log.w(TAG, "Context is no longer valid. Not dismissing dialog.");
return;
}
alertDialog.dismiss();
}, remainingTimeMs);
} else {
alertDialog.dismiss();
}
if (remainingTimeMs > 0) {
ThreadUtil.runOnMainDelayed(() -> dismissIfNeeded(context, dialogAtomicReference), remainingTimeMs);
} else {
dismissIfNeeded(context, dialogAtomicReference);
}
});
}
@@ -123,11 +112,38 @@ public final class SimpleProgressDialog {
};
}
private static boolean isContextValid(@NonNull Context context) {
if (context instanceof AppCompatActivity) {
AppCompatActivity activity = (AppCompatActivity) context;
return !activity.isFinishing() && !activity.isDestroyed() && activity.getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED);
} else if (context instanceof Activity) {
@MainThread
private static void dismissIfNeeded(@NonNull Context context, @NonNull AtomicReference<AlertDialog> dialogAtomicReference) {
if (dialogAtomicReference.get() == null) {
return;
}
if (!canDismissDialog(context)) {
Log.w(TAG, "Context is no longer valid. Not dismissing dialog.");
return;
}
AlertDialog alertDialog = dialogAtomicReference.getAndSet(null);
if (alertDialog != null) {
alertDialog.dismiss();
}
}
/** A window can only be added once the activity is at least started, so showing requires that; dismissing does not. */
private static boolean canShowDialog(@NonNull Context context) {
if (context instanceof LifecycleOwner) {
return isActivityAlive(context) && ((LifecycleOwner) context).getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED);
} else {
return isActivityAlive(context);
}
}
private static boolean canDismissDialog(@NonNull Context context) {
return isActivityAlive(context);
}
private static boolean isActivityAlive(@NonNull Context context) {
if (context instanceof Activity) {
Activity activity = (Activity) context;
return !activity.isFinishing() && !activity.isDestroyed();
} else {