TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-06-09 02:18:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prevent simple dialog flicker.

Browse Source
This commit is contained in:
Alan Evans 2020-08-27 11:31:21 -03:00
parent 01d7694108
commit d3c9f66de6
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/org/thoughtcrime/securesms/util/views/SimpleProgressDialog.java
View File

@ -11,6 +11,7 @@ import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.Util;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
/** /**
@ -37,7 +38,7 @@ public final class SimpleProgressDialog {
@AnyThread @AnyThread
public static @NonNull DismissibleDialog showDelayed(@NonNull Context context) { public static @NonNull DismissibleDialog showDelayed(@NonNull Context context) {
return showDelayed(context, 300); return showDelayed(context, 300, 1000);
} }
/** /**
@ -47,13 +48,21 @@ public final class SimpleProgressDialog {
* the delay has elapsed, the dialog will not show at all. * the delay has elapsed, the dialog will not show at all.
* <p> * <p>
* Dismiss can be called on any thread. * Dismiss can be called on any thread.
*
* @param minimumShowTimeMs If the dialog does display, then it will be visible for at least this duration.
* This is to prevent flicker.
*/ */
@AnyThread @AnyThread
public static @NonNull DismissibleDialog showDelayed(@NonNull Context context, int delayMs) { public static @NonNull DismissibleDialog showDelayed(@NonNull Context context,
int delayMs,
int minimumShowTimeMs)
{
AtomicReference<AlertDialog> dialogAtomicReference = new AtomicReference<>(); AtomicReference<AlertDialog> dialogAtomicReference = new AtomicReference<>();
AtomicLong shownAt = new AtomicLong();
Runnable showRunnable = () -> { Runnable showRunnable = () -> {
Log.i(TAG, "Taking some time. Showing a progress dialog."); Log.i(TAG, "Taking some time. Showing a progress dialog.");
shownAt.set(System.currentTimeMillis());
dialogAtomicReference.set(show(context)); dialogAtomicReference.set(show(context));
}; };
@ -64,7 +73,14 @@ public final class SimpleProgressDialog {
Util.runOnMain(() -> { Util.runOnMain(() -> {
AlertDialog alertDialog = dialogAtomicReference.getAndSet(null); AlertDialog alertDialog = dialogAtomicReference.getAndSet(null);
if (alertDialog != null) { if (alertDialog != null) {
alertDialog.dismiss(); long beenShowingForMs = System.currentTimeMillis() - shownAt.get();
long remainingTimeMs = minimumShowTimeMs - beenShowingForMs;
if (remainingTimeMs > 0) {
Util.runOnMainDelayed(alertDialog::dismiss, remainingTimeMs);
} else {
alertDialog.dismiss();
}
} }
}); });
}; };