|
|
|
@ -80,8 +80,6 @@ import org.greenrobot.eventbus.Subscribe;
|
|
|
|
|
import org.greenrobot.eventbus.ThreadMode;
|
|
|
|
|
import org.jetbrains.annotations.NotNull;
|
|
|
|
|
import org.thoughtcrime.securesms.ApplicationContext;
|
|
|
|
|
import org.thoughtcrime.securesms.ConversationListActivity;
|
|
|
|
|
import org.thoughtcrime.securesms.ConversationListArchiveActivity;
|
|
|
|
|
import org.thoughtcrime.securesms.ExpirationDialog;
|
|
|
|
|
import org.thoughtcrime.securesms.GroupCreateActivity;
|
|
|
|
|
import org.thoughtcrime.securesms.GroupMembersDialog;
|
|
|
|
@ -156,12 +154,13 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreviewViewModel;
|
|
|
|
|
import org.thoughtcrime.securesms.logging.Log;
|
|
|
|
|
import org.thoughtcrime.securesms.loki.FriendRequestViewDelegate;
|
|
|
|
|
import org.thoughtcrime.securesms.loki.LokiAPIUtilities;
|
|
|
|
|
import org.thoughtcrime.securesms.loki.LokiThreadDatabase;
|
|
|
|
|
import org.thoughtcrime.securesms.loki.LokiMessageDatabase;
|
|
|
|
|
import org.thoughtcrime.securesms.loki.LokiThreadDatabase;
|
|
|
|
|
import org.thoughtcrime.securesms.loki.LokiThreadDatabaseDelegate;
|
|
|
|
|
import org.thoughtcrime.securesms.loki.LokiUserDatabase;
|
|
|
|
|
import org.thoughtcrime.securesms.loki.MentionCandidateSelectionView;
|
|
|
|
|
import org.thoughtcrime.securesms.loki.MultiDeviceUtilities;
|
|
|
|
|
import org.thoughtcrime.securesms.loki.redesign.activities.HomeActivity;
|
|
|
|
|
import org.thoughtcrime.securesms.mediasend.Media;
|
|
|
|
|
import org.thoughtcrime.securesms.mediasend.MediaSendActivity;
|
|
|
|
|
import org.thoughtcrime.securesms.mms.AttachmentManager;
|
|
|
|
@ -248,7 +247,6 @@ import java.util.concurrent.atomic.AtomicInteger;
|
|
|
|
|
import kotlin.Unit;
|
|
|
|
|
import network.loki.messenger.R;
|
|
|
|
|
|
|
|
|
|
import static nl.komponents.kovenant.KovenantApi.task;
|
|
|
|
|
import static org.thoughtcrime.securesms.TransportOption.Type;
|
|
|
|
|
import static org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord;
|
|
|
|
|
import static org.whispersystems.libsignal.SessionCipher.SESSION_LOCK;
|
|
|
|
@ -842,7 +840,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
|
|
|
|
|
//////// Event Handlers
|
|
|
|
|
|
|
|
|
|
private void handleReturnToConversationList() {
|
|
|
|
|
Intent intent = new Intent(this, (archived ? ConversationListArchiveActivity.class : ConversationListActivity.class));
|
|
|
|
|
Intent intent = new Intent(this, HomeActivity.class);
|
|
|
|
|
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
|
|
|
|
|
startActivity(intent);
|
|
|
|
|
finish();
|
|
|
|
|