Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-08-06 21:35:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash when trying to dismiss a detached dialog window.

Browse Source
This commit is contained in:
Alex Hart
2026-07-09 11:20:44 -03:00
committed by Greyson Parrelli
parent 7c1e010482
commit 1a12eb992d
2 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/components/SignalProgressDialog.kt
+6 -2
View File
@@ -48,11 +48,15 @@ class SignalProgressDialog private constructor(
}
fun hide() {
dialog.hide()
if (dialog.window?.decorView?.isAttachedToWindow == true) {
dialog.hide()
}
}
fun dismiss() {
dialog.dismiss()
if (dialog.window?.decorView?.isAttachedToWindow == true) {
dialog.dismiss()
}
}
companion object {
app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+15 -27
View File
@@ -27,7 +27,6 @@ import android.graphics.Canvas;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.text.TextUtils;
import android.view.LayoutInflater;
@@ -1224,33 +1223,22 @@ public class ConversationListFragment extends MainFragment implements Conversati
final Set<Long> selectedConversations = new HashSet<>(ids);
if (!selectedConversations.isEmpty()) {
new AsyncTask<Void, Void, Void>() {
private SignalProgressDialog dialog;
SignalProgressDialog progressDialog = SignalProgressDialog.show(requireActivity(),
context.getString(R.string.ConversationListFragment_deleting),
context.getResources().getQuantityString(R.plurals.ConversationListFragment_deleting_selected_conversations, conversationsCount),
true,
false);
@Override
protected void onPreExecute() {
dialog = SignalProgressDialog.show(requireActivity(),
context.getString(R.string.ConversationListFragment_deleting),
context.getResources().getQuantityString(R.plurals.ConversationListFragment_deleting_selected_conversations, conversationsCount),
true,
false);
}
@Override
protected Void doInBackground(Void... params) {
Log.d(TAG, "[handleDelete] Deleting " + selectedConversations.size() + " chats");
SignalDatabase.threads().deleteConversations(selectedConversations, true);
AppDependencies.getMessageNotifier().updateNotification(AppDependencies.getApplication());
Log.d(TAG, "[handleDelete] Delete complete");
return null;
}
@Override
protected void onPostExecute(Void result) {
dialog.dismiss();
endActionModeIfActive();
}
}.executeOnExecutor(SignalExecutors.BOUNDED);
SimpleTask.run(getViewLifecycleOwner().getLifecycle(), () -> {
Log.d(TAG, "[handleDelete] Deleting " + selectedConversations.size() + " chats");
SignalDatabase.threads().deleteConversations(selectedConversations, true);
AppDependencies.getMessageNotifier().updateNotification(AppDependencies.getApplication());
Log.d(TAG, "[handleDelete] Delete complete");
return null;
}, unused -> {
progressDialog.dismiss();
endActionModeIfActive();
});
}
});