Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-24 11:45:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Replace use of AlertDialog.Builder with MaterialAlertDialogBuilder."

Browse Source 
This reverts commit 9232eb7c16.
This commit is contained in:
Alex Hart
2021-08-30 09:12:20 -03:00
committed by Cody Henthorne
parent 32888fa00b
commit f71accea06
5 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactUtil.java
View File

@@ -14,7 +14,6 @@ import androidx.annotation.WorkerThread;
import androidx.appcompat.app.AlertDialog;
import com.annimon.stream.Stream;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.i18n.phonenumbers.NumberParseException;
import com.google.i18n.phonenumbers.PhoneNumberUtil;
import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
@@ -127,7 +126,7 @@ public final class ContactUtil {
values[i] = getPrettyPhoneNumber(choices.get(i).requireE164(), locale);
}
new MaterialAlertDialogBuilder(context)
new AlertDialog.Builder(context)
.setItems(values, ((dialog, which) -> callback.onSelected(choices.get(which))))
.create()
.show();

4
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@@ -1267,7 +1267,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
}
private void handleResetSecureSession() {
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(R.string.ConversationActivity_reset_secure_session_question);
builder.setIcon(R.drawable.ic_warning);
builder.setCancelable(true);
@@ -2601,7 +2601,7 @@ public class ConversationActivity extends PassphraseRequiredActivity
numberItems[i] = contactData.numbers.get(i).type + ": " + contactData.numbers.get(i).number;
}
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this);
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setIcon(R.drawable.ic_account_box);
builder.setTitle(R.string.ConversationActivity_select_contact_info);

4
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View File

@@ -907,7 +907,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
private AlertDialog.Builder buildRemoteDeleteConfirmationDialog(Set<MessageRecord> messageRecords) {
Context context = requireActivity();
int messagesCount = messageRecords.size();
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(getActivity());
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle(getActivity().getResources().getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messagesCount, messagesCount));
builder.setCancelable(true);
@@ -961,7 +961,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
if (SignalStore.uiHints().hasConfirmedDeleteForEveryoneOnce()) {
deleteForEveryone.run();
} else {
new MaterialAlertDialogBuilder(requireActivity())
new AlertDialog.Builder(requireActivity())
.setMessage(R.string.ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation)
.setPositiveButton(R.string.ConversationFragment_delete_for_everyone, (dialog, which) -> {
SignalStore.uiHints().markHasConfirmedDeleteForEveryoneOnce();

3
app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java
View File

@@ -21,7 +21,6 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.dd.CircularProgressButton;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.thoughtcrime.securesms.BaseActivity;
import org.thoughtcrime.securesms.R;
@@ -226,7 +225,7 @@ public class SubmitDebugLogActivity extends BaseActivity implements SubmitDebugL
}
private void presentResultDialog(@NonNull String url) {
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this)
AlertDialog.Builder builder = new AlertDialog.Builder(this)
.setTitle(R.string.SubmitDebugLogActivity_success)
.setCancelable(false)
.setNeutralButton(android.R.string.ok, (d, w) -> finish())

4
app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
View File

@@ -18,8 +18,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.signal.core.util.StreamUtil;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
@@ -350,7 +348,7 @@ public class SaveAttachmentTask extends ProgressDialogAsyncTask<SaveAttachmentTa
}
public static void showWarningDialog(Context context, OnClickListener onAcceptListener, int count) {
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(context);
AlertDialog.Builder builder = new AlertDialog.Builder(context);
builder.setTitle(R.string.ConversationFragment_save_to_sd_card);
builder.setIcon(R.drawable.ic_warning);
builder.setCancelable(true);