|
|
@ -34,6 +34,7 @@ import android.os.Bundle;
|
|
|
|
import android.provider.ContactsContract;
|
|
|
|
import android.provider.ContactsContract;
|
|
|
|
import android.support.annotation.NonNull;
|
|
|
|
import android.support.annotation.NonNull;
|
|
|
|
import android.support.v4.view.WindowCompat;
|
|
|
|
import android.support.v4.view.WindowCompat;
|
|
|
|
|
|
|
|
import android.support.v7.app.AlertDialog;
|
|
|
|
import android.text.Editable;
|
|
|
|
import android.text.Editable;
|
|
|
|
import android.text.TextWatcher;
|
|
|
|
import android.text.TextWatcher;
|
|
|
|
import android.util.Log;
|
|
|
|
import android.util.Log;
|
|
|
@ -52,7 +53,6 @@ import android.widget.ImageButton;
|
|
|
|
import android.widget.TextView;
|
|
|
|
import android.widget.TextView;
|
|
|
|
import android.widget.Toast;
|
|
|
|
import android.widget.Toast;
|
|
|
|
|
|
|
|
|
|
|
|
import com.afollestad.materialdialogs.AlertDialogWrapper;
|
|
|
|
|
|
|
|
import com.commonsware.cwac.camera.CameraHost.FailureReason;
|
|
|
|
import com.commonsware.cwac.camera.CameraHost.FailureReason;
|
|
|
|
import com.google.protobuf.ByteString;
|
|
|
|
import com.google.protobuf.ByteString;
|
|
|
|
|
|
|
|
|
|
|
@ -465,7 +465,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void handleUnblock() {
|
|
|
|
private void handleUnblock() {
|
|
|
|
new AlertDialogWrapper.Builder(this)
|
|
|
|
new AlertDialog.Builder(this)
|
|
|
|
.setTitle(R.string.ConversationActivity_unblock_question)
|
|
|
|
.setTitle(R.string.ConversationActivity_unblock_question)
|
|
|
|
.setMessage(R.string.ConversationActivity_are_you_sure_you_want_to_unblock_this_contact)
|
|
|
|
.setMessage(R.string.ConversationActivity_are_you_sure_you_want_to_unblock_this_contact)
|
|
|
|
.setNegativeButton(android.R.string.cancel, null)
|
|
|
|
.setNegativeButton(android.R.string.cancel, null)
|
|
|
@ -497,7 +497,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void handleResetSecureSession() {
|
|
|
|
private void handleResetSecureSession() {
|
|
|
|
AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(this);
|
|
|
|
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
|
|
|
builder.setTitle(R.string.ConversationActivity_reset_secure_session_confirmation);
|
|
|
|
builder.setTitle(R.string.ConversationActivity_reset_secure_session_confirmation);
|
|
|
|
builder.setIconAttribute(R.attr.dialog_alert_icon);
|
|
|
|
builder.setIconAttribute(R.attr.dialog_alert_icon);
|
|
|
|
builder.setCancelable(true);
|
|
|
|
builder.setCancelable(true);
|
|
|
@ -543,7 +543,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(this);
|
|
|
|
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
|
|
|
builder.setTitle(getString(R.string.ConversationActivity_leave_group));
|
|
|
|
builder.setTitle(getString(R.string.ConversationActivity_leave_group));
|
|
|
|
builder.setIconAttribute(R.attr.dialog_info_icon);
|
|
|
|
builder.setIconAttribute(R.attr.dialog_info_icon);
|
|
|
|
builder.setCancelable(true);
|
|
|
|
builder.setCancelable(true);
|
|
|
@ -645,7 +645,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void handleDeleteThread() {
|
|
|
|
private void handleDeleteThread() {
|
|
|
|
AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(this);
|
|
|
|
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
|
|
|
builder.setTitle(R.string.ConversationActivity_delete_thread_confirmation);
|
|
|
|
builder.setTitle(R.string.ConversationActivity_delete_thread_confirmation);
|
|
|
|
builder.setIconAttribute(R.attr.dialog_alert_icon);
|
|
|
|
builder.setIconAttribute(R.attr.dialog_alert_icon);
|
|
|
|
builder.setCancelable(true);
|
|
|
|
builder.setCancelable(true);
|
|
|
@ -1036,7 +1036,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|
|
|
numberItems[i] = contactData.numbers.get(i).type + ": " + contactData.numbers.get(i).number;
|
|
|
|
numberItems[i] = contactData.numbers.get(i).type + ": " + contactData.numbers.get(i).number;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(this);
|
|
|
|
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
|
|
|
builder.setIconAttribute(R.attr.conversation_attach_contact_info);
|
|
|
|
builder.setIconAttribute(R.attr.conversation_attach_contact_info);
|
|
|
|
builder.setTitle(R.string.ConversationActivity_select_contact_info);
|
|
|
|
builder.setTitle(R.string.ConversationActivity_select_contact_info);
|
|
|
|
|
|
|
|
|
|
|
|