Wrap ConversationActivity code in a Fragment.

app/src/main/java/org/thoughtcrime/securesms/conversation/BubbleConversationActivity.java

@@ -1,5 +1,8 @@
 package org.thoughtcrime.securesms.conversation;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
+
 /**
  * Activity which encapsulates a conversation for a Bubble window.
  *
@@ -9,7 +12,11 @@ package org.thoughtcrime.securesms.conversation;
  */
 public class BubbleConversationActivity extends ConversationActivity {
   @Override
-  protected boolean isInBubble() {
+  public boolean isInBubble() {
     return true;
   }
+
+  @Override
+  public void onInitializeToolbar(@NonNull Toolbar toolbar) {
+  }
 }

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.kt

@@ -0,0 +1,76 @@
+package org.thoughtcrime.securesms.conversation
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.MotionEvent
+import android.view.View
+import androidx.appcompat.content.res.AppCompatResources
+import androidx.appcompat.widget.Toolbar
+import org.thoughtcrime.securesms.PassphraseRequiredActivity
+import org.thoughtcrime.securesms.R
+import org.thoughtcrime.securesms.components.HidingLinearLayout
+import org.thoughtcrime.securesms.components.reminder.ReminderView
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme
+import org.thoughtcrime.securesms.util.DynamicTheme
+import org.thoughtcrime.securesms.util.concurrent.ListenableFuture
+import org.thoughtcrime.securesms.util.views.Stub
+
+open class ConversationActivity : PassphraseRequiredActivity(), ConversationParentFragment.Callback {
+
+  private lateinit var fragment: ConversationParentFragment
+
+  private val dynamicTheme: DynamicTheme = DynamicNoActionBarTheme()
+  override fun onPreCreate() {
+    dynamicTheme.onCreate(this)
+  }
+
+  override fun onCreate(savedInstanceState: Bundle?, ready: Boolean) {
+    setContentView(R.layout.conversation_parent_fragment_container)
+
+    fragment = supportFragmentManager.findFragmentById(R.id.fragment_container) as ConversationParentFragment
+  }
+
+  override fun onNewIntent(intent: Intent?) {
+    super.onNewIntent(intent)
+    fragment.onNewIntent(intent)
+  }
+
+  override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
+    return fragment.dispatchTouchEvent(ev) || super.dispatchTouchEvent(ev)
+  }
+
+  override fun onResume() {
+    super.onResume()
+    dynamicTheme.onResume(this)
+  }
+
+  override fun onInitializeToolbar(toolbar: Toolbar) {
+    toolbar.navigationIcon = AppCompatResources.getDrawable(this, R.drawable.ic_arrow_left_24)
+    toolbar.setNavigationOnClickListener { finish() }
+  }
+
+  fun saveDraft(): ListenableFuture<Long> {
+    return fragment.saveDraft()
+  }
+
+  fun getRecipient(): Recipient {
+    return fragment.recipient
+  }
+
+  fun getTitleView(): View {
+    return fragment.titleView
+  }
+
+  fun getComposeText(): View {
+    return fragment.composeText
+  }
+
+  fun getQuickAttachmentToggle(): HidingLinearLayout {
+    return fragment.quickAttachmentToggle
+  }
+
+  fun getReminderView(): Stub<ReminderView> {
+    return fragment.reminderView
+  }
+}

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java

@@ -58,6 +58,7 @@ import androidx.core.view.ViewCompat;
 import androidx.core.view.ViewKt;
 import androidx.lifecycle.LiveData;
 import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.ViewModelProviders;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
@@ -253,7 +254,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
   @Override
   public void onCreate(Bundle icicle) {
     super.onCreate(icicle);
-    this.locale = (Locale) getArguments().getSerializable(PassphraseRequiredActivity.LOCALE_EXTRA);
+    this.locale = Locale.getDefault();
     startupStopwatch = new Stopwatch("conversation-open");
     SignalLocalMetrics.ConversationOpen.start();
   }
@@ -323,9 +324,9 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
 
     giphyMp4ProjectionRecycler = initializeGiphyMp4();
 
-    this.groupViewModel         = ViewModelProviders.of(requireActivity(), new ConversationGroupViewModel.Factory()).get(ConversationGroupViewModel.class);
-    this.messageCountsViewModel = ViewModelProviders.of(requireActivity()).get(MessageCountsViewModel.class);
-    this.conversationViewModel  = ViewModelProviders.of(requireActivity(), new ConversationViewModel.Factory()).get(ConversationViewModel.class);
+    this.groupViewModel         = new ViewModelProvider(getParentFragment(), new ConversationGroupViewModel.Factory()).get(ConversationGroupViewModel.class);
+    this.messageCountsViewModel = new ViewModelProvider(getParentFragment()).get(MessageCountsViewModel.class);
+    this.conversationViewModel  = new ViewModelProvider(getParentFragment(), new ConversationViewModel.Factory()).get(ConversationViewModel.class);
 
     conversationViewModel.getChatColors().observe(getViewLifecycleOwner(), recyclerViewColorizer::setChatColors);
     conversationViewModel.getMessages().observe(getViewLifecycleOwner(), messages -> {
@@ -381,6 +382,13 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
 
     conversationViewModel.getActiveNotificationProfile().observe(getViewLifecycleOwner(), this::updateNotificationProfileStatus);
 
+    initializeScrollButtonAnimations();
+    initializeResources();
+    initializeMessageRequestViewModel();
+    initializeListAdapter();
+
+    // TODO [alex] LargeScreenSupport -- conversationViewModel.getSearchQuery().observe(getViewLifecycleOwner(), this::onSearchQueryUpdated);
+
     return view;
   }
 
@@ -414,21 +422,9 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
   }
 
   @Override
-  public void onActivityCreated(Bundle bundle) {
-    super.onActivityCreated(bundle);
-
-    Log.d(TAG, "[onActivityCreated]");
-
-    initializeScrollButtonAnimations();
-    initializeResources();
-    initializeMessageRequestViewModel();
-    initializeListAdapter();
-  }
-
-  @Override
-  public void onAttach(Activity activity) {
-    super.onAttach(activity);
-    this.listener = (ConversationFragmentListener)activity;
+  public void onAttach(Context context) {
+    super.onAttach(context);
+    this.listener = (ConversationFragmentListener) getParentFragment();
   }
 
   @Override
@@ -525,7 +521,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
   private void initializeMessageRequestViewModel() {
     MessageRequestViewModel.Factory factory = new MessageRequestViewModel.Factory(requireContext());
 
-    messageRequestViewModel = ViewModelProviders.of(requireActivity(), factory).get(MessageRequestViewModel.class);
+    messageRequestViewModel = new ViewModelProvider(requireParentFragment(), factory).get(MessageRequestViewModel.class);
     messageRequestViewModel.setConversationInfo(recipient.getId(), threadId);
 
     listener.onMessageRequest(messageRequestViewModel);

app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java

@@ -10,6 +10,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.WindowManager;
 
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityOptionsCompat;
 
 import org.signal.core.util.logging.Log;
@@ -48,14 +49,14 @@ public class ConversationPopupActivity extends ConversationActivity {
 
     super.onCreate(bundle, ready);
 
-    titleView.setOnClickListener(null);
+    getTitleView().setOnClickListener(null);
   }
 
   @Override
   protected void onResume() {
     super.onResume();
-    composeText.requestFocus();
-    quickAttachmentToggle.disable();
+    getComposeText().requestFocus();
+    getQuickAttachmentToggle().disable();
   }
 
   @Override
@@ -101,21 +102,20 @@ public class ConversationPopupActivity extends ConversationActivity {
   }
 
   @Override
-  protected void initializeActionBar() {
-    super.initializeActionBar();
-    getSupportActionBar().setDisplayHomeAsUpEnabled(false);
+  public void onInitializeToolbar(Toolbar toolbar) {
   }
 
   @Override
-  protected void sendComplete(long threadId) {
-    super.sendComplete(threadId);
+  public void onSendComplete(long threadId) {
     finish();
   }
 
   @Override
-  protected void updateReminders() {
-    if (reminderView.resolved()) {
-      reminderView.get().setVisibility(View.GONE);
+  public boolean onUpdateReminders() {
+    if (getReminderView().resolved()) {
+      getReminderView().get().setVisibility(View.GONE);
     }
+
+    return false;
   }
 }