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

Fix case where dialog could be shown after user leaves fragment.

Browse source
This commit is contained in:
Alex Hart 2021-10-07 10:45:41 -03:00
parent b5cc570363
commit 88074134af
2 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt
View file

@ -1,5 +1,6 @@
package org.thoughtcrime.securesms.conversation.mutiselect.forward
import android.content.DialogInterface
import android.os.Bundle
import android.os.Handler
import android.os.Looper
@ -206,6 +207,11 @@ class MultiselectForwardFragment :
handler?.removeCallbacksAndMessages(null)
}
override fun onDismiss(dialog: DialogInterface) {
dismissibleDialog?.dismissNow()
super.onDismiss(dialog)
}
private fun displayFirstSendConfirmation() {
SignalStore.tooltips().markMultiForwardDialogSeen()

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

@ -68,26 +68,43 @@ public final class SimpleProgressDialog {
ThreadUtil.runOnMainDelayed(showRunnable, delayMs);
return () -> {
ThreadUtil.cancelRunnableOnMain(showRunnable);
ThreadUtil.runOnMain(() -> {
AlertDialog alertDialog = dialogAtomicReference.getAndSet(null);
if (alertDialog != null) {
long beenShowingForMs = System.currentTimeMillis() - shownAt.get();
long remainingTimeMs = minimumShowTimeMs - beenShowingForMs;
return new DismissibleDialog() {
@Override
public void dismiss() {
ThreadUtil.cancelRunnableOnMain(showRunnable);
ThreadUtil.runOnMain(() -> {
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);
} else {
if (remainingTimeMs > 0) {
ThreadUtil.runOnMainDelayed(alertDialog::dismiss, remainingTimeMs);
} else {
alertDialog.dismiss();
}
}
});
}
@Override
public void dismissNow() {
ThreadUtil.cancelRunnableOnMain(showRunnable);
ThreadUtil.runOnMain(() -> {
AlertDialog alertDialog = dialogAtomicReference.getAndSet(null);
if (alertDialog != null) {
alertDialog.dismiss();
}
}
});
});
}
};
}
public interface DismissibleDialog {
@AnyThread
void dismiss();
@AnyThread
void dismissNow();
}
}