empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Hopeful fix for crash in SimpleProgressDialog.

Browse source
This commit is contained in:
Greyson Parrelli 2024-04-29 21:58:11 -04:00
parent 95a6835988
commit c6f4a01001
1 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
app/src/main/java/org/thoughtcrime/securesms/util/views/SimpleProgressDialog.java
View file

@ -1,11 +1,14 @@
package org.thoughtcrime.securesms.util.views;
import android.app.Activity;
import android.content.Context;
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 org.signal.core.util.ThreadUtil;
import org.signal.core.util.logging.Log;
@ -61,6 +64,11 @@ public final class SimpleProgressDialog {
AtomicLong shownAt = new AtomicLong();
Runnable showRunnable = () -> {
if (!isContextValid(context)) {
Log.w(TAG, "Context is no longer valid. Not showing dialog.");
return;
}
Log.i(TAG, "Taking some time. Showing a progress dialog.");
shownAt.set(System.currentTimeMillis());
dialogAtomicReference.set(show(context));
@ -73,13 +81,25 @@ 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.");
return;
}
AlertDialog alertDialog = dialogAtomicReference.getAndSet(null);
if (alertDialog != null) {
long beenShowingForMs = System.currentTimeMillis() - shownAt.get();
long remainingTimeMs = minimumShowTimeMs - beenShowingForMs;
if (remainingTimeMs > 0) {
ThreadUtil.runOnMainDelayed(alertDialog::dismiss, remainingTimeMs);
ThreadUtil.runOnMainDelayed(() -> {
if (!isContextValid(context)) {
Log.w(TAG, "Context is no longer valid. Not dismissing dialog.");
return;
}
alertDialog.dismiss();
}, remainingTimeMs);
} else {
alertDialog.dismiss();
}
@ -100,6 +120,18 @@ 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) {
Activity activity = (Activity) context;
return !activity.isFinishing() && !activity.isDestroyed();
} else {
return true;
}
}
public interface DismissibleDialog {
@AnyThread
void dismiss();