|
|
@ -66,6 +66,8 @@ import org.thoughtcrime.securesms.components.AnimatingToggle;
|
|
|
|
import org.thoughtcrime.securesms.components.ComposeText;
|
|
|
|
import org.thoughtcrime.securesms.components.ComposeText;
|
|
|
|
import org.thoughtcrime.securesms.components.InputAwareLayout;
|
|
|
|
import org.thoughtcrime.securesms.components.InputAwareLayout;
|
|
|
|
import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout.OnKeyboardShownListener;
|
|
|
|
import org.thoughtcrime.securesms.components.KeyboardAwareLinearLayout.OnKeyboardShownListener;
|
|
|
|
|
|
|
|
import org.thoughtcrime.securesms.components.reminder.InviteReminder;
|
|
|
|
|
|
|
|
import org.thoughtcrime.securesms.components.reminder.ReminderView;
|
|
|
|
import org.thoughtcrime.securesms.components.SendButton;
|
|
|
|
import org.thoughtcrime.securesms.components.SendButton;
|
|
|
|
import org.thoughtcrime.securesms.components.camera.HidingImageButton;
|
|
|
|
import org.thoughtcrime.securesms.components.camera.HidingImageButton;
|
|
|
|
import org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer;
|
|
|
|
import org.thoughtcrime.securesms.components.camera.QuickAttachmentDrawer;
|
|
|
@ -85,6 +87,7 @@ import org.thoughtcrime.securesms.database.DraftDatabase.Draft;
|
|
|
|
import org.thoughtcrime.securesms.database.DraftDatabase.Drafts;
|
|
|
|
import org.thoughtcrime.securesms.database.DraftDatabase.Drafts;
|
|
|
|
import org.thoughtcrime.securesms.database.GroupDatabase;
|
|
|
|
import org.thoughtcrime.securesms.database.GroupDatabase;
|
|
|
|
import org.thoughtcrime.securesms.database.MmsSmsColumns.Types;
|
|
|
|
import org.thoughtcrime.securesms.database.MmsSmsColumns.Types;
|
|
|
|
|
|
|
|
import org.thoughtcrime.securesms.database.RecipientPreferenceDatabase.RecipientsPreferences;
|
|
|
|
import org.thoughtcrime.securesms.database.ThreadDatabase;
|
|
|
|
import org.thoughtcrime.securesms.database.ThreadDatabase;
|
|
|
|
import org.thoughtcrime.securesms.mms.AttachmentManager;
|
|
|
|
import org.thoughtcrime.securesms.mms.AttachmentManager;
|
|
|
|
import org.thoughtcrime.securesms.mms.AttachmentManager.MediaType;
|
|
|
|
import org.thoughtcrime.securesms.mms.AttachmentManager.MediaType;
|
|
|
@ -106,6 +109,7 @@ import org.thoughtcrime.securesms.sms.MessageSender;
|
|
|
|
import org.thoughtcrime.securesms.sms.OutgoingEncryptedMessage;
|
|
|
|
import org.thoughtcrime.securesms.sms.OutgoingEncryptedMessage;
|
|
|
|
import org.thoughtcrime.securesms.sms.OutgoingEndSessionMessage;
|
|
|
|
import org.thoughtcrime.securesms.sms.OutgoingEndSessionMessage;
|
|
|
|
import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
|
|
|
|
import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
|
|
|
|
|
|
|
|
import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
|
|
|
|
import org.thoughtcrime.securesms.util.CharacterCalculator.CharacterState;
|
|
|
|
import org.thoughtcrime.securesms.util.CharacterCalculator.CharacterState;
|
|
|
|
import org.thoughtcrime.securesms.util.Dialogs;
|
|
|
|
import org.thoughtcrime.securesms.util.Dialogs;
|
|
|
|
import org.thoughtcrime.securesms.util.DirectoryHelper;
|
|
|
|
import org.thoughtcrime.securesms.util.DirectoryHelper;
|
|
|
@ -117,16 +121,17 @@ import org.thoughtcrime.securesms.util.GroupUtil;
|
|
|
|
import org.thoughtcrime.securesms.util.MediaUtil;
|
|
|
|
import org.thoughtcrime.securesms.util.MediaUtil;
|
|
|
|
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
|
|
|
import org.thoughtcrime.securesms.util.TextSecurePreferences;
|
|
|
|
import org.thoughtcrime.securesms.util.Util;
|
|
|
|
import org.thoughtcrime.securesms.util.Util;
|
|
|
|
|
|
|
|
import org.thoughtcrime.securesms.util.ViewUtil;
|
|
|
|
import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
|
|
|
|
import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
|
|
|
|
import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
|
|
|
|
import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
|
|
|
|
import org.whispersystems.libaxolotl.InvalidMessageException;
|
|
|
|
import org.whispersystems.libaxolotl.InvalidMessageException;
|
|
|
|
|
|
|
|
import org.whispersystems.libaxolotl.util.guava.Optional;
|
|
|
|
import org.whispersystems.textsecure.api.util.InvalidNumberException;
|
|
|
|
import org.whispersystems.textsecure.api.util.InvalidNumberException;
|
|
|
|
|
|
|
|
|
|
|
|
import java.io.IOException;
|
|
|
|
import java.io.IOException;
|
|
|
|
import java.security.NoSuchAlgorithmException;
|
|
|
|
import java.security.NoSuchAlgorithmException;
|
|
|
|
import java.security.SecureRandom;
|
|
|
|
import java.security.SecureRandom;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.concurrent.ExecutionException;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import static org.thoughtcrime.securesms.TransportOption.Type;
|
|
|
|
import static org.thoughtcrime.securesms.TransportOption.Type;
|
|
|
|
import static org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord;
|
|
|
|
import static org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord;
|
|
|
@ -175,6 +180,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|
|
|
private InputAwareLayout container;
|
|
|
|
private InputAwareLayout container;
|
|
|
|
private View composePanel;
|
|
|
|
private View composePanel;
|
|
|
|
private View composeBubble;
|
|
|
|
private View composeBubble;
|
|
|
|
|
|
|
|
private ReminderView reminderView;
|
|
|
|
|
|
|
|
|
|
|
|
private AttachmentTypeSelectorAdapter attachmentAdapter;
|
|
|
|
private AttachmentTypeSelectorAdapter attachmentAdapter;
|
|
|
|
private AttachmentManager attachmentManager;
|
|
|
|
private AttachmentManager attachmentManager;
|
|
|
@ -216,16 +222,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|
|
|
initializeActionBar();
|
|
|
|
initializeActionBar();
|
|
|
|
initializeViews();
|
|
|
|
initializeViews();
|
|
|
|
initializeResources();
|
|
|
|
initializeResources();
|
|
|
|
initializeSecurity(false, false).addListener(new ListenableFuture.Listener<Boolean>() {
|
|
|
|
initializeSecurity(false, false).addListener(new AssertedSuccessListener<Boolean>() {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void onSuccess(Boolean result) {
|
|
|
|
public void onSuccess(Boolean result) {
|
|
|
|
initializeDraft();
|
|
|
|
initializeDraft();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public void onFailure(ExecutionException e) {
|
|
|
|
|
|
|
|
throw new AssertionError(e);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
@ -241,15 +242,11 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|
|
|
|
|
|
|
|
|
|
|
setIntent(intent);
|
|
|
|
setIntent(intent);
|
|
|
|
initializeResources();
|
|
|
|
initializeResources();
|
|
|
|
initializeSecurity(false, false).addListener(new ListenableFuture.Listener<Boolean>() {
|
|
|
|
initializeSecurity(false, false).addListener(new AssertedSuccessListener<Boolean>() {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void onSuccess(Boolean result) {
|
|
|
|
public void onSuccess(Boolean result) {
|
|
|
|
initializeDraft();
|
|
|
|
initializeDraft();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public void onFailure(ExecutionException e) {
|
|
|
|
|
|
|
|
throw new AssertionError(e);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
if (fragment != null) {
|
|
|
|
if (fragment != null) {
|
|
|
@ -804,14 +801,25 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|
|
|
if (result.first != currentSecureText || result.second != currentSecureVoice) {
|
|
|
|
if (result.first != currentSecureText || result.second != currentSecureVoice) {
|
|
|
|
handleSecurityChange(result.first, result.second);
|
|
|
|
handleSecurityChange(result.first, result.second);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
future.set(true);
|
|
|
|
future.set(true);
|
|
|
|
|
|
|
|
onSecurityUpdated();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}.execute(recipients);
|
|
|
|
}.execute(recipients);
|
|
|
|
|
|
|
|
|
|
|
|
return future;
|
|
|
|
return future;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void onSecurityUpdated() {
|
|
|
|
|
|
|
|
updateInviteReminder();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private void updateInviteReminder() {
|
|
|
|
|
|
|
|
if (TextSecurePreferences.isPushRegistered(this) && !isSecureText && recipients.isSingleRecipient()) {
|
|
|
|
|
|
|
|
new ShowInviteReminderTask().execute(recipients);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
reminderView.hide();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private void initializeMmsEnabledCheck() {
|
|
|
|
private void initializeMmsEnabledCheck() {
|
|
|
|
new AsyncTask<Void, Void, Boolean>() {
|
|
|
|
new AsyncTask<Void, Void, Boolean>() {
|
|
|
@ -829,20 +837,20 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|
|
|
|
|
|
|
|
|
|
|
private void initializeViews() {
|
|
|
|
private void initializeViews() {
|
|
|
|
titleView = (ConversationTitleView) getSupportActionBar().getCustomView();
|
|
|
|
titleView = (ConversationTitleView) getSupportActionBar().getCustomView();
|
|
|
|
buttonToggle = (AnimatingToggle) findViewById(R.id.button_toggle);
|
|
|
|
buttonToggle = ViewUtil.findById(this, R.id.button_toggle);
|
|
|
|
sendButton = (SendButton) findViewById(R.id.send_button);
|
|
|
|
sendButton = ViewUtil.findById(this, R.id.send_button);
|
|
|
|
attachButton = (ImageButton) findViewById(R.id.attach_button);
|
|
|
|
attachButton = ViewUtil.findById(this, R.id.attach_button);
|
|
|
|
composeText = (ComposeText) findViewById(R.id.embedded_text_editor);
|
|
|
|
composeText = ViewUtil.findById(this, R.id.embedded_text_editor);
|
|
|
|
charactersLeft = (TextView) findViewById(R.id.space_left);
|
|
|
|
charactersLeft = ViewUtil.findById(this, R.id.space_left);
|
|
|
|
emojiToggle = (EmojiToggle) findViewById(R.id.emoji_toggle);
|
|
|
|
emojiToggle = ViewUtil.findById(this, R.id.emoji_toggle);
|
|
|
|
emojiDrawer = (EmojiDrawer) findViewById(R.id.emoji_drawer);
|
|
|
|
emojiDrawer = ViewUtil.findById(this, R.id.emoji_drawer);
|
|
|
|
unblockButton = (Button) findViewById(R.id.unblock_button);
|
|
|
|
unblockButton = ViewUtil.findById(this, R.id.unblock_button);
|
|
|
|
composePanel = findViewById(R.id.bottom_panel);
|
|
|
|
composePanel = ViewUtil.findById(this, R.id.bottom_panel);
|
|
|
|
composeBubble = findViewById(R.id.compose_bubble);
|
|
|
|
composeBubble = ViewUtil.findById(this, R.id.compose_bubble);
|
|
|
|
container = (InputAwareLayout) findViewById(R.id.layout_container);
|
|
|
|
container = ViewUtil.findById(this, R.id.layout_container);
|
|
|
|
|
|
|
|
reminderView = ViewUtil.findById(this, R.id.reminder);
|
|
|
|
quickAttachmentDrawer = (QuickAttachmentDrawer) findViewById(R.id.quick_attachment_drawer);
|
|
|
|
quickAttachmentDrawer = ViewUtil.findById(this, R.id.quick_attachment_drawer);
|
|
|
|
quickAttachmentToggle = (HidingImageButton) findViewById(R.id.quick_attachment_toggle);
|
|
|
|
quickAttachmentToggle = ViewUtil.findById(this, R.id.quick_attachment_toggle);
|
|
|
|
|
|
|
|
|
|
|
|
container.addOnKeyboardShownListener(this);
|
|
|
|
container.addOnKeyboardShownListener(this);
|
|
|
|
|
|
|
|
|
|
|
@ -944,6 +952,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|
|
|
titleView.setTitle(recipients);
|
|
|
|
titleView.setTitle(recipients);
|
|
|
|
setBlockedUserState(recipients);
|
|
|
|
setBlockedUserState(recipients);
|
|
|
|
setActionBarColor(recipients.getColor());
|
|
|
|
setActionBarColor(recipients.getColor());
|
|
|
|
|
|
|
|
updateInviteReminder();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -1441,4 +1450,31 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|
|
|
updateToggleButtonState();
|
|
|
|
updateToggleButtonState();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private class ShowInviteReminderTask extends AsyncTask<Recipients, Void, Pair<Recipients,Boolean>> {
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
protected Pair<Recipients, Boolean> doInBackground(Recipients... recipients) {
|
|
|
|
|
|
|
|
if (recipients.length != 1 || recipients[0] == null) throw new AssertionError("task needs exactly one Recipients object");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Optional<RecipientsPreferences> prefs = DatabaseFactory.getRecipientPreferenceDatabase(ConversationActivity.this)
|
|
|
|
|
|
|
|
.getRecipientsPreferences(recipients[0].getIds());
|
|
|
|
|
|
|
|
return new Pair<>(recipients[0], prefs.isPresent() && prefs.get().hasSeenInviteReminder());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
protected void onPostExecute(Pair<Recipients, Boolean> result) {
|
|
|
|
|
|
|
|
if (!result.second && result.first == recipients) {
|
|
|
|
|
|
|
|
InviteReminder reminder = new InviteReminder(ConversationActivity.this, result.first);
|
|
|
|
|
|
|
|
reminder.setOkListener(new OnClickListener() {
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
|
|
|
public void onClick(View v) {
|
|
|
|
|
|
|
|
handleInviteLink();
|
|
|
|
|
|
|
|
reminderView.requestDismiss();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
reminderView.showReminder(reminder);
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
reminderView.hide();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|