From cd7fd5d51ae1c294f2af69e1aa65d4d83a603857 Mon Sep 17 00:00:00 2001
From: Haafingar <simon@loki.network>
Date: Tue, 9 Jun 2020 13:58:01 +1000
Subject: [PATCH 01/30] Design menu layout, build adapters and activities

---
 AndroidManifest.xml                           |   3 +
 res/layout/activity_edit_closed_group.xml     | 121 ++++++++++++
 .../fragment_group_edit_bottom_sheet.xml      |  28 +++
 res/menu/menu_edit_closed_group.xml           |  10 +
 res/values/strings.xml                        |  16 ++
 .../conversation/ConversationActivity.java    |  11 +-
 .../activities/CreateClosedGroupAdapter.kt    |   5 -
 .../activities/EditClosedGroupActivity.kt     | 184 ++++++++++++++++++
 .../loki/activities/EditClosedGroupAdapter.kt |  48 +++++
 .../loki/activities/EditClosedGroupLoader.kt  |  18 ++
 .../loki/activities/MemberClickListener.kt    |   5 +
 .../dialogs/GroupEditingOptionsBottomSheet.kt |  24 +++
 .../securesms/loki/views/UserView.kt          |  10 +-
 13 files changed, 472 insertions(+), 11 deletions(-)
 create mode 100644 res/layout/activity_edit_closed_group.xml
 create mode 100644 res/layout/fragment_group_edit_bottom_sheet.xml
 create mode 100644 res/menu/menu_edit_closed_group.xml
 create mode 100644 src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
 create mode 100644 src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupAdapter.kt
 create mode 100644 src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
 create mode 100644 src/org/thoughtcrime/securesms/loki/activities/MemberClickListener.kt
 create mode 100644 src/org/thoughtcrime/securesms/loki/dialogs/GroupEditingOptionsBottomSheet.kt

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8023000ff3..4ccde5b2d4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -132,6 +132,9 @@
         <activity
             android:name="org.thoughtcrime.securesms.loki.activities.CreateClosedGroupActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name="org.thoughtcrime.securesms.loki.activities.JoinPublicChatActivity"
             android:screenOrientation="portrait"
diff --git a/res/layout/activity_edit_closed_group.xml b/res/layout/activity_edit_closed_group.xml
new file mode 100644
index 0000000000..65ac969525
--- /dev/null
+++ b/res/layout/activity_edit_closed_group.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background" >
+
+
+    <LinearLayout
+        android:id="@+id/mainContentContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:id="@+id/displayNameContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/large_spacing"
+            android:layout_marginTop="@dimen/small_spacing"
+            android:layout_marginRight="@dimen/large_spacing">
+
+            <EditText
+                style="@style/SessionEditText"
+                android:id="@+id/displayNameEditText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:textAlignment="center"
+                android:paddingTop="12dp"
+                android:paddingBottom="12dp"
+                android:visibility="invisible"
+                android:hint="@string/activity_settings_display_name_edit_text_hint" />
+
+            <TextView
+                android:id="@+id/displayNameTextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:textColor="@color/text"
+                android:textSize="@dimen/very_large_font_size"
+                android:textStyle="bold"/>
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:drawableStart="@drawable/ic_edit_white_24dp"
+                android:gravity="right"/>
+
+        </RelativeLayout>
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/large_spacing"
+            android:layout_marginTop="@dimen/medium_spacing"
+            android:layout_marginRight="@dimen/large_spacing"
+            android:layout_marginBottom="@dimen/medium_spacing"
+            android:textSize="@dimen/small_font_size"
+            android:textColor="@color/text"
+            android:alpha="0.6"
+            android:textAlignment="center"
+            android:text="@string/activity_edit_closed_group_explanation" />
+
+
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/separator" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/large_spacing"
+                android:layout_marginTop="@dimen/small_spacing"
+                android:layout_marginRight="@dimen/massive_spacing"
+                android:layout_marginBottom="@dimen/small_spacing"
+                android:layout_weight="1"
+                android:alpha="0.8"
+                android:text="@string/activity_edit_closed_group_edit_members"
+                android:textColor="@color/text"
+                android:textSize="@dimen/medium_font_size" />
+
+            <Button
+                android:id="@+id/addMembersClosedGroupButton"
+                style="@style/MediumProminentOutlineButton"
+                android:layout_width="135dp"
+                android:layout_height="@dimen/small_button_height"
+                android:layout_marginTop="@dimen/small_spacing"
+                android:layout_marginRight="@dimen/large_spacing"
+                android:layout_marginLeft="@dimen/very_large_spacing"
+                android:layout_marginBottom="@dimen/small_spacing"
+                android:layout_weight="1"
+                android:text="@string/activity_edit_closed_group_add_members" />
+
+        </LinearLayout>
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/emptyStateContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        android:layout_centerInParent="true">
+
+    </LinearLayout>
+
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/fragment_group_edit_bottom_sheet.xml b/res/layout/fragment_group_edit_bottom_sheet.xml
new file mode 100644
index 0000000000..3c56dfa5e6
--- /dev/null
+++ b/res/layout/fragment_group_edit_bottom_sheet.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    app:behavior_hideable="true"
+    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
+    android:background="@color/dialog_background">
+
+    <TextView
+        android:id="@+id/removeFromGroup"
+        style="@style/ActionItem"
+        android:drawableStart="@drawable/ic_phonelink_erase_white_24dp"
+        android:textSize="@dimen/medium_font_size"
+        android:textColor="@color/text"
+        android:text="@string/fragment_edit_group_bottom_sheet_remove"/>
+
+<!--    <TextView-->
+<!--        android:id="@+id/makeAdministrator"-->
+<!--        style="@style/ActionItem"-->
+<!--        android:drawableStart="@drawable/ic_edit_white_24dp"-->
+<!--        android:textSize="@dimen/medium_font_size"-->
+<!--        android:textColor="@color/text"-->
+<!--        android:text="@string/fragment_edit_group_bottom_sheet_admin" />-->
+
+</LinearLayout>
diff --git a/res/menu/menu_edit_closed_group.xml b/res/menu/menu_edit_closed_group.xml
new file mode 100644
index 0000000000..7ded42d025
--- /dev/null
+++ b/res/menu/menu_edit_closed_group.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:title="Done"
+        android:id="@+id/editClosedGroupButton"
+        app:showAsAction="always" />
+
+</menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 10f2ca0e38..94dcb8bdb0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1769,6 +1769,22 @@
     <string name="activity_create_closed_group_too_many_group_members_error">A closed group cannot have more than 10 members</string>
     <string name="activity_create_closed_group_invalid_session_id_error">One of the members of your group has an invalid Session ID</string>
 
+    <string name="activity_edit_closed_group_title">Edit Closed Group</string>
+    <string name="activity_edit_closed_group_edit_text_hint">Enter a new group name (optional)</string>
+    <string name="activity_edit_closed_group_explanation">Closed groups support up to 10 members and provide the same privacy protections as one-on-one sessions.</string>
+    <string name="activity_edit_closed_group_edit_members">Edit members</string>
+    <string name="activity_edit_closed_group_add_members">Add members</string>
+    <string name="activity_edit_closed_group_group_name_missing_error">Group name can\'t be empty</string>
+    <string name="activity_edit_closed_group_group_name_too_long_error">Please enter a shorter group name</string>
+    <string name="activity_edit_closed_group_not_enough_group_members_error">Groups must have at least 2 group members</string>
+    <string name="activity_edit_closed_group_too_many_group_members_error">A closed group cannot have more than 10 members</string>
+    <string name="activity_edit_closed_group_invalid_session_id_error">One of the members of your group has an invalid Session ID</string>
+    <string name="activity_edit_closed_group_confirm_removal">Are you sure you want to remove this user?</string>
+    <string name="activity_edit_closed_group_member_removed">User removed from group</string>
+
+    <string name="fragment_edit_group_bottom_sheet_remove">Remove user from group</string>
+    <string name="fragment_edit_group_bottom_sheet_admin">Make this user a group admin</string>
+
     <string name="activity_join_public_chat_title">Join Open Group</string>
     <string name="activity_join_public_chat_error">Couldn\'t join group</string>
     <string name="activity_join_public_chat_enter_group_url_tab_title">Open Group URL</string>
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index b3446d3c85..2c87524b90 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -154,6 +154,7 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreviewRepository;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewViewModel;
 import org.thoughtcrime.securesms.logging.Log;
+import org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivity;
 import org.thoughtcrime.securesms.loki.activities.HomeActivity;
 import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiThreadDatabaseDelegate;
@@ -1162,10 +1163,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   }
 
   private void handleEditPushGroup() {
-    AlertDialog.Builder alert = new AlertDialog.Builder(this);
-    alert.setMessage("The ability to add members to a closed group is coming soon.");
-    alert.setPositiveButton("OK", (dialog, which) -> dialog.dismiss());
-    alert.create().show();
+    Intent intent = new Intent(this, EditClosedGroupActivity.class);
+    startActivity(intent);
+//    AlertDialog.Builder alert = new AlertDialog.Builder(this);
+//    alert.setMessage("The ability to add members to a closed group is coming soon.");
+//    alert.setPositiveButton("OK", (dialog, which) -> dialog.dismiss());
+//    alert.create().show();
   }
 
   private void handleDistributionBroadcastEnabled(MenuItem item) {
diff --git a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupAdapter.kt
index cf7f76a037..fa69ef8afa 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupAdapter.kt
@@ -42,9 +42,4 @@ class CreateClosedGroupAdapter(private val context: Context) : RecyclerView.Adap
         val index = members.indexOf(member)
         notifyItemChanged(index)
     }
-}
-
-interface MemberClickListener {
-
-    fun onMemberClick(member: String)
 }
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
new file mode 100644
index 0000000000..434ed3a5a8
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
@@ -0,0 +1,184 @@
+package org.thoughtcrime.securesms.loki.activities
+
+import android.content.Intent
+import android.graphics.Bitmap
+import android.os.AsyncTask
+import android.os.Bundle
+import android.support.v4.app.LoaderManager
+import android.support.v4.content.Loader
+import android.support.v7.widget.LinearLayoutManager
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.widget.Toast
+import kotlinx.android.synthetic.main.activity_create_closed_group.*
+import kotlinx.android.synthetic.main.activity_create_closed_group.emptyStateContainer
+import kotlinx.android.synthetic.main.activity_create_closed_group.mainContentContainer
+import kotlinx.android.synthetic.main.activity_create_closed_group.nameEditText
+import kotlinx.android.synthetic.main.activity_edit_closed_group.*
+import kotlinx.android.synthetic.main.activity_edit_closed_group.displayNameContainer
+import kotlinx.android.synthetic.main.activity_edit_closed_group.displayNameTextView
+import kotlinx.android.synthetic.main.activity_linked_devices.recyclerView
+import kotlinx.android.synthetic.main.activity_settings.*
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
+import org.thoughtcrime.securesms.conversation.ConversationActivity
+import org.thoughtcrime.securesms.database.Address
+import org.thoughtcrime.securesms.database.DatabaseFactory
+import org.thoughtcrime.securesms.database.ThreadDatabase
+import org.thoughtcrime.securesms.groups.GroupManager
+import org.thoughtcrime.securesms.loki.dialogs.GroupEditingOptionsBottomSheet
+import org.thoughtcrime.securesms.mms.GlideApp
+import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.util.TextSecurePreferences
+import org.whispersystems.libsignal.util.guava.Optional
+import java.lang.ref.WeakReference
+
+class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberClickListener, LoaderManager.LoaderCallbacks<List<String>> {
+    private var members = listOf<String>()
+        set(value) { field = value; editClosedGroupAdapter.members = value }
+
+    private val editClosedGroupAdapter by lazy {
+        val result = EditClosedGroupAdapter(this)
+        result.glide = GlideApp.with(this)
+        result.memberClickListener = this
+        result
+    }
+    private var isEditingDisplayName = false
+    private val selectedMembers: Set<String>
+        get() { return editClosedGroupAdapter.selectedMembers }
+
+    companion object {
+        public val createNewPrivateChatResultCode = 100
+    }
+
+    // region Lifecycle
+    override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
+        super.onCreate(savedInstanceState, isReady)
+        setContentView(R.layout.activity_edit_closed_group)
+        supportActionBar!!.title = resources.getString(R.string.activity_edit_closed_group_title)
+        displayNameContainer.setOnClickListener { showEditDisplayNameUI() }
+        displayNameTextView.text = "Get Group Name"
+        recyclerView.adapter = editClosedGroupAdapter
+        recyclerView.layoutManager = LinearLayoutManager(this)
+        addMembersClosedGroupButton.setOnClickListener { createNewPrivateChat() }
+        LoaderManager.getInstance(this).initLoader(0, null, this)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.menu_edit_closed_group, menu)
+        return members.isNotEmpty()
+    }
+    // endregion
+
+    // region Updating
+    override fun onCreateLoader(id: Int, bundle: Bundle?): Loader<List<String>> {
+        return CreateClosedGroupLoader(this)
+    }
+
+    override fun onLoadFinished(loader: Loader<List<String>>, members: List<String>) {
+        update(members)
+    }
+
+    override fun onLoaderReset(loader: Loader<List<String>>) {
+        update(listOf())
+    }
+
+    private fun update(members: List<String>) {
+        this.members = members
+        mainContentContainer.visibility = if (members.isEmpty()) View.GONE else View.VISIBLE
+        emptyStateContainer.visibility = if (members.isEmpty()) View.VISIBLE else View.GONE
+        invalidateOptionsMenu()
+    }
+    // endregion
+
+    // region Interaction
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        val id = item.itemId
+        when(id) {
+            R.id.editClosedGroupButton -> modifyClosedGroup()
+            else -> { /* Do nothing */ }
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun createNewPrivateChat() {
+        setResult(createNewPrivateChatResultCode)
+        finish()
+    }
+    private fun showEditDisplayNameUI() {
+        isEditingDisplayName = true
+    }
+
+    override fun onMemberClick(member: String) {
+        val bottomSheet = GroupEditingOptionsBottomSheet()
+        bottomSheet.onRemoveTapped = {
+            bottomSheet.dismiss()
+        }
+ //       bottomSheet.onAdminTapped = {
+ //           bottomSheet.dismiss()
+ //       }
+        bottomSheet.show(supportFragmentManager, "closeBottomSheet")
+    }
+
+    private fun modifyClosedGroup() {
+        val name = nameEditText.text.trim()
+        if (name.isEmpty()) {
+            return Toast.makeText(this, R.string.activity_edit_closed_group_group_name_missing_error, Toast.LENGTH_LONG).show()
+        }
+        if (name.length >= 64) {
+            return Toast.makeText(this, R.string.activity_edit_closed_group_group_name_too_long_error, Toast.LENGTH_LONG).show()
+        }
+
+        if (selectedMembers.count() < 2) {
+            return Toast.makeText(this, R.string.activity_edit_closed_group_not_enough_group_members_error, Toast.LENGTH_LONG).show()
+        }
+        if (selectedMembers.count() > 10) {
+            return Toast.makeText(this, R.string.activity_edit_closed_group_too_many_group_members_error, Toast.LENGTH_LONG).show()
+        }
+        val recipients = selectedMembers.map {
+            Recipient.from(this, Address.fromSerialized(it), false)
+        }.toSet()
+        val masterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(this) ?: TextSecurePreferences.getLocalNumber(this)
+        val admin = Recipient.from(this, Address.fromSerialized(masterHexEncodedPublicKey), false)
+        CreateClosedGroupTask(WeakReference(this), null, name.toString(), recipients, setOf( admin )).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR)
+    }
+
+    private fun handleOpenConversation(threadId: Long, recipient: Recipient) {
+        val intent = Intent(this, ConversationActivity::class.java)
+        intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, threadId)
+        intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT)
+        intent.putExtra(ConversationActivity.ADDRESS_EXTRA, recipient.address)
+        startActivity(intent)
+        finish()
+    }
+    // endregion
+
+    // region Tasks
+    internal class CreateClosedGroupTask(
+            private val activity: WeakReference<EditClosedGroupActivity>,
+            private val profilePicture: Bitmap?,
+            private val name: String?,
+            private val members: Set<Recipient>,
+            private val admins: Set<Recipient>
+    ) : AsyncTask<Void, Void, Optional<GroupManager.GroupActionResult>>() {
+
+        override fun doInBackground(vararg params: Void?): Optional<GroupManager.GroupActionResult> {
+            val activity = activity.get() ?: return Optional.absent()
+            return Optional.of(GroupManager.createGroup(activity, members, profilePicture, name, false, admins))
+        }
+
+        override fun onPostExecute(result: Optional<GroupManager.GroupActionResult>) {
+            val activity = activity.get() ?: return super.onPostExecute(result)
+            if (result.isPresent && result.get().threadId > -1) {
+                if (!activity.isFinishing) {
+                    activity.handleOpenConversation(result.get().threadId, result.get().groupRecipient)
+                }
+            } else {
+                super.onPostExecute(result)
+                Toast.makeText(activity.applicationContext, R.string.activity_create_closed_group_invalid_session_id_error, Toast.LENGTH_LONG).show()
+            }
+        }
+    }
+    // endregion
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupAdapter.kt
new file mode 100644
index 0000000000..cc371a9122
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupAdapter.kt
@@ -0,0 +1,48 @@
+package org.thoughtcrime.securesms.loki.activities
+
+import android.R
+import android.app.PendingIntent.getActivity
+import android.content.Context
+import android.support.v7.app.AlertDialog
+import android.support.v7.widget.RecyclerView
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.EditText
+import android.widget.LinearLayout
+import org.thoughtcrime.securesms.DeviceListItem
+import org.thoughtcrime.securesms.database.Address
+import org.thoughtcrime.securesms.loki.dialogs.DeviceEditingOptionsBottomSheet
+import org.thoughtcrime.securesms.loki.dialogs.GroupEditingOptionsBottomSheet
+import org.thoughtcrime.securesms.loki.utilities.toPx
+import org.thoughtcrime.securesms.loki.views.UserView
+import org.thoughtcrime.securesms.mms.GlideRequests
+import org.thoughtcrime.securesms.recipients.Recipient
+
+class EditClosedGroupAdapter(private val context: Context) : RecyclerView.Adapter<EditClosedGroupAdapter.ViewHolder>() {
+    lateinit var glide: GlideRequests
+    val selectedMembers = mutableSetOf<String>()
+    var members = listOf<String>()
+        set(value) {
+            field = value; notifyDataSetChanged()
+        }
+    var memberClickListener: MemberClickListener? = null
+
+    class ViewHolder(val view: UserView) : RecyclerView.ViewHolder(view)
+
+    override fun getItemCount(): Int {
+        return members.size
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val view = UserView(context)
+        return ViewHolder(view)
+    }
+
+    override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
+        val member = members[position]
+        viewHolder.view.setOnClickListener { memberClickListener?.onMemberClick(member) }
+        val isSelected = selectedMembers.contains(member)
+        viewHolder.view.bind(Recipient.from(context, Address.fromSerialized(member), false), isSelected, glide)
+    }
+}
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
new file mode 100644
index 0000000000..311bc1becd
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
@@ -0,0 +1,18 @@
+package org.thoughtcrime.securesms.loki.activities
+
+import android.content.Context
+import org.thoughtcrime.securesms.loki.utilities.ContactUtilities
+import org.thoughtcrime.securesms.util.AsyncLoader
+
+class EditClosedGroupLoader(context: Context) : AsyncLoader<List<String>>(context) {
+
+    override fun loadInBackground(): List<String> {
+        val contacts = ContactUtilities.getAllContacts(context)
+        // Only show the master devices of the users we are friends with
+        return contacts.filter { contact ->
+            !contact.recipient.isGroupRecipient && contact.isFriend && !contact.isOurDevice && !contact.isSlave
+        }.map {
+            it.recipient.address.toPhoneString()
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/activities/MemberClickListener.kt b/src/org/thoughtcrime/securesms/loki/activities/MemberClickListener.kt
new file mode 100644
index 0000000000..c1599ce408
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/activities/MemberClickListener.kt
@@ -0,0 +1,5 @@
+package org.thoughtcrime.securesms.loki.activities
+
+interface MemberClickListener {
+    fun onMemberClick(member: String)
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/GroupEditingOptionsBottomSheet.kt b/src/org/thoughtcrime/securesms/loki/dialogs/GroupEditingOptionsBottomSheet.kt
new file mode 100644
index 0000000000..fe967ef652
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/GroupEditingOptionsBottomSheet.kt
@@ -0,0 +1,24 @@
+package org.thoughtcrime.securesms.loki.dialogs
+
+import android.os.Bundle
+import android.support.design.widget.BottomSheetDialogFragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import kotlinx.android.synthetic.main.fragment_group_edit_bottom_sheet.*
+import network.loki.messenger.R
+
+public class GroupEditingOptionsBottomSheet : BottomSheetDialogFragment() {
+    var onRemoveTapped: (() -> Unit)? = null
+//    var onAdminTapped: (() -> Unit)? = null
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_group_edit_bottom_sheet, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        removeFromGroup.setOnClickListener { onRemoveTapped?.invoke() }
+//        makeAdministrator.setOnClickListener { onAdminTapped?.invoke() }
+    }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/views/UserView.kt b/src/org/thoughtcrime/securesms/loki/views/UserView.kt
index 16ffc77db4..0ffb2c358f 100644
--- a/src/org/thoughtcrime/securesms/loki/views/UserView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/UserView.kt
@@ -53,7 +53,8 @@ class UserView : LinearLayout {
                 profilePictureView.isRSSFeed = true
             } else {
                 val threadID = GroupManager.getThreadIDFromGroupID(address, context)
-                val users = MentionsManager.shared.userPublicKeyCache[threadID]?.toList() ?: listOf()
+                val users = MentionsManager.shared.userPublicKeyCache[threadID]?.toList()
+                        ?: listOf()
                 val randomUsers = users.sorted() // Sort to provide a level of stability
                 profilePictureView.hexEncodedPublicKey = randomUsers.getOrNull(0) ?: ""
                 profilePictureView.additionalHexEncodedPublicKey = randomUsers.getOrNull(1) ?: ""
@@ -67,7 +68,12 @@ class UserView : LinearLayout {
         profilePictureView.glide = glide
         profilePictureView.update()
         nameTextView.text = user.name ?: "Unknown Contact"
-        tickImageView.setImageResource(if (isSelected) R.drawable.ic_circle_check else R.drawable.ic_circle)
+        if (user.isGroupRecipient) {
+            // this doesnt work, find out how to work out if the user is a part of the group)
+            tickImageView.setImageResource(R.drawable.ic_edit_white_24dp)
+        } else {
+            tickImageView.setImageResource(if (isSelected) R.drawable.ic_circle_check else R.drawable.ic_circle)
+        }
     }
     // endregion
 }
\ No newline at end of file

From e0c8ae54b687a05544d1408e8fa6ea3748f2f3b1 Mon Sep 17 00:00:00 2001
From: Haafingar <simon@loki.network>
Date: Tue, 9 Jun 2020 15:03:43 +1000
Subject: [PATCH 02/30] add edit name UI

---
 res/layout/activity_edit_closed_group.xml     | 12 +++------
 .../activities/EditClosedGroupActivity.kt     | 25 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/res/layout/activity_edit_closed_group.xml b/res/layout/activity_edit_closed_group.xml
index 65ac969525..f0f46cdcbf 100644
--- a/res/layout/activity_edit_closed_group.xml
+++ b/res/layout/activity_edit_closed_group.xml
@@ -22,7 +22,7 @@
 
             <EditText
                 style="@style/SessionEditText"
-                android:id="@+id/displayNameEditText"
+                android:id="@+id/groupNameEditText"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
@@ -39,13 +39,9 @@
                 android:layout_centerInParent="true"
                 android:textColor="@color/text"
                 android:textSize="@dimen/very_large_font_size"
-                android:textStyle="bold"/>
-
-            <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:drawableStart="@drawable/ic_edit_white_24dp"
-                android:gravity="right"/>
+                android:textStyle="bold"
+                android:drawableRight="@drawable/ic_edit_white_24dp"
+                android:drawablePadding="@dimen/small_spacing"/>
 
         </RelativeLayout>
 
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
index 434ed3a5a8..73cd756d68 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.loki.activities
 
+import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.os.AsyncTask
@@ -10,6 +11,8 @@ import android.support.v7.widget.LinearLayoutManager
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.view.inputmethod.InputMethodManager
+import android.widget.LinearLayout
 import android.widget.Toast
 import kotlinx.android.synthetic.main.activity_create_closed_group.*
 import kotlinx.android.synthetic.main.activity_create_closed_group.emptyStateContainer
@@ -28,6 +31,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.ThreadDatabase
 import org.thoughtcrime.securesms.groups.GroupManager
 import org.thoughtcrime.securesms.loki.dialogs.GroupEditingOptionsBottomSheet
+import org.thoughtcrime.securesms.loki.utilities.toPx
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.TextSecurePreferences
@@ -45,6 +49,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
         result
     }
     private var isEditingDisplayName = false
+        set(value) { field = value; handleIsEditingDisplayNameChanged() }
     private val selectedMembers: Set<String>
         get() { return editClosedGroupAdapter.selectedMembers }
 
@@ -58,7 +63,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
         setContentView(R.layout.activity_edit_closed_group)
         supportActionBar!!.title = resources.getString(R.string.activity_edit_closed_group_title)
         displayNameContainer.setOnClickListener { showEditDisplayNameUI() }
-        displayNameTextView.text = "Get Group Name"
+        displayNameTextView.text = "Get Group Name" // DatabaseFactory.getLokiUserDatabase(this).getDisplayName(hexEncodedPublicKey)
         recyclerView.adapter = editClosedGroupAdapter
         recyclerView.layoutManager = LinearLayoutManager(this)
         addMembersClosedGroupButton.setOnClickListener { createNewPrivateChat() }
@@ -152,6 +157,24 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
         startActivity(intent)
         finish()
     }
+
+    private fun handleIsEditingDisplayNameChanged() {
+        cancelButton.visibility = if (isEditingDisplayName) View.VISIBLE else View.GONE
+        showQRCodeButton.visibility = if (isEditingDisplayName) View.GONE else View.VISIBLE
+        saveButton.visibility = if (isEditingDisplayName) View.VISIBLE else View.GONE
+        displayNameTextView.visibility = if (isEditingDisplayName) View.INVISIBLE else View.VISIBLE
+        groupNameEditText.visibility = if (isEditingDisplayName) View.VISIBLE else View.INVISIBLE
+        val titleTextViewLayoutParams = titleTextView.layoutParams as LinearLayout.LayoutParams
+        titleTextViewLayoutParams.leftMargin = if (isEditingDisplayName) toPx(16, resources) else 0
+        titleTextView.layoutParams = titleTextViewLayoutParams
+        val inputMethodManager = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+        if (isEditingDisplayName) {
+            groupNameEditText.requestFocus()
+            inputMethodManager.showSoftInput(groupNameEditText, 0)
+        } else {
+            inputMethodManager.hideSoftInputFromWindow(groupNameEditText.windowToken, 0)
+        }
+    }
     // endregion
 
     // region Tasks

From 86b8f90aaf2fedf9d14118853f6dc1e9b7e2f847 Mon Sep 17 00:00:00 2001
From: Haafingar <simon@loki.network>
Date: Tue, 9 Jun 2020 16:53:24 +1000
Subject: [PATCH 03/30] Further UI changes

---
 res/layout/activity_edit_closed_group.xml     | 44 ++++++++++++++++---
 .../activities/EditClosedGroupActivity.kt     |  8 +---
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/res/layout/activity_edit_closed_group.xml b/res/layout/activity_edit_closed_group.xml
index f0f46cdcbf..7e54b5c522 100644
--- a/res/layout/activity_edit_closed_group.xml
+++ b/res/layout/activity_edit_closed_group.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background" >
-
+    android:background="@drawable/default_session_background">
 
     <LinearLayout
         android:id="@+id/mainContentContainer"
@@ -23,15 +21,16 @@
             <EditText
                 style="@style/SessionEditText"
                 android:id="@+id/groupNameEditText"
-                android:layout_width="wrap_content"
+                android:layout_width="@dimen/album_total_width"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:textAlignment="center"
                 android:paddingTop="12dp"
-                android:paddingBottom="12dp"
+                android:paddingBottom="@dimen/large_spacing"
                 android:visibility="invisible"
                 android:hint="@string/activity_settings_display_name_edit_text_hint" />
 
+
             <TextView
                 android:id="@+id/displayNameTextView"
                 android:layout_width="wrap_content"
@@ -45,6 +44,39 @@
 
         </RelativeLayout>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <View
+                android:layout_weight="2"
+                android:layout_height="0px"
+                android:layout_width="@dimen/large_spacing"/>
+
+            <ImageView
+                android:id="@+id/cancelEditButton"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:layout_weight="1"
+                android:src="@drawable/ic_close_white_24dp"
+                android:visibility="gone" />
+
+            <ImageView
+                android:id="@+id/saveEditButton"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_check_white_24dp"
+                android:layout_weight="1"
+                android:visibility="gone" />
+
+            <View
+                android:layout_weight="2"
+                android:layout_height="0px"
+                android:layout_width="@dimen/large_spacing"
+                />
+
+
+        </LinearLayout>
+
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
index 73cd756d68..e2f7b14bb2 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
@@ -159,14 +159,10 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
     }
 
     private fun handleIsEditingDisplayNameChanged() {
-        cancelButton.visibility = if (isEditingDisplayName) View.VISIBLE else View.GONE
-        showQRCodeButton.visibility = if (isEditingDisplayName) View.GONE else View.VISIBLE
-        saveButton.visibility = if (isEditingDisplayName) View.VISIBLE else View.GONE
+        cancelEditButton.visibility = if (isEditingDisplayName) View.VISIBLE else View.GONE
+        saveEditButton.visibility = if (isEditingDisplayName) View.VISIBLE else View.GONE
         displayNameTextView.visibility = if (isEditingDisplayName) View.INVISIBLE else View.VISIBLE
         groupNameEditText.visibility = if (isEditingDisplayName) View.VISIBLE else View.INVISIBLE
-        val titleTextViewLayoutParams = titleTextView.layoutParams as LinearLayout.LayoutParams
-        titleTextViewLayoutParams.leftMargin = if (isEditingDisplayName) toPx(16, resources) else 0
-        titleTextView.layoutParams = titleTextViewLayoutParams
         val inputMethodManager = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
         if (isEditingDisplayName) {
             groupNameEditText.requestFocus()

From 50799d9d9044be0121d85bbfd749988667c02175 Mon Sep 17 00:00:00 2001
From: Haafingar <simon@loki.network>
Date: Wed, 10 Jun 2020 16:04:07 +1000
Subject: [PATCH 04/30] Load in groupID and process menu options

---
 res/layout/activity_edit_closed_group.xml     |  2 +-
 res/menu/menu_edit_closed_group.xml           |  2 +-
 res/values/strings.xml                        |  3 +-
 .../conversation/ConversationActivity.java    |  6 +-
 .../activities/EditClosedGroupActivity.kt     | 99 +++++++++++--------
 .../loki/activities/EditClosedGroupAdapter.kt |  2 +-
 .../loki/activities/EditClosedGroupLoader.kt  | 23 ++++-
 7 files changed, 89 insertions(+), 48 deletions(-)

diff --git a/res/layout/activity_edit_closed_group.xml b/res/layout/activity_edit_closed_group.xml
index 7e54b5c522..49a8463ba7 100644
--- a/res/layout/activity_edit_closed_group.xml
+++ b/res/layout/activity_edit_closed_group.xml
@@ -28,7 +28,7 @@
                 android:paddingTop="12dp"
                 android:paddingBottom="@dimen/large_spacing"
                 android:visibility="invisible"
-                android:hint="@string/activity_settings_display_name_edit_text_hint" />
+                android:hint="@string/activity_edit_closed_group_edit_text_hint" />
 
 
             <TextView
diff --git a/res/menu/menu_edit_closed_group.xml b/res/menu/menu_edit_closed_group.xml
index 7ded42d025..1e8237e3af 100644
--- a/res/menu/menu_edit_closed_group.xml
+++ b/res/menu/menu_edit_closed_group.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:title="Done"
+        android:title="@string/activity_edit_closed_group_apply_changes"
         android:id="@+id/editClosedGroupButton"
         app:showAsAction="always" />
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 94dcb8bdb0..bc2001a3d6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1770,7 +1770,7 @@
     <string name="activity_create_closed_group_invalid_session_id_error">One of the members of your group has an invalid Session ID</string>
 
     <string name="activity_edit_closed_group_title">Edit Closed Group</string>
-    <string name="activity_edit_closed_group_edit_text_hint">Enter a new group name (optional)</string>
+    <string name="activity_edit_closed_group_edit_text_hint">Enter a new group name</string>
     <string name="activity_edit_closed_group_explanation">Closed groups support up to 10 members and provide the same privacy protections as one-on-one sessions.</string>
     <string name="activity_edit_closed_group_edit_members">Edit members</string>
     <string name="activity_edit_closed_group_add_members">Add members</string>
@@ -1781,6 +1781,7 @@
     <string name="activity_edit_closed_group_invalid_session_id_error">One of the members of your group has an invalid Session ID</string>
     <string name="activity_edit_closed_group_confirm_removal">Are you sure you want to remove this user?</string>
     <string name="activity_edit_closed_group_member_removed">User removed from group</string>
+    <string name="activity_edit_closed_group_apply_changes">Apply</string>
 
     <string name="fragment_edit_group_bottom_sheet_remove">Remove user from group</string>
     <string name="fragment_edit_group_bottom_sheet_admin">Make this user a group admin</string>
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 2c87524b90..bc98f2264f 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -1164,11 +1164,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   private void handleEditPushGroup() {
     Intent intent = new Intent(this, EditClosedGroupActivity.class);
+    String groupID = this.recipient.getAddress().toGroupString();
+    intent.putExtra(EditClosedGroupActivity.GROUP_ID, groupID);
     startActivity(intent);
-//    AlertDialog.Builder alert = new AlertDialog.Builder(this);
-//    alert.setMessage("The ability to add members to a closed group is coming soon.");
-//    alert.setPositiveButton("OK", (dialog, which) -> dialog.dismiss());
-//    alert.create().show();
   }
 
   private void handleDistributionBroadcastEnabled(MenuItem item) {
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
index e2f7b14bb2..2e6574cef9 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
@@ -12,12 +12,9 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.inputmethod.InputMethodManager
-import android.widget.LinearLayout
 import android.widget.Toast
-import kotlinx.android.synthetic.main.activity_create_closed_group.*
 import kotlinx.android.synthetic.main.activity_create_closed_group.emptyStateContainer
 import kotlinx.android.synthetic.main.activity_create_closed_group.mainContentContainer
-import kotlinx.android.synthetic.main.activity_create_closed_group.nameEditText
 import kotlinx.android.synthetic.main.activity_edit_closed_group.*
 import kotlinx.android.synthetic.main.activity_edit_closed_group.displayNameContainer
 import kotlinx.android.synthetic.main.activity_edit_closed_group.displayNameTextView
@@ -31,16 +28,22 @@ import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.ThreadDatabase
 import org.thoughtcrime.securesms.groups.GroupManager
 import org.thoughtcrime.securesms.loki.dialogs.GroupEditingOptionsBottomSheet
-import org.thoughtcrime.securesms.loki.utilities.toPx
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.libsignal.util.guava.Optional
+import org.whispersystems.signalservice.api.crypto.ProfileCipher
 import java.lang.ref.WeakReference
 
 class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberClickListener, LoaderManager.LoaderCallbacks<List<String>> {
     private var members = listOf<String>()
         set(value) { field = value; editClosedGroupAdapter.members = value }
+    private lateinit var groupID: String
+    private var membersToRemove = setOf<String>()
+    private var membersToAdd = setOf<String>()
+    private var admins = setOf<String>()
+    private var displayNameToBeUploaded: String? = null
+    private val originalName by lazy { DatabaseFactory.getGroupDatabase(this).getGroup(groupID).get().title }
 
     private val editClosedGroupAdapter by lazy {
         val result = EditClosedGroupAdapter(this)
@@ -48,22 +51,25 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
         result.memberClickListener = this
         result
     }
-    private var isEditingDisplayName = false
+    private var isEditingGroupName = false
         set(value) { field = value; handleIsEditingDisplayNameChanged() }
-    private val selectedMembers: Set<String>
-        get() { return editClosedGroupAdapter.selectedMembers }
 
     companion object {
         public val createNewPrivateChatResultCode = 100
+        @JvmField
+        public val GROUP_ID = "GROUP_ID"
     }
 
     // region Lifecycle
     override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
         super.onCreate(savedInstanceState, isReady)
+        groupID = intent.getStringExtra(GROUP_ID)
         setContentView(R.layout.activity_edit_closed_group)
         supportActionBar!!.title = resources.getString(R.string.activity_edit_closed_group_title)
         displayNameContainer.setOnClickListener { showEditDisplayNameUI() }
-        displayNameTextView.text = "Get Group Name" // DatabaseFactory.getLokiUserDatabase(this).getDisplayName(hexEncodedPublicKey)
+        displayNameTextView.text = originalName
+        cancelEditButton.setOnClickListener { cancelEditingDisplayName() }
+        saveEditButton.setOnClickListener { saveDisplayName() }
         recyclerView.adapter = editClosedGroupAdapter
         recyclerView.layoutManager = LinearLayoutManager(this)
         addMembersClosedGroupButton.setOnClickListener { createNewPrivateChat() }
@@ -78,7 +84,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
 
     // region Updating
     override fun onCreateLoader(id: Int, bundle: Bundle?): Loader<List<String>> {
-        return CreateClosedGroupLoader(this)
+        return EditClosedGroupLoader(groupID, this)
     }
 
     override fun onLoadFinished(loader: Loader<List<String>>, members: List<String>) {
@@ -112,12 +118,17 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
         finish()
     }
     private fun showEditDisplayNameUI() {
-        isEditingDisplayName = true
+        isEditingGroupName = true
+    }
+    private fun cancelEditingDisplayName() {
+        isEditingGroupName = false
     }
 
     override fun onMemberClick(member: String) {
         val bottomSheet = GroupEditingOptionsBottomSheet()
         bottomSheet.onRemoveTapped = {
+            membersToRemove = membersToRemove + member
+            members = members - member
             bottomSheet.dismiss()
         }
  //       bottomSheet.onAdminTapped = {
@@ -126,28 +137,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
         bottomSheet.show(supportFragmentManager, "closeBottomSheet")
     }
 
-    private fun modifyClosedGroup() {
-        val name = nameEditText.text.trim()
-        if (name.isEmpty()) {
-            return Toast.makeText(this, R.string.activity_edit_closed_group_group_name_missing_error, Toast.LENGTH_LONG).show()
-        }
-        if (name.length >= 64) {
-            return Toast.makeText(this, R.string.activity_edit_closed_group_group_name_too_long_error, Toast.LENGTH_LONG).show()
-        }
 
-        if (selectedMembers.count() < 2) {
-            return Toast.makeText(this, R.string.activity_edit_closed_group_not_enough_group_members_error, Toast.LENGTH_LONG).show()
-        }
-        if (selectedMembers.count() > 10) {
-            return Toast.makeText(this, R.string.activity_edit_closed_group_too_many_group_members_error, Toast.LENGTH_LONG).show()
-        }
-        val recipients = selectedMembers.map {
-            Recipient.from(this, Address.fromSerialized(it), false)
-        }.toSet()
-        val masterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(this) ?: TextSecurePreferences.getLocalNumber(this)
-        val admin = Recipient.from(this, Address.fromSerialized(masterHexEncodedPublicKey), false)
-        CreateClosedGroupTask(WeakReference(this), null, name.toString(), recipients, setOf( admin )).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR)
-    }
 
     private fun handleOpenConversation(threadId: Long, recipient: Recipient) {
         val intent = Intent(this, ConversationActivity::class.java)
@@ -159,23 +149,55 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
     }
 
     private fun handleIsEditingDisplayNameChanged() {
-        cancelEditButton.visibility = if (isEditingDisplayName) View.VISIBLE else View.GONE
-        saveEditButton.visibility = if (isEditingDisplayName) View.VISIBLE else View.GONE
-        displayNameTextView.visibility = if (isEditingDisplayName) View.INVISIBLE else View.VISIBLE
-        groupNameEditText.visibility = if (isEditingDisplayName) View.VISIBLE else View.INVISIBLE
+        cancelEditButton.visibility = if (isEditingGroupName) View.VISIBLE else View.GONE
+        saveEditButton.visibility = if (isEditingGroupName) View.VISIBLE else View.GONE
+        displayNameTextView.visibility = if (isEditingGroupName) View.INVISIBLE else View.VISIBLE
+        groupNameEditText.visibility = if (isEditingGroupName) View.VISIBLE else View.INVISIBLE
         val inputMethodManager = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-        if (isEditingDisplayName) {
+        if (isEditingGroupName) {
             groupNameEditText.requestFocus()
             inputMethodManager.showSoftInput(groupNameEditText, 0)
         } else {
             inputMethodManager.hideSoftInputFromWindow(groupNameEditText.windowToken, 0)
         }
     }
+
+    private fun saveDisplayName() {
+        val groupDisplayName = displayNameEditText.text.toString().trim()
+        if (groupDisplayName.isEmpty()) {
+            return Toast.makeText(this, R.string.activity_settings_display_name_missing_error, Toast.LENGTH_SHORT).show()
+        }
+        if (!groupDisplayName.matches(Regex("[a-zA-Z0-9_]+"))) {
+            return Toast.makeText(this, R.string.activity_settings_invalid_display_name_error, Toast.LENGTH_SHORT).show()
+        }
+        if (groupDisplayName.toByteArray().size > ProfileCipher.NAME_PADDED_LENGTH) {
+            return Toast.makeText(this, R.string.activity_settings_display_name_too_long_error, Toast.LENGTH_SHORT).show()
+        }
+        isEditingGroupName = false
+        displayNameToBeUploaded = groupDisplayName
+    }
+    private fun modifyClosedGroup() {
+        if (originalName == displayNameToBeUploaded && membersToRemove.isEmpty() && membersToAdd.isEmpty()) { /* do nothing, close the activity and return to conversation */ } else {
+            var groupDisplayName = originalName
+            if (originalName != displayNameToBeUploaded) {
+                groupDisplayName = displayNameToBeUploaded.toString()
+            }
+            val finalGroupMembers = members.map {
+                Recipient.from(this, Address.fromSerialized(it), false)
+            }.toSet()
+            val finalGroupAdmins = admins.map {
+                Recipient.from(this, Address.fromSerialized(it), false)
+            }.toSet()
+            GroupManager.updateGroup(this, groupID, finalGroupMembers, null, groupDisplayName, finalGroupAdmins)
+            finish()
+        }
+    }
     // endregion
 
     // region Tasks
-    internal class CreateClosedGroupTask(
+    internal class EditClosedGroupTask(
             private val activity: WeakReference<EditClosedGroupActivity>,
+            private val groupID: String,
             private val profilePicture: Bitmap?,
             private val name: String?,
             private val members: Set<Recipient>,
@@ -184,7 +206,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
 
         override fun doInBackground(vararg params: Void?): Optional<GroupManager.GroupActionResult> {
             val activity = activity.get() ?: return Optional.absent()
-            return Optional.of(GroupManager.createGroup(activity, members, profilePicture, name, false, admins))
+            return Optional.of(GroupManager.updateGroup(activity, groupID, members, profilePicture, name, admins))
         }
 
         override fun onPostExecute(result: Optional<GroupManager.GroupActionResult>) {
@@ -199,5 +221,4 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
             }
         }
     }
-    // endregion
 }
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupAdapter.kt
index cc371a9122..eb94f35c2a 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupAdapter.kt
@@ -21,7 +21,7 @@ import org.thoughtcrime.securesms.recipients.Recipient
 
 class EditClosedGroupAdapter(private val context: Context) : RecyclerView.Adapter<EditClosedGroupAdapter.ViewHolder>() {
     lateinit var glide: GlideRequests
-    val selectedMembers = mutableSetOf<String>()
+    private val selectedMembers = mutableSetOf<String>()
     var members = listOf<String>()
         set(value) {
             field = value; notifyDataSetChanged()
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
index 311bc1becd..8b8bf276c2 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
@@ -1,12 +1,22 @@
 package org.thoughtcrime.securesms.loki.activities
 
 import android.content.Context
+import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.loki.utilities.ContactUtilities
 import org.thoughtcrime.securesms.util.AsyncLoader
 
-class EditClosedGroupLoader(context: Context) : AsyncLoader<List<String>>(context) {
+class EditClosedGroupLoader(val groupID: String, context: Context) : AsyncLoader<List<String>>(context) {
 
     override fun loadInBackground(): List<String> {
+        val members = DatabaseFactory.getGroupDatabase(context).getGroupMembers(groupID, false)
+        return members.map {
+            it.address.toPhoneString()
+        }
+    }
+
+/* For loading contacts for Add members, and loading admins from group list
+
+    override fun loadContactsInBackground(): List<String> {
         val contacts = ContactUtilities.getAllContacts(context)
         // Only show the master devices of the users we are friends with
         return contacts.filter { contact ->
@@ -15,4 +25,15 @@ class EditClosedGroupLoader(context: Context) : AsyncLoader<List<String>>(contex
             it.recipient.address.toPhoneString()
         }
     }
+    override fun loadAdminsInBackground(): List<String> {
+        val contacts = ContactUtilities.getAllContacts(context)
+        // Only show the master devices of the users we are friends with
+        return contacts.filter { contact ->
+            !contact.recipient.isGroupRecipient && contact.isFriend && !contact.isOurDevice && !contact.isSlave
+        }.map {
+            it.recipient.address.toPhoneString()
+        }
+    }
+
+ */
 }
\ No newline at end of file

From 91af472d3b2cec3072670cd9540488cb768553c9 Mon Sep 17 00:00:00 2001
From: Haafingar <simon@loki.network>
Date: Fri, 12 Jun 2020 14:37:21 +1000
Subject: [PATCH 05/30] Add 'add members' functionality and cleanup, refactor

---
 AndroidManifest.xml                           |   3 +
 res/layout/activity_select_contacts.xml       |  46 ++++++++
 res/menu/group_create.xml                     |  10 --
 ...u_edit_closed_group.xml => menu_apply.xml} |   5 +-
 ..._create_closed_group.xml => menu_done.xml} |   5 +-
 res/values/strings.xml                        |   7 +-
 .../securesms/GroupCreateActivity.java        |   8 +-
 .../activities/CreateClosedGroupActivity.kt   |   8 +-
 .../activities/EditClosedGroupActivity.kt     |  88 +++++----------
 .../loki/activities/EditClosedGroupLoader.kt  |  24 +----
 .../loki/activities/SelectContactsActivity.kt | 101 ++++++++++++++++++
 ...oupAdapter.kt => SelectContactsAdapter.kt} |   2 +-
 ...GroupLoader.kt => SelectContactsLoader.kt} |   2 +-
 13 files changed, 202 insertions(+), 107 deletions(-)
 create mode 100644 res/layout/activity_select_contacts.xml
 delete mode 100644 res/menu/group_create.xml
 rename res/menu/{menu_edit_closed_group.xml => menu_apply.xml} (62%)
 rename res/menu/{menu_create_closed_group.xml => menu_done.xml} (63%)
 create mode 100644 src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
 rename src/org/thoughtcrime/securesms/loki/activities/{CreateClosedGroupAdapter.kt => SelectContactsAdapter.kt} (92%)
 rename src/org/thoughtcrime/securesms/loki/activities/{CreateClosedGroupLoader.kt => SelectContactsLoader.kt} (87%)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4ccde5b2d4..98df604a46 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -142,6 +142,9 @@
         <activity
             android:name="org.thoughtcrime.securesms.loki.activities.SeedActivity"
             android:screenOrientation="portrait" />
+        <activity
+            android:name="org.thoughtcrime.securesms.loki.activities.SelectContactsActivity"
+            android:screenOrientation="portrait" />
         <activity
             android:name="org.thoughtcrime.securesms.loki.activities.PrivacySettingsActivity"
             android:screenOrientation="portrait" />
diff --git a/res/layout/activity_select_contacts.xml b/res/layout/activity_select_contacts.xml
new file mode 100644
index 0000000000..e2604c048c
--- /dev/null
+++ b/res/layout/activity_select_contacts.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/default_session_background" >
+
+    <LinearLayout
+        android:id="@+id/mainContentContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/emptyStateContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="vertical"
+        android:layout_centerInParent="true">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@dimen/medium_font_size"
+            android:textColor="@color/text"
+            android:text="@string/activity_create_closed_group_empty_state_message" />
+
+        <Button
+            style="@style/MediumProminentOutlineButton"
+            android:id="@+id/createNewPrivateChatButton"
+            android:layout_width="196dp"
+            android:layout_height="@dimen/medium_button_height"
+            android:layout_marginTop="@dimen/medium_spacing"
+            android:text="@string/activity_create_closed_group_empty_state_button_title" />
+
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/menu/group_create.xml b/res/menu/group_create.xml
deleted file mode 100644
index 7c1044c62d..0000000000
--- a/res/menu/group_create.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item android:title="@string/GroupCreateActivity_menu_apply_button"
-          android:id="@+id/menu_create_group"
-          android:icon="?menu_accept_icon"
-          app:showAsAction="always|withText"/>
-
-</menu>
\ No newline at end of file
diff --git a/res/menu/menu_edit_closed_group.xml b/res/menu/menu_apply.xml
similarity index 62%
rename from res/menu/menu_edit_closed_group.xml
rename to res/menu/menu_apply.xml
index 1e8237e3af..9bddeb7fd1 100644
--- a/res/menu/menu_edit_closed_group.xml
+++ b/res/menu/menu_apply.xml
@@ -3,8 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:title="@string/activity_edit_closed_group_apply_changes"
-        android:id="@+id/editClosedGroupButton"
+        android:title="@string/menu_apply_button"
+        android:id="@+id/applyButton"
+        android:icon="?menu_accept_icon"
         app:showAsAction="always" />
 
 </menu>
diff --git a/res/menu/menu_create_closed_group.xml b/res/menu/menu_done.xml
similarity index 63%
rename from res/menu/menu_create_closed_group.xml
rename to res/menu/menu_done.xml
index 75b41dcd68..9ee181de1e 100644
--- a/res/menu/menu_create_closed_group.xml
+++ b/res/menu/menu_done.xml
@@ -3,8 +3,9 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:title="Done"
-        android:id="@+id/createClosedGroupButton"
+        android:title="@string/menu_done_button"
+        android:id="@+id/doneButton"
+        android:icon="?menu_accept_icon"
         app:showAsAction="always" />
 
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index bc2001a3d6..e698ce54ee 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1781,11 +1781,13 @@
     <string name="activity_edit_closed_group_invalid_session_id_error">One of the members of your group has an invalid Session ID</string>
     <string name="activity_edit_closed_group_confirm_removal">Are you sure you want to remove this user?</string>
     <string name="activity_edit_closed_group_member_removed">User removed from group</string>
-    <string name="activity_edit_closed_group_apply_changes">Apply</string>
+
 
     <string name="fragment_edit_group_bottom_sheet_remove">Remove user from group</string>
     <string name="fragment_edit_group_bottom_sheet_admin">Make this user a group admin</string>
 
+    <string name="activity_select_contacts_title">Select Contacts</string>
+
     <string name="activity_join_public_chat_title">Join Open Group</string>
     <string name="activity_join_public_chat_error">Couldn\'t join group</string>
     <string name="activity_join_public_chat_enter_group_url_tab_title">Open Group URL</string>
@@ -1878,4 +1880,7 @@
     <string name="fragment_contact_selection_closed_groups_title">Closed Groups</string>
     <string name="fragment_contact_selection_open_groups_title">Open Groups</string>
 
+    <string name="menu_apply_button">Apply</string>
+    <string name="menu_done_button">Done</string>
+
 </resources>
diff --git a/src/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
index ede18c5061..17bba3300c 100644
--- a/src/org/thoughtcrime/securesms/GroupCreateActivity.java
+++ b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
@@ -209,7 +209,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
     MenuInflater inflater = this.getMenuInflater();
     menu.clear();
 
-    inflater.inflate(R.menu.group_create, menu);
+    inflater.inflate(R.menu.menu_apply, menu);
     super.onPrepareOptionsMenu(menu);
     return true;
   }
@@ -221,7 +221,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
       case android.R.id.home:
         finish();
         return true;
-      case R.id.menu_create_group:
+      case R.id.applyButton:
         if (groupToUpdate.isPresent()) handleGroupUpdate();
         else                           handleGroupCreate();
         return true;
@@ -389,7 +389,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
     protected void onPreExecute() {
       activity.findViewById(R.id.group_details_layout).setVisibility(View.GONE);
       activity.findViewById(R.id.creating_group_layout).setVisibility(View.VISIBLE);
-      activity.findViewById(R.id.menu_create_group).setVisibility(View.GONE);
+      activity.findViewById(R.id.applyButton).setVisibility(View.GONE);
         final int titleResId = activity.groupToUpdate.isPresent()
                              ? R.string.GroupCreateActivity_updating_group
                              : R.string.GroupCreateActivity_creating_group;
@@ -401,7 +401,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
       if (activity.isFinishing()) return;
       activity.findViewById(R.id.group_details_layout).setVisibility(View.VISIBLE);
       activity.findViewById(R.id.creating_group_layout).setVisibility(View.GONE);
-      activity.findViewById(R.id.menu_create_group).setVisibility(View.VISIBLE);
+      activity.findViewById(R.id.applyButton).setVisibility(View.VISIBLE);
     }
   }
 
diff --git a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
index f0989dc29b..23a959047e 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
@@ -30,7 +30,7 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberC
         set(value) { field = value; createClosedGroupAdapter.members = value }
 
     private val createClosedGroupAdapter by lazy {
-        val result = CreateClosedGroupAdapter(this)
+        val result = SelectContactsAdapter(this)
         result.glide = GlideApp.with(this)
         result.memberClickListener = this
         result
@@ -55,14 +55,14 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberC
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        menuInflater.inflate(R.menu.menu_create_closed_group, menu)
+        menuInflater.inflate(R.menu.menu_done, menu)
         return members.isNotEmpty()
     }
     // endregion
 
     // region Updating
     override fun onCreateLoader(id: Int, bundle: Bundle?): Loader<List<String>> {
-        return CreateClosedGroupLoader(this)
+        return SelectContactsLoader(this)
     }
 
     override fun onLoadFinished(loader: Loader<List<String>>, members: List<String>) {
@@ -85,7 +85,7 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberC
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         val id = item.itemId
         when(id) {
-            R.id.createClosedGroupButton -> createClosedGroup()
+            R.id.doneButton -> createClosedGroup()
             else -> { /* Do nothing */ }
         }
         return super.onOptionsItemSelected(item)
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
index 2e6574cef9..d10b8d00cb 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
@@ -2,8 +2,6 @@ package org.thoughtcrime.securesms.loki.activities
 
 import android.content.Context
 import android.content.Intent
-import android.graphics.Bitmap
-import android.os.AsyncTask
 import android.os.Bundle
 import android.support.v4.app.LoaderManager
 import android.support.v4.content.Loader
@@ -22,18 +20,13 @@ import kotlinx.android.synthetic.main.activity_linked_devices.recyclerView
 import kotlinx.android.synthetic.main.activity_settings.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
-import org.thoughtcrime.securesms.conversation.ConversationActivity
 import org.thoughtcrime.securesms.database.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
-import org.thoughtcrime.securesms.database.ThreadDatabase
 import org.thoughtcrime.securesms.groups.GroupManager
 import org.thoughtcrime.securesms.loki.dialogs.GroupEditingOptionsBottomSheet
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.recipients.Recipient
-import org.thoughtcrime.securesms.util.TextSecurePreferences
-import org.whispersystems.libsignal.util.guava.Optional
 import org.whispersystems.signalservice.api.crypto.ProfileCipher
-import java.lang.ref.WeakReference
 
 class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberClickListener, LoaderManager.LoaderCallbacks<List<String>> {
     private var members = listOf<String>()
@@ -42,8 +35,10 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
     private var membersToRemove = setOf<String>()
     private var membersToAdd = setOf<String>()
     private var admins = setOf<String>()
-    private var displayNameToBeUploaded: String? = null
     private val originalName by lazy { DatabaseFactory.getGroupDatabase(this).getGroup(groupID).get().title }
+    private var nameHasChanged = false
+    private lateinit var newGroupDisplayName: String
+
 
     private val editClosedGroupAdapter by lazy {
         val result = EditClosedGroupAdapter(this)
@@ -55,7 +50,6 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
         set(value) { field = value; handleIsEditingDisplayNameChanged() }
 
     companion object {
-        public val createNewPrivateChatResultCode = 100
         @JvmField
         public val GROUP_ID = "GROUP_ID"
     }
@@ -72,12 +66,12 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
         saveEditButton.setOnClickListener { saveDisplayName() }
         recyclerView.adapter = editClosedGroupAdapter
         recyclerView.layoutManager = LinearLayoutManager(this)
-        addMembersClosedGroupButton.setOnClickListener { createNewPrivateChat() }
+        addMembersClosedGroupButton.setOnClickListener { onAddMember() }
         LoaderManager.getInstance(this).initLoader(0, null, this)
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
-        menuInflater.inflate(R.menu.menu_edit_closed_group, menu)
+        menuInflater.inflate(R.menu.menu_apply, menu)
         return members.isNotEmpty()
     }
     // endregion
@@ -107,16 +101,11 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         val id = item.itemId
         when(id) {
-            R.id.editClosedGroupButton -> modifyClosedGroup()
-            else -> { /* Do nothing */ }
+            R.id.applyButton -> modifyClosedGroup()
         }
         return super.onOptionsItemSelected(item)
     }
 
-    private fun createNewPrivateChat() {
-        setResult(createNewPrivateChatResultCode)
-        finish()
-    }
     private fun showEditDisplayNameUI() {
         isEditingGroupName = true
     }
@@ -137,15 +126,21 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
         bottomSheet.show(supportFragmentManager, "closeBottomSheet")
     }
 
+    private fun onAddMember() {
+        val intent = Intent(this@EditClosedGroupActivity, SelectContactsActivity::class.java)
+        startActivityForResult(intent, 124)
+    }
 
-
-    private fun handleOpenConversation(threadId: Long, recipient: Recipient) {
-        val intent = Intent(this, ConversationActivity::class.java)
-        intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, threadId)
-        intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT)
-        intent.putExtra(ConversationActivity.ADDRESS_EXTRA, recipient.address)
-        startActivity(intent)
-        finish()
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (resultCode == RESULT_OK) {
+            if (data != null && data.hasExtra("Selected Contacts Result")) {
+                val returnedContacts = data.extras.getStringArray("Selected Contacts Result")
+                var selectedContacts = returnedContacts.toSet()
+                membersToAdd = selectedContacts + membersToAdd
+                members = members + membersToAdd
+            }
+        }
     }
 
     private fun handleIsEditingDisplayNameChanged() {
@@ -163,7 +158,8 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
     }
 
     private fun saveDisplayName() {
-        val groupDisplayName = displayNameEditText.text.toString().trim()
+        var groupDisplayName = displayNameEditText.text.toString().trim()
+        // something about the implementation of displayNameEdit text makes it null insead of whatever the user inputs, causes a crash
         if (groupDisplayName.isEmpty()) {
             return Toast.makeText(this, R.string.activity_settings_display_name_missing_error, Toast.LENGTH_SHORT).show()
         }
@@ -174,13 +170,16 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
             return Toast.makeText(this, R.string.activity_settings_display_name_too_long_error, Toast.LENGTH_SHORT).show()
         }
         isEditingGroupName = false
-        displayNameToBeUploaded = groupDisplayName
+        nameHasChanged = true
+        newGroupDisplayName = groupDisplayName
+
     }
+
     private fun modifyClosedGroup() {
-        if (originalName == displayNameToBeUploaded && membersToRemove.isEmpty() && membersToAdd.isEmpty()) { /* do nothing, close the activity and return to conversation */ } else {
+        if (!nameHasChanged && membersToRemove.isEmpty() && membersToAdd.isEmpty()) { finish() } else {
             var groupDisplayName = originalName
-            if (originalName != displayNameToBeUploaded) {
-                groupDisplayName = displayNameToBeUploaded.toString()
+            if (nameHasChanged) {
+                groupDisplayName = newGroupDisplayName
             }
             val finalGroupMembers = members.map {
                 Recipient.from(this, Address.fromSerialized(it), false)
@@ -192,33 +191,4 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
             finish()
         }
     }
-    // endregion
-
-    // region Tasks
-    internal class EditClosedGroupTask(
-            private val activity: WeakReference<EditClosedGroupActivity>,
-            private val groupID: String,
-            private val profilePicture: Bitmap?,
-            private val name: String?,
-            private val members: Set<Recipient>,
-            private val admins: Set<Recipient>
-    ) : AsyncTask<Void, Void, Optional<GroupManager.GroupActionResult>>() {
-
-        override fun doInBackground(vararg params: Void?): Optional<GroupManager.GroupActionResult> {
-            val activity = activity.get() ?: return Optional.absent()
-            return Optional.of(GroupManager.updateGroup(activity, groupID, members, profilePicture, name, admins))
-        }
-
-        override fun onPostExecute(result: Optional<GroupManager.GroupActionResult>) {
-            val activity = activity.get() ?: return super.onPostExecute(result)
-            if (result.isPresent && result.get().threadId > -1) {
-                if (!activity.isFinishing) {
-                    activity.handleOpenConversation(result.get().threadId, result.get().groupRecipient)
-                }
-            } else {
-                super.onPostExecute(result)
-                Toast.makeText(activity.applicationContext, R.string.activity_create_closed_group_invalid_session_id_error, Toast.LENGTH_LONG).show()
-            }
-        }
-    }
 }
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
index 8b8bf276c2..59ef979994 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
@@ -12,28 +12,6 @@ class EditClosedGroupLoader(val groupID: String, context: Context) : AsyncLoader
         return members.map {
             it.address.toPhoneString()
         }
+        /* To do: Load admins in the process here */
     }
-
-/* For loading contacts for Add members, and loading admins from group list
-
-    override fun loadContactsInBackground(): List<String> {
-        val contacts = ContactUtilities.getAllContacts(context)
-        // Only show the master devices of the users we are friends with
-        return contacts.filter { contact ->
-            !contact.recipient.isGroupRecipient && contact.isFriend && !contact.isOurDevice && !contact.isSlave
-        }.map {
-            it.recipient.address.toPhoneString()
-        }
-    }
-    override fun loadAdminsInBackground(): List<String> {
-        val contacts = ContactUtilities.getAllContacts(context)
-        // Only show the master devices of the users we are friends with
-        return contacts.filter { contact ->
-            !contact.recipient.isGroupRecipient && contact.isFriend && !contact.isOurDevice && !contact.isSlave
-        }.map {
-            it.recipient.address.toPhoneString()
-        }
-    }
-
- */
 }
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
new file mode 100644
index 0000000000..9d73deb831
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
@@ -0,0 +1,101 @@
+package org.thoughtcrime.securesms.loki.activities
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Bundle
+import android.support.v4.app.LoaderManager
+import android.support.v4.content.Loader
+import android.support.v7.widget.LinearLayoutManager
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import kotlinx.android.synthetic.main.activity_create_closed_group.*
+import kotlinx.android.synthetic.main.activity_linked_devices.recyclerView
+import network.loki.messenger.R
+import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
+import org.thoughtcrime.securesms.mms.GlideApp
+
+class SelectContactsActivity : PassphraseRequiredActionBarActivity(), MemberClickListener, LoaderManager.LoaderCallbacks<List<String>> {
+    private var members = listOf<String>()
+        set(value) { field = value; selectContactsAdapter.members = value }
+
+    private val selectContactsAdapter by lazy {
+        val result = SelectContactsAdapter(this)
+        result.glide = GlideApp.with(this)
+        result.memberClickListener = this
+        result
+    }
+
+    private val selectedMembers: Set<String>
+        get() { return selectContactsAdapter.selectedMembers }
+
+    companion object {
+        public val createNewPrivateChatResultCode = 100
+    }
+
+    // region Lifecycle
+    override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
+        super.onCreate(savedInstanceState, isReady)
+        setContentView(R.layout.activity_select_contacts)
+        supportActionBar!!.title = resources.getString(R.string.activity_select_contacts_title)
+        recyclerView.adapter = selectContactsAdapter
+        recyclerView.layoutManager = LinearLayoutManager(this)
+        createNewPrivateChatButton.setOnClickListener { createNewPrivateChat() }
+        LoaderManager.getInstance(this).initLoader(0, null, this)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.menu_done, menu)
+        return members.isNotEmpty()
+    }
+    // endregion
+
+    // region Updating
+    override fun onCreateLoader(id: Int, bundle: Bundle?): Loader<List<String>> {
+        return SelectContactsLoader(this)
+    }
+
+    override fun onLoadFinished(loader: Loader<List<String>>, members: List<String>) {
+        update(members)
+    }
+
+    override fun onLoaderReset(loader: Loader<List<String>>) {
+        update(listOf())
+    }
+
+    private fun update(members: List<String>) {
+        this.members = members
+        mainContentContainer.visibility = if (members.isEmpty()) View.GONE else View.VISIBLE
+        emptyStateContainer.visibility = if (members.isEmpty()) View.VISIBLE else View.GONE
+        invalidateOptionsMenu()
+    }
+    // endregion
+
+    // region Interaction
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        val id = item.itemId
+        when(id) {
+            R.id.doneButton -> returnContacts()
+            else -> { /* Do nothing */ }
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun createNewPrivateChat() {
+        setResult(createNewPrivateChatResultCode)
+        finish()
+    }
+
+    override fun onMemberClick(member: String) {
+        selectContactsAdapter.onMemberClick(member)
+    }
+
+    private fun returnContacts() {
+        val selectedMembers = this.selectedMembers
+        val selectedContacts = selectedMembers.toTypedArray()
+        val data = Intent()
+        data.putExtra("Selected Contacts Result", selectedContacts)
+        setResult(Activity.RESULT_OK, data)
+        finish()
+    }
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
similarity index 92%
rename from src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupAdapter.kt
rename to src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
index fa69ef8afa..886735b3a3 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
@@ -8,7 +8,7 @@ import org.thoughtcrime.securesms.loki.views.UserView
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.recipients.Recipient
 
-class CreateClosedGroupAdapter(private val context: Context) : RecyclerView.Adapter<CreateClosedGroupAdapter.ViewHolder>() {
+class SelectContactsAdapter(private val context: Context) : RecyclerView.Adapter<SelectContactsAdapter.ViewHolder>() {
     lateinit var glide: GlideRequests
     val selectedMembers = mutableSetOf<String>()
     var members = listOf<String>()
diff --git a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupLoader.kt b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsLoader.kt
similarity index 87%
rename from src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupLoader.kt
rename to src/org/thoughtcrime/securesms/loki/activities/SelectContactsLoader.kt
index 59422993e1..59a7ef6ad1 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupLoader.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsLoader.kt
@@ -4,7 +4,7 @@ import android.content.Context
 import org.thoughtcrime.securesms.loki.utilities.ContactUtilities
 import org.thoughtcrime.securesms.util.AsyncLoader
 
-class CreateClosedGroupLoader(context: Context) : AsyncLoader<List<String>>(context) {
+class SelectContactsLoader(context: Context) : AsyncLoader<List<String>>(context) {
 
     override fun loadInBackground(): List<String> {
         val contacts = ContactUtilities.getAllContacts(context)

From 6d615fbb9d6036274a2296c55ebf94fa661270b9 Mon Sep 17 00:00:00 2001
From: Haafingar <simon@loki.network>
Date: Mon, 22 Jun 2020 13:51:47 +1000
Subject: [PATCH 06/30] fix name editing

---
 .../activities/EditClosedGroupActivity.kt     | 20 ++++++++++---------
 .../loki/activities/EditClosedGroupLoader.kt  |  4 ++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
index d10b8d00cb..5ab1d17964 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
@@ -32,9 +32,9 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
     private var members = listOf<String>()
         set(value) { field = value; editClosedGroupAdapter.members = value }
     private lateinit var groupID: String
-    private var membersToRemove = setOf<String>()
-    private var membersToAdd = setOf<String>()
-    private var admins = setOf<String>()
+    private var membersToRemove = listOf<String>()
+    private var membersToAdd = listOf<String>()
+    private var admins = listOf<String>()
     private val originalName by lazy { DatabaseFactory.getGroupDatabase(this).getGroup(groupID).get().title }
     private var nameHasChanged = false
     private lateinit var newGroupDisplayName: String
@@ -136,9 +136,11 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
         if (resultCode == RESULT_OK) {
             if (data != null && data.hasExtra("Selected Contacts Result")) {
                 val returnedContacts = data.extras.getStringArray("Selected Contacts Result")
-                var selectedContacts = returnedContacts.toSet()
+                val selectedContacts = returnedContacts.toList()
                 membersToAdd = selectedContacts + membersToAdd
                 members = members + membersToAdd
+                Toast.makeText(this.applicationContext, membersToAdd.toString(), Toast.LENGTH_LONG).show()
+                //TODO:this works for users that were already in the group but were removed in the same edit activity, but not users that were never in the chat. WHy?
             }
         }
     }
@@ -158,8 +160,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
     }
 
     private fun saveDisplayName() {
-        var groupDisplayName = displayNameEditText.text.toString().trim()
-        // something about the implementation of displayNameEdit text makes it null insead of whatever the user inputs, causes a crash
+        var groupDisplayName = groupNameEditText.text.toString().trim()
         if (groupDisplayName.isEmpty()) {
             return Toast.makeText(this, R.string.activity_settings_display_name_missing_error, Toast.LENGTH_SHORT).show()
         }
@@ -169,10 +170,11 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
         if (groupDisplayName.toByteArray().size > ProfileCipher.NAME_PADDED_LENGTH) {
             return Toast.makeText(this, R.string.activity_settings_display_name_too_long_error, Toast.LENGTH_SHORT).show()
         }
-        isEditingGroupName = false
-        nameHasChanged = true
         newGroupDisplayName = groupDisplayName
-
+        displayNameTextView.text = groupDisplayName
+        nameHasChanged = true
+        isEditingGroupName = false
+        return Toast.makeText(this, "Name Changed", Toast.LENGTH_SHORT).show()
     }
 
     private fun modifyClosedGroup() {
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
index 59ef979994..467423ac90 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
@@ -8,10 +8,10 @@ import org.thoughtcrime.securesms.util.AsyncLoader
 class EditClosedGroupLoader(val groupID: String, context: Context) : AsyncLoader<List<String>>(context) {
 
     override fun loadInBackground(): List<String> {
-        val members = DatabaseFactory.getGroupDatabase(context).getGroupMembers(groupID, false)
+        val members = DatabaseFactory.getGroupDatabase(context).getGroupMembers(groupID, true)
         return members.map {
             it.address.toPhoneString()
         }
-        /* To do: Load admins in the process here */
+        /* TODO:Load admins in the process here */
     }
 }
\ No newline at end of file

From 40bfae9042babcdf5af20a4fc0cf2e3977c17dfd Mon Sep 17 00:00:00 2001
From: Haafingar <simon@loki.network>
Date: Mon, 22 Jun 2020 15:49:18 +1000
Subject: [PATCH 07/30] fix group member edit icons, improve design

---
 res/drawable/ic_more_horiz_white.xml          |  5 +++
 res/layout/activity_edit_closed_group.xml     | 36 ++++++++++---------
 .../loki/activities/EditClosedGroupAdapter.kt |  2 +-
 .../loki/activities/SelectContactsAdapter.kt  |  2 +-
 .../fragments/ContactSelectionListAdapter.kt  |  2 +-
 .../securesms/loki/views/UserView.kt          |  9 ++---
 6 files changed, 32 insertions(+), 24 deletions(-)
 create mode 100644 res/drawable/ic_more_horiz_white.xml

diff --git a/res/drawable/ic_more_horiz_white.xml b/res/drawable/ic_more_horiz_white.xml
new file mode 100644
index 0000000000..8bb3fc306f
--- /dev/null
+++ b/res/drawable/ic_more_horiz_white.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/res/layout/activity_edit_closed_group.xml b/res/layout/activity_edit_closed_group.xml
index 49a8463ba7..06dc73c339 100644
--- a/res/layout/activity_edit_closed_group.xml
+++ b/res/layout/activity_edit_closed_group.xml
@@ -18,6 +18,15 @@
             android:layout_marginTop="@dimen/small_spacing"
             android:layout_marginRight="@dimen/large_spacing">
 
+            <ImageView
+                android:id="@+id/cancelEditButton"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:layout_toLeftOf="@+id/groupNameEditText"
+                android:layout_centerVertical="true"
+                android:src="@drawable/ic_close_white_24dp"
+                android:visibility="gone" />
+
             <EditText
                 style="@style/SessionEditText"
                 android:id="@+id/groupNameEditText"
@@ -27,10 +36,10 @@
                 android:textAlignment="center"
                 android:paddingTop="12dp"
                 android:paddingBottom="@dimen/large_spacing"
+                android:paddingHorizontal="@dimen/large_spacing"
                 android:visibility="invisible"
                 android:hint="@string/activity_edit_closed_group_edit_text_hint" />
 
-
             <TextView
                 android:id="@+id/displayNameTextView"
                 android:layout_width="wrap_content"
@@ -42,6 +51,15 @@
                 android:drawableRight="@drawable/ic_edit_white_24dp"
                 android:drawablePadding="@dimen/small_spacing"/>
 
+            <ImageView
+                android:id="@+id/saveEditButton"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:src="@drawable/ic_check_white_24dp"
+                android:layout_toRightOf="@+id/groupNameEditText"
+                android:layout_centerVertical="true"
+                android:visibility="gone" />
+
         </RelativeLayout>
 
         <LinearLayout
@@ -52,22 +70,6 @@
                 android:layout_height="0px"
                 android:layout_width="@dimen/large_spacing"/>
 
-            <ImageView
-                android:id="@+id/cancelEditButton"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_weight="1"
-                android:src="@drawable/ic_close_white_24dp"
-                android:visibility="gone" />
-
-            <ImageView
-                android:id="@+id/saveEditButton"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:src="@drawable/ic_check_white_24dp"
-                android:layout_weight="1"
-                android:visibility="gone" />
-
             <View
                 android:layout_weight="2"
                 android:layout_height="0px"
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupAdapter.kt
index eb94f35c2a..b41e21a520 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupAdapter.kt
@@ -43,6 +43,6 @@ class EditClosedGroupAdapter(private val context: Context) : RecyclerView.Adapte
         val member = members[position]
         viewHolder.view.setOnClickListener { memberClickListener?.onMemberClick(member) }
         val isSelected = selectedMembers.contains(member)
-        viewHolder.view.bind(Recipient.from(context, Address.fromSerialized(member), false), isSelected, glide)
+        viewHolder.view.bind(Recipient.from(context, Address.fromSerialized(member), false), isSelected, glide, true)
     }
 }
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
index 886735b3a3..e5210099f7 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
@@ -30,7 +30,7 @@ class SelectContactsAdapter(private val context: Context) : RecyclerView.Adapter
         val member = members[position]
         viewHolder.view.setOnClickListener { memberClickListener?.onMemberClick(member) }
         val isSelected = selectedMembers.contains(member)
-        viewHolder.view.bind(Recipient.from(context, Address.fromSerialized(member), false), isSelected, glide)
+        viewHolder.view.bind(Recipient.from(context, Address.fromSerialized(member), false), isSelected, glide, false)
     }
 
     fun onMemberClick(member: String) {
diff --git a/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt b/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt
index d817c5b2e2..5c7b85fa25 100644
--- a/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt
@@ -52,7 +52,7 @@ class ContactSelectionListAdapter(private val context: Context, private val mult
             item as ContactSelectionListItem.Contact
             viewHolder.view.setOnClickListener { contactClickListener?.onContactClick(item.recipient) }
             val isSelected = selectedContacts.contains(item.recipient)
-            viewHolder.view.bind(item.recipient, isSelected, glide)
+            viewHolder.view.bind(item.recipient, isSelected, glide, false)
             viewHolder.view.setCheckBoxVisible(multiSelect)
         } else if (viewHolder is DividerViewHolder) {
             item as ContactSelectionListItem.Header
diff --git a/src/org/thoughtcrime/securesms/loki/views/UserView.kt b/src/org/thoughtcrime/securesms/loki/views/UserView.kt
index 0ffb2c358f..4bd6ae503a 100644
--- a/src/org/thoughtcrime/securesms/loki/views/UserView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/UserView.kt
@@ -44,7 +44,7 @@ class UserView : LinearLayout {
         tickImageView.visibility = if (visible) View.VISIBLE else View.GONE
     }
 
-    fun bind(user: Recipient, isSelected: Boolean, glide: GlideRequests) {
+    fun bind(user: Recipient, isSelected: Boolean, glide: GlideRequests, isEditingGroup: Boolean) {
         val address = user.address.serialize()
         if (user.isGroupRecipient) {
             if ("Session Public Chat" == user.name || user.address.isRSSFeed) {
@@ -59,18 +59,19 @@ class UserView : LinearLayout {
                 profilePictureView.hexEncodedPublicKey = randomUsers.getOrNull(0) ?: ""
                 profilePictureView.additionalHexEncodedPublicKey = randomUsers.getOrNull(1) ?: ""
                 profilePictureView.isRSSFeed = false
+
             }
         } else {
             profilePictureView.hexEncodedPublicKey = address
             profilePictureView.additionalHexEncodedPublicKey = null
             profilePictureView.isRSSFeed = false
         }
+        tickImageView.setImageResource(R.drawable.ic_edit_white_24dp)
         profilePictureView.glide = glide
         profilePictureView.update()
         nameTextView.text = user.name ?: "Unknown Contact"
-        if (user.isGroupRecipient) {
-            // this doesnt work, find out how to work out if the user is a part of the group)
-            tickImageView.setImageResource(R.drawable.ic_edit_white_24dp)
+        if (isEditingGroup) {
+            tickImageView.setImageResource(R.drawable.ic_more_horiz_white)
         } else {
             tickImageView.setImageResource(if (isSelected) R.drawable.ic_circle_check else R.drawable.ic_circle)
         }

From 79a66d9bd3b824ef4b3cf4e5da3490b36f58353b Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <ryanzhaors@qq.com>
Date: Thu, 6 Aug 2020 14:42:24 +1000
Subject: [PATCH 08/30] fix mention in notifications

---
 .../notifications/DefaultMessageNotifier.java          | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
index 660e1a4ecd..56ec8a5fe1 100644
--- a/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
+++ b/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
@@ -51,6 +51,7 @@ import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol;
+import org.thoughtcrime.securesms.loki.utilities.MentionUtilities;
 import org.thoughtcrime.securesms.mms.SlideDeck;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.service.IncomingMessageObserver;
@@ -60,6 +61,7 @@ import org.thoughtcrime.securesms.util.SpanUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.webrtc.CallNotificationBuilder;
 import org.whispersystems.signalservice.internal.util.Util;
+import org.whispersystems.signalservice.loki.protocol.mentions.Mention;
 
 import java.util.HashSet;
 import java.util.List;
@@ -311,7 +313,8 @@ public class DefaultMessageNotifier implements MessageNotifier {
     builder.setThread(notifications.get(0).getRecipient());
     builder.setMessageCount(notificationState.getMessageCount());
     builder.setPrimaryMessageBody(recipient, notifications.get(0).getIndividualRecipient(),
-                                  notifications.get(0).getText(), notifications.get(0).getSlideDeck());
+                                  MentionUtilities.highlightMentions(notifications.get(0).getText(), notifications.get(0).getThreadId(), context),
+                                  notifications.get(0).getSlideDeck());
     builder.setContentIntent(notifications.get(0).getPendingIntent(context));
     builder.setDeleteIntent(notificationState.getDeleteIntent(context));
     builder.setOnlyAlertOnce(!signal);
@@ -390,13 +393,14 @@ public class DefaultMessageNotifier implements MessageNotifier {
 
     while(iterator.hasPrevious()) {
       NotificationItem item = iterator.previous();
-      builder.addMessageBody(item.getIndividualRecipient(), item.getRecipient(), item.getText());
+      builder.addMessageBody(item.getIndividualRecipient(), item.getRecipient(),
+                             MentionUtilities.highlightMentions(item.getText(), item.getThreadId(), context));
     }
 
     if (signal) {
       builder.setAlarms(notificationState.getRingtone(context), notificationState.getVibrate());
       builder.setTicker(notifications.get(0).getIndividualRecipient(),
-                        notifications.get(0).getText());
+                        MentionUtilities.highlightMentions(notifications.get(0).getText(), notifications.get(0).getThreadId(), context));
     }
 
     Notification notification = builder.build();

From 3f69aabf85805814b2b56fd1c7163e95e897b0e0 Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <ryanzhaors@qq.com>
Date: Fri, 7 Aug 2020 10:45:43 +1000
Subject: [PATCH 09/30] fix ui issue that tick circles not shown for long names
 when creating a closed group

---
 res/layout/view_user.xml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/res/layout/view_user.xml b/res/layout/view_user.xml
index 8df24dc6a5..2627f076cb 100644
--- a/res/layout/view_user.xml
+++ b/res/layout/view_user.xml
@@ -21,20 +21,17 @@
 
         <TextView
             android:id="@+id/nameTextView"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/medium_spacing"
             android:maxLines="1"
+            android:gravity="left"
             android:ellipsize="end"
             android:textSize="@dimen/medium_font_size"
             android:textStyle="bold"
             android:textColor="@color/text"
-            android:text="Spiderman" />
-
-        <View
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1" />
+            android:text="Spiderman"
+            android:layout_weight="1"/>
 
         <ImageView
             android:id="@+id/tickImageView"

From df15743c04ac935d3defc4f8bcbdc23bc8c50c6d Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <ryanzhaors@qq.com>
Date: Fri, 7 Aug 2020 15:13:08 +1000
Subject: [PATCH 10/30] fix text got cut off when sending an image with a text
 message

---
 .../thoughtcrime/securesms/conversation/ConversationItem.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
index fb56fbca52..74dc63dd15 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -290,6 +290,10 @@ public class ConversationItem extends LinearLayout
       }
     }
 
+    if (hasThumbnail(messageRecord) && messageRecord.getDisplayBody(context).length() > 0) {
+      ViewUtil.updateLayoutParams(bodyText, getAvailableMessageBubbleWidth(bodyText), ViewGroup.LayoutParams.WRAP_CONTENT);
+    }
+
     ConversationItemFooter activeFooter   = getActiveFooter(messageRecord);
     int                    availableWidth = getAvailableMessageBubbleWidth(footer);
 

From 6664c2baa7bbdcd298caa7f93d5455f817d419ff Mon Sep 17 00:00:00 2001
From: Anton Chekulaev <metaphore@bk.ru>
Date: Fri, 14 Aug 2020 14:52:15 +1000
Subject: [PATCH 11/30] Edit closed group activitiy cleanup.

---
 res/layout/activity_edit_closed_group.xml     |  14 +-
 res/layout/activity_settings.xml              |   4 +-
 res/layout/view_conversation.xml              |   2 +-
 res/layout/view_mention_candidate.xml         |   2 +-
 .../conversation/ConversationActivity.java    |   3 +-
 .../activities/CreateClosedGroupActivity.kt   |   5 +-
 .../activities/EditClosedGroupActivity.kt     | 181 ++++++++++--------
 .../loki/activities/EditClosedGroupAdapter.kt |  48 -----
 .../EditClosedGroupMembersAdapter.kt          |  42 ++++
 .../loki/activities/SelectContactsActivity.kt |   9 +-
 .../loki/activities/SelectContactsAdapter.kt  |  10 +-
 .../loki/activities/SettingsActivity.kt       |   8 +-
 .../securesms/loki/views/ConversationView.kt  |   2 +-
 .../loki/views/MentionCandidateView.kt        |   2 +-
 14 files changed, 176 insertions(+), 156 deletions(-)
 delete mode 100644 src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupAdapter.kt
 create mode 100644 src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt

diff --git a/res/layout/activity_edit_closed_group.xml b/res/layout/activity_edit_closed_group.xml
index 06dc73c339..074b726fb6 100644
--- a/res/layout/activity_edit_closed_group.xml
+++ b/res/layout/activity_edit_closed_group.xml
@@ -11,7 +11,7 @@
         android:orientation="vertical">
 
         <RelativeLayout
-            android:id="@+id/displayNameContainer"
+            android:id="@+id/ctnGroupNameSection"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/large_spacing"
@@ -19,17 +19,17 @@
             android:layout_marginRight="@dimen/large_spacing">
 
             <ImageView
-                android:id="@+id/cancelEditButton"
+                android:id="@+id/btnCancelGroupNameEdit"
                 android:layout_width="36dp"
                 android:layout_height="36dp"
-                android:layout_toLeftOf="@+id/groupNameEditText"
+                android:layout_toLeftOf="@+id/edtGroupName"
                 android:layout_centerVertical="true"
                 android:src="@drawable/ic_close_white_24dp"
                 android:visibility="gone" />
 
             <EditText
                 style="@style/SessionEditText"
-                android:id="@+id/groupNameEditText"
+                android:id="@+id/edtGroupName"
                 android:layout_width="@dimen/album_total_width"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
@@ -41,7 +41,7 @@
                 android:hint="@string/activity_edit_closed_group_edit_text_hint" />
 
             <TextView
-                android:id="@+id/displayNameTextView"
+                android:id="@+id/txvGroupNameDisplay"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
@@ -52,11 +52,11 @@
                 android:drawablePadding="@dimen/small_spacing"/>
 
             <ImageView
-                android:id="@+id/saveEditButton"
+                android:id="@+id/btnSaveGroupName"
                 android:layout_width="36dp"
                 android:layout_height="36dp"
                 android:src="@drawable/ic_check_white_24dp"
-                android:layout_toRightOf="@+id/groupNameEditText"
+                android:layout_toRightOf="@+id/edtGroupName"
                 android:layout_centerVertical="true"
                 android:visibility="gone" />
 
diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml
index bff6499952..df55e40f5e 100644
--- a/res/layout/activity_settings.xml
+++ b/res/layout/activity_settings.xml
@@ -77,7 +77,7 @@
                 android:layout_marginTop="@dimen/medium_spacing" />
 
             <RelativeLayout
-                android:id="@+id/displayNameContainer"
+                android:id="@+id/ctnGroupNameSection"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/large_spacing"
@@ -97,7 +97,7 @@
                     android:hint="@string/activity_settings_display_name_edit_text_hint" />
 
                 <TextView
-                    android:id="@+id/displayNameTextView"
+                    android:id="@+id/txvGroupNameDisplay"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
diff --git a/res/layout/view_conversation.xml b/res/layout/view_conversation.xml
index 624d1b262b..73aeb1df21 100644
--- a/res/layout/view_conversation.xml
+++ b/res/layout/view_conversation.xml
@@ -35,7 +35,7 @@
             android:gravity="center_vertical">
 
             <TextView
-                android:id="@+id/displayNameTextView"
+                android:id="@+id/txvGroupNameDisplay"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:maxLines="1"
diff --git a/res/layout/view_mention_candidate.xml b/res/layout/view_mention_candidate.xml
index f4edc66f3b..886eb2576f 100644
--- a/res/layout/view_mention_candidate.xml
+++ b/res/layout/view_mention_candidate.xml
@@ -30,7 +30,7 @@
     </RelativeLayout>
 
     <TextView
-        android:id="@+id/displayNameTextView"
+        android:id="@+id/txvGroupNameDisplay"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/medium_spacing"
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index f11fe4383c..40d8383401 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -153,6 +153,7 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewViewModel;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivity;
+import org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivityKt;
 import org.thoughtcrime.securesms.loki.activities.HomeActivity;
 import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiThreadDatabaseDelegate;
@@ -1181,7 +1182,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private void handleEditPushGroup() {
     Intent intent = new Intent(this, EditClosedGroupActivity.class);
     String groupID = this.recipient.getAddress().toGroupString();
-    intent.putExtra(EditClosedGroupActivity.GROUP_ID, groupID);
+    intent.putExtra(EditClosedGroupActivityKt.EXTRA_GROUP_ID, groupID);
     startActivity(intent);
   }
 
diff --git a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
index 23a959047e..468fc8dd56 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
@@ -30,9 +30,8 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberC
         set(value) { field = value; createClosedGroupAdapter.members = value }
 
     private val createClosedGroupAdapter by lazy {
-        val result = SelectContactsAdapter(this)
-        result.glide = GlideApp.with(this)
-        result.memberClickListener = this
+        val glide = GlideApp.with(this)
+        val result = SelectContactsAdapter(this, glide, this)
         result
     }
 
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
index 5ab1d17964..16ec34f6d6 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
@@ -14,10 +14,9 @@ import android.widget.Toast
 import kotlinx.android.synthetic.main.activity_create_closed_group.emptyStateContainer
 import kotlinx.android.synthetic.main.activity_create_closed_group.mainContentContainer
 import kotlinx.android.synthetic.main.activity_edit_closed_group.*
-import kotlinx.android.synthetic.main.activity_edit_closed_group.displayNameContainer
-import kotlinx.android.synthetic.main.activity_edit_closed_group.displayNameTextView
+import kotlinx.android.synthetic.main.activity_edit_closed_group.ctnGroupNameSection
+import kotlinx.android.synthetic.main.activity_edit_closed_group.txvGroupNameDisplay
 import kotlinx.android.synthetic.main.activity_linked_devices.recyclerView
-import kotlinx.android.synthetic.main.activity_settings.*
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.database.Address
@@ -28,46 +27,71 @@ import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.whispersystems.signalservice.api.crypto.ProfileCipher
 
-class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberClickListener, LoaderManager.LoaderCallbacks<List<String>> {
-    private var members = listOf<String>()
-        set(value) { field = value; editClosedGroupAdapter.members = value }
+const val EXTRA_GROUP_ID = "GROUP_ID"
+const val REQ_CODE_ADD_USERS = 124
+const val LOADER_ID_MEMBERS = 0
+
+class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
+
+    private lateinit var memberListAdapter: EditClosedGroupMembersAdapter
+    private val originalMembers = HashSet<String>()
+    private val members = HashSet<String>()
+//    private var adminMembers = HashSet<String>()
+
     private lateinit var groupID: String
-    private var membersToRemove = listOf<String>()
-    private var membersToAdd = listOf<String>()
-    private var admins = listOf<String>()
-    private val originalName by lazy { DatabaseFactory.getGroupDatabase(this).getGroup(groupID).get().title }
-    private var nameHasChanged = false
+    private lateinit var originalName: String
     private lateinit var newGroupDisplayName: String
 
+    private var nameHasChanged = false
 
-    private val editClosedGroupAdapter by lazy {
-        val result = EditClosedGroupAdapter(this)
-        result.glide = GlideApp.with(this)
-        result.memberClickListener = this
-        result
-    }
     private var isEditingGroupName = false
         set(value) { field = value; handleIsEditingDisplayNameChanged() }
 
-    companion object {
-        @JvmField
-        public val GROUP_ID = "GROUP_ID"
-    }
-
     // region Lifecycle
     override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
         super.onCreate(savedInstanceState, isReady)
-        groupID = intent.getStringExtra(GROUP_ID)
         setContentView(R.layout.activity_edit_closed_group)
+
+        this.groupID = intent.getStringExtra(EXTRA_GROUP_ID)
+        this.originalName = DatabaseFactory.getGroupDatabase(this).getGroup(groupID).get().title
+
         supportActionBar!!.title = resources.getString(R.string.activity_edit_closed_group_title)
-        displayNameContainer.setOnClickListener { showEditDisplayNameUI() }
-        displayNameTextView.text = originalName
-        cancelEditButton.setOnClickListener { cancelEditingDisplayName() }
-        saveEditButton.setOnClickListener { saveDisplayName() }
-        recyclerView.adapter = editClosedGroupAdapter
+
+        txvGroupNameDisplay.text = originalName
+        ctnGroupNameSection.setOnClickListener { showEditDisplayNameUI() }
+        btnCancelGroupNameEdit.setOnClickListener { cancelEditingDisplayName() }
+        btnSaveGroupName.setOnClickListener { saveDisplayName() }
+
+        addMembersClosedGroupButton.setOnClickListener { onAddMembersClick() }
+
+        this.memberListAdapter = EditClosedGroupMembersAdapter(
+                this,
+                GlideApp.with(this),
+                this::onMemberClick
+        )
+        recyclerView.adapter = this.memberListAdapter
         recyclerView.layoutManager = LinearLayoutManager(this)
-        addMembersClosedGroupButton.setOnClickListener { onAddMember() }
-        LoaderManager.getInstance(this).initLoader(0, null, this)
+
+        // Setup member list loader.
+        LoaderManager.getInstance(this).initLoader(LOADER_ID_MEMBERS, null, object : LoaderManager.LoaderCallbacks<List<String>> {
+            override fun onCreateLoader(id: Int, bundle: Bundle?): Loader<List<String>> {
+                return EditClosedGroupLoader(groupID, this@EditClosedGroupActivity)
+            }
+
+            override fun onLoadFinished(loader: Loader<List<String>>, members: List<String>) {
+                // We no longer need any subsequent loading events
+                // (they will occur on every activity resume)
+                LoaderManager.getInstance(this@EditClosedGroupActivity).destroyLoader(LOADER_ID_MEMBERS)
+
+                originalMembers.clear()
+                originalMembers.addAll(members.toHashSet())
+                updateMembers(originalMembers)
+            }
+
+            override fun onLoaderReset(loader: Loader<List<String>>) {
+                updateMembers(setOf())
+            }
+        })
     }
 
     override fun onCreateOptionsMenu(menu: Menu?): Boolean {
@@ -77,20 +101,12 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
     // endregion
 
     // region Updating
-    override fun onCreateLoader(id: Int, bundle: Bundle?): Loader<List<String>> {
-        return EditClosedGroupLoader(groupID, this)
-    }
 
-    override fun onLoadFinished(loader: Loader<List<String>>, members: List<String>) {
-        update(members)
-    }
 
-    override fun onLoaderReset(loader: Loader<List<String>>) {
-        update(listOf())
-    }
-
-    private fun update(members: List<String>) {
-        this.members = members
+    private fun updateMembers(members: Set<String>) {
+        this.members.clear()
+        this.members.addAll(members)
+        this.memberListAdapter.setItems(members)
         mainContentContainer.visibility = if (members.isEmpty()) View.GONE else View.VISIBLE
         emptyStateContainer.visibility = if (members.isEmpty()) View.VISIBLE else View.GONE
         invalidateOptionsMenu()
@@ -99,8 +115,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
 
     // region Interaction
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        val id = item.itemId
-        when(id) {
+        when(item.itemId) {
             R.id.applyButton -> modifyClosedGroup()
         }
         return super.onOptionsItemSelected(item)
@@ -113,54 +128,54 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
         isEditingGroupName = false
     }
 
-    override fun onMemberClick(member: String) {
+    private fun onMemberClick(member: String) {
         val bottomSheet = GroupEditingOptionsBottomSheet()
         bottomSheet.onRemoveTapped = {
-            membersToRemove = membersToRemove + member
-            members = members - member
+            val changedMembers = members - member
+            updateMembers(changedMembers)
             bottomSheet.dismiss()
         }
  //       bottomSheet.onAdminTapped = {
  //           bottomSheet.dismiss()
  //       }
-        bottomSheet.show(supportFragmentManager, "closeBottomSheet")
+        bottomSheet.show(supportFragmentManager, "MEMBER_BOTTOM_SHEET")
     }
 
-    private fun onAddMember() {
+    private fun onAddMembersClick() {
         val intent = Intent(this@EditClosedGroupActivity, SelectContactsActivity::class.java)
-        startActivityForResult(intent, 124)
+        startActivityForResult(intent, REQ_CODE_ADD_USERS)
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        if (resultCode == RESULT_OK) {
-            if (data != null && data.hasExtra("Selected Contacts Result")) {
-                val returnedContacts = data.extras.getStringArray("Selected Contacts Result")
-                val selectedContacts = returnedContacts.toList()
-                membersToAdd = selectedContacts + membersToAdd
-                members = members + membersToAdd
-                Toast.makeText(this.applicationContext, membersToAdd.toString(), Toast.LENGTH_LONG).show()
-                //TODO:this works for users that were already in the group but were removed in the same edit activity, but not users that were never in the chat. WHy?
+        when (requestCode) {
+            REQ_CODE_ADD_USERS -> {
+                if (resultCode != RESULT_OK) return
+                if (data == null || data.extras == null || !data.hasExtra(EXTRA_SELECTED_CONTACTS)) return
+
+                val selectedContacts = data.extras!!.getStringArray(EXTRA_SELECTED_CONTACTS)!!.toSet()
+                val changedMembers = members + selectedContacts
+                updateMembers(changedMembers)
             }
         }
     }
 
     private fun handleIsEditingDisplayNameChanged() {
-        cancelEditButton.visibility = if (isEditingGroupName) View.VISIBLE else View.GONE
-        saveEditButton.visibility = if (isEditingGroupName) View.VISIBLE else View.GONE
-        displayNameTextView.visibility = if (isEditingGroupName) View.INVISIBLE else View.VISIBLE
-        groupNameEditText.visibility = if (isEditingGroupName) View.VISIBLE else View.INVISIBLE
+        btnCancelGroupNameEdit.visibility = if (isEditingGroupName) View.VISIBLE else View.GONE
+        btnSaveGroupName.visibility = if (isEditingGroupName) View.VISIBLE else View.GONE
+        txvGroupNameDisplay.visibility = if (isEditingGroupName) View.INVISIBLE else View.VISIBLE
+        edtGroupName.visibility = if (isEditingGroupName) View.VISIBLE else View.INVISIBLE
         val inputMethodManager = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
         if (isEditingGroupName) {
-            groupNameEditText.requestFocus()
-            inputMethodManager.showSoftInput(groupNameEditText, 0)
+            edtGroupName.requestFocus()
+            inputMethodManager.showSoftInput(edtGroupName, 0)
         } else {
-            inputMethodManager.hideSoftInputFromWindow(groupNameEditText.windowToken, 0)
+            inputMethodManager.hideSoftInputFromWindow(edtGroupName.windowToken, 0)
         }
     }
 
     private fun saveDisplayName() {
-        var groupDisplayName = groupNameEditText.text.toString().trim()
+        val groupDisplayName = edtGroupName.text.toString().trim()
         if (groupDisplayName.isEmpty()) {
             return Toast.makeText(this, R.string.activity_settings_display_name_missing_error, Toast.LENGTH_SHORT).show()
         }
@@ -171,26 +186,32 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberCli
             return Toast.makeText(this, R.string.activity_settings_display_name_too_long_error, Toast.LENGTH_SHORT).show()
         }
         newGroupDisplayName = groupDisplayName
-        displayNameTextView.text = groupDisplayName
+        txvGroupNameDisplay.text = groupDisplayName
         nameHasChanged = true
         isEditingGroupName = false
-        return Toast.makeText(this, "Name Changed", Toast.LENGTH_SHORT).show()
     }
 
     private fun modifyClosedGroup() {
-        if (!nameHasChanged && membersToRemove.isEmpty() && membersToAdd.isEmpty()) { finish() } else {
-            var groupDisplayName = originalName
-            if (nameHasChanged) {
-                groupDisplayName = newGroupDisplayName
-            }
-            val finalGroupMembers = members.map {
-                Recipient.from(this, Address.fromSerialized(it), false)
-            }.toSet()
-            val finalGroupAdmins = admins.map {
-                Recipient.from(this, Address.fromSerialized(it), false)
-            }.toSet()
-            GroupManager.updateGroup(this, groupID, finalGroupMembers, null, groupDisplayName, finalGroupAdmins)
+        val membersHaveChanged = members.size != originalMembers.size || !members.containsAll(originalMembers)
+
+        if (!nameHasChanged && !membersHaveChanged) {
             finish()
+            return
         }
+
+        var groupDisplayName = originalName
+        if (nameHasChanged) {
+            groupDisplayName = newGroupDisplayName
+        }
+
+        val finalGroupMembers = members.map {
+            Recipient.from(this, Address.fromSerialized(it), false)
+        }.toSet()
+//        val finalGroupAdmins = adminMembers.map {
+//            Recipient.from(this, Address.fromSerialized(it), false)
+//        }.toSet()
+        val finalGroupAdmins = finalGroupMembers.toSet() //TODO For now, consider all the group's users are admins.
+        GroupManager.updateGroup(this, groupID, finalGroupMembers, null, groupDisplayName, finalGroupAdmins)
+        finish()
     }
 }
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupAdapter.kt
deleted file mode 100644
index b41e21a520..0000000000
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupAdapter.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.thoughtcrime.securesms.loki.activities
-
-import android.R
-import android.app.PendingIntent.getActivity
-import android.content.Context
-import android.support.v7.app.AlertDialog
-import android.support.v7.widget.RecyclerView
-import android.view.View
-import android.view.ViewGroup
-import android.widget.AdapterView
-import android.widget.EditText
-import android.widget.LinearLayout
-import org.thoughtcrime.securesms.DeviceListItem
-import org.thoughtcrime.securesms.database.Address
-import org.thoughtcrime.securesms.loki.dialogs.DeviceEditingOptionsBottomSheet
-import org.thoughtcrime.securesms.loki.dialogs.GroupEditingOptionsBottomSheet
-import org.thoughtcrime.securesms.loki.utilities.toPx
-import org.thoughtcrime.securesms.loki.views.UserView
-import org.thoughtcrime.securesms.mms.GlideRequests
-import org.thoughtcrime.securesms.recipients.Recipient
-
-class EditClosedGroupAdapter(private val context: Context) : RecyclerView.Adapter<EditClosedGroupAdapter.ViewHolder>() {
-    lateinit var glide: GlideRequests
-    private val selectedMembers = mutableSetOf<String>()
-    var members = listOf<String>()
-        set(value) {
-            field = value; notifyDataSetChanged()
-        }
-    var memberClickListener: MemberClickListener? = null
-
-    class ViewHolder(val view: UserView) : RecyclerView.ViewHolder(view)
-
-    override fun getItemCount(): Int {
-        return members.size
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val view = UserView(context)
-        return ViewHolder(view)
-    }
-
-    override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
-        val member = members[position]
-        viewHolder.view.setOnClickListener { memberClickListener?.onMemberClick(member) }
-        val isSelected = selectedMembers.contains(member)
-        viewHolder.view.bind(Recipient.from(context, Address.fromSerialized(member), false), isSelected, glide, true)
-    }
-}
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
new file mode 100644
index 0000000000..965018f51a
--- /dev/null
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
@@ -0,0 +1,42 @@
+package org.thoughtcrime.securesms.loki.activities
+
+import android.content.Context
+import android.support.v7.widget.RecyclerView
+import android.view.ViewGroup
+import org.thoughtcrime.securesms.database.Address
+import org.thoughtcrime.securesms.loki.views.UserView
+import org.thoughtcrime.securesms.mms.GlideRequests
+import org.thoughtcrime.securesms.recipients.Recipient
+
+class EditClosedGroupMembersAdapter(
+        private val context: Context,
+        private val glide: GlideRequests,
+        private val memberClickListener: ((String) -> Unit)? = null
+) : RecyclerView.Adapter<EditClosedGroupMembersAdapter.ViewHolder>() {
+
+    private val items = ArrayList<String>()
+
+//    private val selectedItems = mutableSetOf<String>()
+
+    fun setItems(items: Collection<String>) {
+        this.items.clear()
+        this.items.addAll(items)
+        notifyDataSetChanged()
+    }
+
+    override fun getItemCount(): Int = items.size
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val view = UserView(context)
+        return ViewHolder(view)
+    }
+
+    override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
+        val item = items[position]
+//        val isSelected = selectedItems.contains(item)
+        viewHolder.view.bind(Recipient.from(context, Address.fromSerialized(item), false), false, glide, true)
+        viewHolder.view.setOnClickListener { this.memberClickListener?.invoke(item) }
+    }
+
+    class ViewHolder(val view: UserView) : RecyclerView.ViewHolder(view)
+}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
index 9d73deb831..a177a355b8 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
@@ -15,14 +15,15 @@ import network.loki.messenger.R
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.mms.GlideApp
 
+const val EXTRA_SELECTED_CONTACTS = "SELECTED_CONTACTS_RESULT"
+
 class SelectContactsActivity : PassphraseRequiredActionBarActivity(), MemberClickListener, LoaderManager.LoaderCallbacks<List<String>> {
     private var members = listOf<String>()
         set(value) { field = value; selectContactsAdapter.members = value }
 
     private val selectContactsAdapter by lazy {
-        val result = SelectContactsAdapter(this)
-        result.glide = GlideApp.with(this)
-        result.memberClickListener = this
+        val glide = GlideApp.with(this)
+        val result = SelectContactsAdapter(this, glide, this)
         result
     }
 
@@ -94,7 +95,7 @@ class SelectContactsActivity : PassphraseRequiredActionBarActivity(), MemberClic
         val selectedMembers = this.selectedMembers
         val selectedContacts = selectedMembers.toTypedArray()
         val data = Intent()
-        data.putExtra("Selected Contacts Result", selectedContacts)
+        data.putExtra(EXTRA_SELECTED_CONTACTS, selectedContacts)
         setResult(Activity.RESULT_OK, data)
         finish()
     }
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
index e5210099f7..c048bde096 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
@@ -8,12 +8,16 @@ import org.thoughtcrime.securesms.loki.views.UserView
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.recipients.Recipient
 
-class SelectContactsAdapter(private val context: Context) : RecyclerView.Adapter<SelectContactsAdapter.ViewHolder>() {
-    lateinit var glide: GlideRequests
+class SelectContactsAdapter(
+        private val context: Context,
+        private val glide: GlideRequests,
+        private val memberClickListener: MemberClickListener? = null)
+    : RecyclerView.Adapter<SelectContactsAdapter.ViewHolder>() {
+
     val selectedMembers = mutableSetOf<String>()
+
     var members = listOf<String>()
         set(value) { field = value; notifyDataSetChanged() }
-    var memberClickListener: MemberClickListener? = null
 
     class ViewHolder(val view: UserView) : RecyclerView.ViewHolder(view)
 
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
index 79cf26157f..20086dc391 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
@@ -77,8 +77,8 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
         profilePictureView.isLarge = true
         profilePictureView.update()
         profilePictureView.setOnClickListener { showEditProfilePictureUI() }
-        displayNameContainer.setOnClickListener { showEditDisplayNameUI() }
-        displayNameTextView.text = DatabaseFactory.getLokiUserDatabase(this).getDisplayName(hexEncodedPublicKey)
+        ctnGroupNameSection.setOnClickListener { showEditDisplayNameUI() }
+        txvGroupNameDisplay.text = DatabaseFactory.getLokiUserDatabase(this).getDisplayName(hexEncodedPublicKey)
         publicKeyTextView.text = hexEncodedPublicKey
         copyButton.setOnClickListener { copyPublicKey() }
         shareButton.setOnClickListener { sharePublicKey() }
@@ -132,7 +132,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
         cancelButton.visibility = if (isEditingDisplayName) View.VISIBLE else View.GONE
         showQRCodeButton.visibility = if (isEditingDisplayName) View.GONE else View.VISIBLE
         saveButton.visibility = if (isEditingDisplayName) View.VISIBLE else View.GONE
-        displayNameTextView.visibility = if (isEditingDisplayName) View.INVISIBLE else View.VISIBLE
+        txvGroupNameDisplay.visibility = if (isEditingDisplayName) View.INVISIBLE else View.VISIBLE
         displayNameEditText.visibility = if (isEditingDisplayName) View.VISIBLE else View.INVISIBLE
         val titleTextViewLayoutParams = titleTextView.layoutParams as LinearLayout.LayoutParams
         titleTextViewLayoutParams.leftMargin = if (isEditingDisplayName) toPx(16, resources) else 0
@@ -176,7 +176,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
         }
         all(promises).alwaysUi {
             if (displayName != null) {
-                displayNameTextView.text = displayName
+                txvGroupNameDisplay.text = displayName
             }
             displayNameToBeUploaded = null
             if (isUpdatingProfilePicture && profilePicture != null) {
diff --git a/src/org/thoughtcrime/securesms/loki/views/ConversationView.kt b/src/org/thoughtcrime/securesms/loki/views/ConversationView.kt
index f859faa85e..ce8092d2ff 100644
--- a/src/org/thoughtcrime/securesms/loki/views/ConversationView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/ConversationView.kt
@@ -80,7 +80,7 @@ class ConversationView : LinearLayout {
         profilePictureView.glide = glide
         profilePictureView.update()
         val senderDisplayName = if (thread.recipient.isLocalNumber) context.getString(R.string.note_to_self) else if (!thread.recipient.name.isNullOrEmpty()) thread.recipient.name else thread.recipient.address.toString()
-        displayNameTextView.text = senderDisplayName
+        txvGroupNameDisplay.text = senderDisplayName
         timestampTextView.text = DateUtils.getBriefRelativeTimeSpanString(context, Locale.getDefault(), thread.date)
         muteIndicatorImageView.visibility = if (thread.recipient.isMuted) VISIBLE else GONE
         val rawSnippet = thread.getDisplayBody(context)
diff --git a/src/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt b/src/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt
index 6208150b54..392f234d7f 100644
--- a/src/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt
@@ -30,7 +30,7 @@ class MentionCandidateView(context: Context, attrs: AttributeSet?, defStyleAttr:
     }
 
     private fun update() {
-        displayNameTextView.text = mentionCandidate.displayName
+        txvGroupNameDisplay.text = mentionCandidate.displayName
         profilePictureView.publicKey = mentionCandidate.publicKey
         profilePictureView.additionalPublicKey = null
         profilePictureView.isRSSFeed = false

From 15d463161a653fe6cbb745d31d57b7288b3f25c5 Mon Sep 17 00:00:00 2001
From: Anton Chekulaev <metaphore@bk.ru>
Date: Fri, 14 Aug 2020 15:23:06 +1000
Subject: [PATCH 12/30] Create closed group activity refactoring.

---
 res/layout/activity_create_closed_group.xml   |  2 +-
 res/layout/activity_home.xml                  |  2 +-
 res/layout/activity_select_contacts.xml       |  2 +-
 .../activities/CreateClosedGroupActivity.kt   | 68 +++++++++----------
 .../activities/EditClosedGroupActivity.kt     |  2 +-
 .../securesms/loki/activities/HomeActivity.kt |  5 +-
 .../loki/activities/MemberClickListener.kt    |  1 +
 .../loki/activities/SelectContactsActivity.kt | 10 +--
 .../loki/activities/SelectContactsAdapter.kt  |  7 +-
 9 files changed, 44 insertions(+), 55 deletions(-)

diff --git a/res/layout/activity_create_closed_group.xml b/res/layout/activity_create_closed_group.xml
index 17c92d9eb2..15a0579e38 100644
--- a/res/layout/activity_create_closed_group.xml
+++ b/res/layout/activity_create_closed_group.xml
@@ -63,7 +63,7 @@
 
         <Button
             style="@style/MediumProminentOutlineButton"
-            android:id="@+id/createNewPrivateChatButton"
+            android:id="@+id/btnCreateNewPrivateChat"
             android:layout_width="196dp"
             android:layout_height="@dimen/medium_button_height"
             android:layout_marginTop="@dimen/medium_spacing"
diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
index bdfdc479fc..42859403aa 100644
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@@ -107,7 +107,7 @@
 
             <Button
                 style="@style/MediumProminentOutlineButton"
-                android:id="@+id/createNewPrivateChatButton"
+                android:id="@+id/btnCreateNewPrivateChat"
                 android:layout_width="196dp"
                 android:layout_height="@dimen/medium_button_height"
                 android:layout_marginTop="@dimen/medium_spacing"
diff --git a/res/layout/activity_select_contacts.xml b/res/layout/activity_select_contacts.xml
index e2604c048c..5c2964d405 100644
--- a/res/layout/activity_select_contacts.xml
+++ b/res/layout/activity_select_contacts.xml
@@ -35,7 +35,7 @@
 
         <Button
             style="@style/MediumProminentOutlineButton"
-            android:id="@+id/createNewPrivateChatButton"
+            android:id="@+id/btnCreateNewPrivateChat"
             android:layout_width="196dp"
             android:layout_height="@dimen/medium_button_height"
             android:layout_marginTop="@dimen/medium_spacing"
diff --git a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
index 468fc8dd56..b56b75d4fd 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.loki.activities
 
+import android.content.Context
 import android.content.Intent
 import android.graphics.Bitmap
 import android.os.AsyncTask
@@ -25,31 +26,29 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.libsignal.util.guava.Optional
 import java.lang.ref.WeakReference
 
-class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberClickListener, LoaderManager.LoaderCallbacks<List<String>> {
+const val RESULT_CODE_CREATE_CLOSED_GROUP = 100
+
+class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), LoaderManager.LoaderCallbacks<List<String>> {
+
+    private lateinit var selectContactsAdapter: SelectContactsAdapter
+
     private var members = listOf<String>()
-        set(value) { field = value; createClosedGroupAdapter.members = value }
-
-    private val createClosedGroupAdapter by lazy {
-        val glide = GlideApp.with(this)
-        val result = SelectContactsAdapter(this, glide, this)
-        result
-    }
-
-    private val selectedMembers: Set<String>
-        get() { return createClosedGroupAdapter.selectedMembers }
-
-    companion object {
-        public val createNewPrivateChatResultCode = 100
-    }
+        set(value) {
+            field = value
+            selectContactsAdapter.members = value
+        }
 
     // region Lifecycle
     override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
         super.onCreate(savedInstanceState, isReady)
         setContentView(R.layout.activity_create_closed_group)
         supportActionBar!!.title = resources.getString(R.string.activity_create_closed_group_title)
-        recyclerView.adapter = createClosedGroupAdapter
+
+        this.selectContactsAdapter = SelectContactsAdapter(this, GlideApp.with(this))
+        recyclerView.adapter = this.selectContactsAdapter
         recyclerView.layoutManager = LinearLayoutManager(this)
-        createNewPrivateChatButton.setOnClickListener { createNewPrivateChat() }
+
+        btnCreateNewPrivateChat.setOnClickListener { createNewPrivateChat() }
         LoaderManager.getInstance(this).initLoader(0, null, this)
     }
 
@@ -82,23 +81,17 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberC
 
     // region Interaction
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        val id = item.itemId
-        when(id) {
+        when(item.itemId) {
             R.id.doneButton -> createClosedGroup()
-            else -> { /* Do nothing */ }
         }
         return super.onOptionsItemSelected(item)
     }
 
     private fun createNewPrivateChat() {
-        setResult(createNewPrivateChatResultCode)
+        setResult(RESULT_CODE_CREATE_CLOSED_GROUP)
         finish()
     }
 
-    override fun onMemberClick(member: String) {
-        createClosedGroupAdapter.onMemberClick(member)
-    }
-
     private fun createClosedGroup() {
         val name = nameEditText.text.trim()
         if (name.isEmpty()) {
@@ -107,7 +100,7 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberC
         if (name.length >= 64) {
             return Toast.makeText(this, R.string.activity_create_closed_group_group_name_too_long_error, Toast.LENGTH_LONG).show()
         }
-        val selectedMembers = this.selectedMembers
+        val selectedMembers = this.selectContactsAdapter.selectedMembers
         if (selectedMembers.count() < 2) {
             return Toast.makeText(this, R.string.activity_create_closed_group_not_enough_group_members_error, Toast.LENGTH_LONG).show()
         }
@@ -119,16 +112,8 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberC
         }.toSet()
         val masterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(this) ?: TextSecurePreferences.getLocalNumber(this)
         val admin = Recipient.from(this, Address.fromSerialized(masterHexEncodedPublicKey), false)
-        CreateClosedGroupTask(WeakReference(this), null, name.toString(), recipients, setOf( admin )).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR)
-    }
-
-    private fun handleOpenConversation(threadId: Long, recipient: Recipient) {
-        val intent = Intent(this, ConversationActivity::class.java)
-        intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, threadId)
-        intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT)
-        intent.putExtra(ConversationActivity.ADDRESS_EXTRA, recipient.address)
-        startActivity(intent)
-        finish()
+        CreateClosedGroupTask(WeakReference(this), null, name.toString(), recipients, setOf( admin ))
+                .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR)
     }
     // endregion
 
@@ -150,7 +135,8 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberC
             val activity = activity.get() ?: return super.onPostExecute(result)
             if (result.isPresent && result.get().threadId > -1) {
                 if (!activity.isFinishing) {
-                    activity.handleOpenConversation(result.get().threadId, result.get().groupRecipient)
+                    openConversationActivity(activity, result.get().threadId, result.get().groupRecipient)
+                    activity.finish()
                 }
             } else {
                 super.onPostExecute(result)
@@ -159,4 +145,12 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), MemberC
         }
     }
     // endregion
+}
+
+private fun openConversationActivity(context: Context, threadId: Long, recipient: Recipient) {
+    val intent = Intent(context, ConversationActivity::class.java)
+    intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, threadId)
+    intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT)
+    intent.putExtra(ConversationActivity.ADDRESS_EXTRA, recipient.address)
+    context.startActivity(intent)
 }
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
index 16ec34f6d6..1d21a4bbdf 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
@@ -80,7 +80,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
 
             override fun onLoadFinished(loader: Loader<List<String>>, members: List<String>) {
                 // We no longer need any subsequent loading events
-                // (they will occur on every activity resume)
+                // (they will occur on every activity resume).
                 LoaderManager.getInstance(this@EditClosedGroupActivity).destroyLoader(LOADER_ID_MEMBERS)
 
                 originalMembers.clear()
diff --git a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
index cc2c3e5793..b65938afee 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
@@ -31,7 +31,6 @@ import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.database.ThreadDatabase
 import org.thoughtcrime.securesms.database.model.ThreadRecord
 import org.thoughtcrime.securesms.jobs.MultiDeviceBlockedUpdateJob
-import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase
 import org.thoughtcrime.securesms.loki.dialogs.ConversationOptionsBottomSheet
 import org.thoughtcrime.securesms.loki.dialogs.MultiDeviceRemovalBottomSheet
 import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocol
@@ -120,7 +119,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
         recyclerView.adapter = homeAdapter
         recyclerView.layoutManager = LinearLayoutManager(this)
         // Set up empty state view
-        createNewPrivateChatButton.setOnClickListener { createNewPrivateChat() }
+        btnCreateNewPrivateChat.setOnClickListener { createNewPrivateChat() }
         // This is a workaround for the fact that CursorRecyclerViewAdapter doesn't actually auto-update (even though it says it will)
         LoaderManager.getInstance(this).restartLoader(0, null, object : LoaderManager.LoaderCallbacks<Cursor> {
 
@@ -221,7 +220,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        if (resultCode == CreateClosedGroupActivity.createNewPrivateChatResultCode) {
+        if (resultCode == RESULT_CODE_CREATE_CLOSED_GROUP) {
             createNewPrivateChat()
         }
     }
diff --git a/src/org/thoughtcrime/securesms/loki/activities/MemberClickListener.kt b/src/org/thoughtcrime/securesms/loki/activities/MemberClickListener.kt
index c1599ce408..b5b0eeaa1e 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/MemberClickListener.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/MemberClickListener.kt
@@ -1,5 +1,6 @@
 package org.thoughtcrime.securesms.loki.activities
 
+@FunctionalInterface
 interface MemberClickListener {
     fun onMemberClick(member: String)
 }
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
index a177a355b8..bc5c77b11d 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
@@ -17,13 +17,13 @@ import org.thoughtcrime.securesms.mms.GlideApp
 
 const val EXTRA_SELECTED_CONTACTS = "SELECTED_CONTACTS_RESULT"
 
-class SelectContactsActivity : PassphraseRequiredActionBarActivity(), MemberClickListener, LoaderManager.LoaderCallbacks<List<String>> {
+class SelectContactsActivity : PassphraseRequiredActionBarActivity(), LoaderManager.LoaderCallbacks<List<String>> {
     private var members = listOf<String>()
         set(value) { field = value; selectContactsAdapter.members = value }
 
     private val selectContactsAdapter by lazy {
         val glide = GlideApp.with(this)
-        val result = SelectContactsAdapter(this, glide, this)
+        val result = SelectContactsAdapter(this, glide)
         result
     }
 
@@ -41,7 +41,7 @@ class SelectContactsActivity : PassphraseRequiredActionBarActivity(), MemberClic
         supportActionBar!!.title = resources.getString(R.string.activity_select_contacts_title)
         recyclerView.adapter = selectContactsAdapter
         recyclerView.layoutManager = LinearLayoutManager(this)
-        createNewPrivateChatButton.setOnClickListener { createNewPrivateChat() }
+        btnCreateNewPrivateChat.setOnClickListener { createNewPrivateChat() }
         LoaderManager.getInstance(this).initLoader(0, null, this)
     }
 
@@ -87,10 +87,6 @@ class SelectContactsActivity : PassphraseRequiredActionBarActivity(), MemberClic
         finish()
     }
 
-    override fun onMemberClick(member: String) {
-        selectContactsAdapter.onMemberClick(member)
-    }
-
     private fun returnContacts() {
         val selectedMembers = this.selectedMembers
         val selectedContacts = selectedMembers.toTypedArray()
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
index c048bde096..01278737e4 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
@@ -10,8 +10,7 @@ import org.thoughtcrime.securesms.recipients.Recipient
 
 class SelectContactsAdapter(
         private val context: Context,
-        private val glide: GlideRequests,
-        private val memberClickListener: MemberClickListener? = null)
+        private val glide: GlideRequests)
     : RecyclerView.Adapter<SelectContactsAdapter.ViewHolder>() {
 
     val selectedMembers = mutableSetOf<String>()
@@ -32,12 +31,12 @@ class SelectContactsAdapter(
 
     override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
         val member = members[position]
-        viewHolder.view.setOnClickListener { memberClickListener?.onMemberClick(member) }
+        viewHolder.view.setOnClickListener { onMemberClick(member) }
         val isSelected = selectedMembers.contains(member)
         viewHolder.view.bind(Recipient.from(context, Address.fromSerialized(member), false), isSelected, glide, false)
     }
 
-    fun onMemberClick(member: String) {
+    private fun onMemberClick(member: String) {
         if (selectedMembers.contains(member)) {
             selectedMembers.remove(member)
         } else {

From d9599b984a5fe91f322d50393b1630edf082f4c3 Mon Sep 17 00:00:00 2001
From: Anton Chekulaev <metaphore@bk.ru>
Date: Fri, 14 Aug 2020 16:48:56 +1000
Subject: [PATCH 13/30] User count validation for edit closed group activity.

---
 .../activities/EditClosedGroupActivity.kt     | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
index 1d21a4bbdf..6cacaa7777 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
@@ -116,7 +116,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
     // region Interaction
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when(item.itemId) {
-            R.id.applyButton -> modifyClosedGroup()
+            R.id.applyButton -> commitClosedGroupChanges()
         }
         return super.onOptionsItemSelected(item)
     }
@@ -191,7 +191,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
         isEditingGroupName = false
     }
 
-    private fun modifyClosedGroup() {
+    private fun commitClosedGroupChanges() {
         val membersHaveChanged = members.size != originalMembers.size || !members.containsAll(originalMembers)
 
         if (!nameHasChanged && !membersHaveChanged) {
@@ -199,18 +199,28 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
             return
         }
 
-        var groupDisplayName = originalName
-        if (nameHasChanged) {
-            groupDisplayName = newGroupDisplayName
-        }
+        val groupDisplayName = if (nameHasChanged) newGroupDisplayName else originalName
 
         val finalGroupMembers = members.map {
             Recipient.from(this, Address.fromSerialized(it), false)
         }.toSet()
+
 //        val finalGroupAdmins = adminMembers.map {
 //            Recipient.from(this, Address.fromSerialized(it), false)
 //        }.toSet()
-        val finalGroupAdmins = finalGroupMembers.toSet() //TODO For now, consider all the group's users are admins.
+        val finalGroupAdmins = finalGroupMembers.toSet() //TODO For now, consider all the users are admins.
+
+
+        if (groupDisplayName.length >= 64) {
+            return Toast.makeText(this, R.string.activity_edit_closed_group_group_name_too_long_error, Toast.LENGTH_LONG).show()
+        }
+        if (finalGroupMembers.size < 2) {
+            return Toast.makeText(this, R.string.activity_edit_closed_group_not_enough_group_members_error, Toast.LENGTH_LONG).show()
+        }
+        if (finalGroupMembers.size > 10) {
+            return Toast.makeText(this, R.string.activity_edit_closed_group_too_many_group_members_error, Toast.LENGTH_LONG).show()
+        }
+
         GroupManager.updateGroup(this, groupID, finalGroupMembers, null, groupDisplayName, finalGroupAdmins)
         finish()
     }

From f5ff045b5d4d607d00c9aa253f3a23d776c4cfe3 Mon Sep 17 00:00:00 2001
From: Anton Chekulaev <metaphore@bk.ru>
Date: Fri, 14 Aug 2020 17:08:28 +1000
Subject: [PATCH 14/30] Select contacts activity cleanup.

---
 res/layout/activity_select_contacts.xml       | 14 +++---
 .../activities/EditClosedGroupActivity.kt     |  4 +-
 .../loki/activities/SelectContactsActivity.kt | 47 ++++++++-----------
 3 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/res/layout/activity_select_contacts.xml b/res/layout/activity_select_contacts.xml
index 5c2964d405..b412e82ecf 100644
--- a/res/layout/activity_select_contacts.xml
+++ b/res/layout/activity_select_contacts.xml
@@ -33,13 +33,13 @@
             android:textColor="@color/text"
             android:text="@string/activity_create_closed_group_empty_state_message" />
 
-        <Button
-            style="@style/MediumProminentOutlineButton"
-            android:id="@+id/btnCreateNewPrivateChat"
-            android:layout_width="196dp"
-            android:layout_height="@dimen/medium_button_height"
-            android:layout_marginTop="@dimen/medium_spacing"
-            android:text="@string/activity_create_closed_group_empty_state_button_title" />
+<!--        <Button-->
+<!--            style="@style/MediumProminentOutlineButton"-->
+<!--            android:id="@+id/btnCreateNewPrivateChat"-->
+<!--            android:layout_width="196dp"-->
+<!--            android:layout_height="@dimen/medium_button_height"-->
+<!--            android:layout_marginTop="@dimen/medium_spacing"-->
+<!--            android:text="@string/activity_create_closed_group_empty_state_button_title" />-->
 
     </LinearLayout>
 
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
index 6cacaa7777..0e9b7d13c4 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
@@ -151,9 +151,9 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
         when (requestCode) {
             REQ_CODE_ADD_USERS -> {
                 if (resultCode != RESULT_OK) return
-                if (data == null || data.extras == null || !data.hasExtra(EXTRA_SELECTED_CONTACTS)) return
+                if (data == null || data.extras == null || !data.hasExtra(EXTRA_RESULT_SELECTED_CONTACTS)) return
 
-                val selectedContacts = data.extras!!.getStringArray(EXTRA_SELECTED_CONTACTS)!!.toSet()
+                val selectedContacts = data.extras!!.getStringArray(EXTRA_RESULT_SELECTED_CONTACTS)!!.toSet()
                 val changedMembers = members + selectedContacts
                 updateMembers(changedMembers)
             }
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
index bc5c77b11d..e71554fb20 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
@@ -15,33 +15,27 @@ import network.loki.messenger.R
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.mms.GlideApp
 
-const val EXTRA_SELECTED_CONTACTS = "SELECTED_CONTACTS_RESULT"
+const val EXTRA_RESULT_SELECTED_CONTACTS = "RESULT_SELECTED_CONTACTS"
+//const val RESULT_CREATE_PRIVATE_CHAT = 100;
 
 class SelectContactsActivity : PassphraseRequiredActionBarActivity(), LoaderManager.LoaderCallbacks<List<String>> {
     private var members = listOf<String>()
         set(value) { field = value; selectContactsAdapter.members = value }
 
-    private val selectContactsAdapter by lazy {
-        val glide = GlideApp.with(this)
-        val result = SelectContactsAdapter(this, glide)
-        result
-    }
-
-    private val selectedMembers: Set<String>
-        get() { return selectContactsAdapter.selectedMembers }
-
-    companion object {
-        public val createNewPrivateChatResultCode = 100
-    }
+    private lateinit var selectContactsAdapter: SelectContactsAdapter
 
     // region Lifecycle
     override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
         super.onCreate(savedInstanceState, isReady)
         setContentView(R.layout.activity_select_contacts)
         supportActionBar!!.title = resources.getString(R.string.activity_select_contacts_title)
+
+        this.selectContactsAdapter = SelectContactsAdapter(this, GlideApp.with(this))
         recyclerView.adapter = selectContactsAdapter
         recyclerView.layoutManager = LinearLayoutManager(this)
-        btnCreateNewPrivateChat.setOnClickListener { createNewPrivateChat() }
+
+//        btnCreateNewPrivateChat.setOnClickListener { closeAndCreatePrivateChat() }
+
         LoaderManager.getInstance(this).initLoader(0, null, this)
     }
 
@@ -74,25 +68,24 @@ class SelectContactsActivity : PassphraseRequiredActionBarActivity(), LoaderMana
 
     // region Interaction
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        val id = item.itemId
-        when(id) {
-            R.id.doneButton -> returnContacts()
-            else -> { /* Do nothing */ }
+        when(item.itemId) {
+            R.id.doneButton -> closeAndReturnSelected()
         }
         return super.onOptionsItemSelected(item)
     }
 
-    private fun createNewPrivateChat() {
-        setResult(createNewPrivateChatResultCode)
-        finish()
-    }
+//    private fun closeAndCreatePrivateChat() {
+//        setResult(RESULT_CREATE_PRIVATE_CHAT)
+//        finish()
+//    }
 
-    private fun returnContacts() {
-        val selectedMembers = this.selectedMembers
+    private fun closeAndReturnSelected() {
+        val selectedMembers = this.selectContactsAdapter.selectedMembers
         val selectedContacts = selectedMembers.toTypedArray()
-        val data = Intent()
-        data.putExtra(EXTRA_SELECTED_CONTACTS, selectedContacts)
-        setResult(Activity.RESULT_OK, data)
+        val intent = Intent()
+        intent.putExtra(EXTRA_RESULT_SELECTED_CONTACTS, selectedContacts)
+        setResult(Activity.RESULT_OK, intent)
         finish()
     }
+    // endregion
 }
\ No newline at end of file

From 3e05a616ced3fbeb1e6ea15378cdeb2da03a942b Mon Sep 17 00:00:00 2001
From: Anton Chekulaev <metaphore@bk.ru>
Date: Fri, 14 Aug 2020 19:26:56 +1000
Subject: [PATCH 15/30] Edit closed group activity layout refactoring.

---
 res/layout/activity_edit_closed_group.xml     | 196 +++++++++++++-----
 res/layout/activity_settings.xml              |   2 +-
 res/layout/view_conversation.xml              |   2 +-
 res/layout/view_mention_candidate.xml         |   2 +-
 .../activities/EditClosedGroupActivity.kt     |  49 +++--
 .../loki/activities/SettingsActivity.kt       |   6 +-
 .../securesms/loki/views/ConversationView.kt  |   2 +-
 .../loki/views/MentionCandidateView.kt        |   2 +-
 8 files changed, 176 insertions(+), 85 deletions(-)

diff --git a/res/layout/activity_edit_closed_group.xml b/res/layout/activity_edit_closed_group.xml
index 074b726fb6..d0591d39db 100644
--- a/res/layout/activity_edit_closed_group.xml
+++ b/res/layout/activity_edit_closed_group.xml
@@ -2,7 +2,9 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/default_session_background">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:background="@drawable/default_session_background"
+    tools:context="org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivity">
 
     <LinearLayout
         android:id="@+id/mainContentContainer"
@@ -18,66 +20,152 @@
             android:layout_marginTop="@dimen/small_spacing"
             android:layout_marginRight="@dimen/large_spacing">
 
-            <ImageView
-                android:id="@+id/btnCancelGroupNameEdit"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:layout_toLeftOf="@+id/edtGroupName"
-                android:layout_centerVertical="true"
-                android:src="@drawable/ic_close_white_24dp"
-                android:visibility="gone" />
-
-            <EditText
-                style="@style/SessionEditText"
-                android:id="@+id/edtGroupName"
-                android:layout_width="@dimen/album_total_width"
+            <LinearLayout
+                android:id="@+id/cntGroupNameEdit"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:textAlignment="center"
-                android:paddingTop="12dp"
-                android:paddingBottom="@dimen/large_spacing"
-                android:paddingHorizontal="@dimen/large_spacing"
+                android:layout_centerVertical="true"
+                android:orientation="horizontal"
                 android:visibility="invisible"
-                android:hint="@string/activity_edit_closed_group_edit_text_hint" />
+                tools:visibility="visible">
 
-            <TextView
-                android:id="@+id/txvGroupNameDisplay"
-                android:layout_width="wrap_content"
+                <ImageView
+                    android:id="@+id/btnCancelGroupNameEdit"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_close_white_24dp"/>
+
+                <EditText
+                    style="@style/SessionEditText"
+                    android:id="@+id/edtGroupName"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:layout_gravity="center"
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="4dp"
+                    android:textAlignment="center"
+                    android:inputType="text"
+                    android:singleLine="true"
+                    android:imeOptions="actionDone"
+                    android:hint="@string/activity_edit_closed_group_edit_text_hint" />
+
+                <ImageView
+                    android:id="@+id/btnSaveGroupNameEdit"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/ic_check_white_24dp"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/cntGroupNameDisplay"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_centerInParent="true"
-                android:textColor="@color/text"
-                android:textSize="@dimen/very_large_font_size"
-                android:textStyle="bold"
-                android:drawableRight="@drawable/ic_edit_white_24dp"
-                android:drawablePadding="@dimen/small_spacing"/>
-
-            <ImageView
-                android:id="@+id/btnSaveGroupName"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:src="@drawable/ic_check_white_24dp"
-                android:layout_toRightOf="@+id/edtGroupName"
                 android:layout_centerVertical="true"
-                android:visibility="gone" />
+                android:paddingVertical="@dimen/medium_spacing"
+                android:gravity="center"
+                android:visibility="visible"
+                tools:visibility="invisible">
+
+                <TextView
+                    android:id="@+id/lblGroupNameDisplay"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:textColor="@color/text"
+                    android:textSize="@dimen/very_large_font_size"
+                    android:textStyle="bold"
+                    android:textAlignment="center"
+                    android:paddingStart="24dp"
+                    android:paddingEnd="0dp"
+                    android:drawableEnd="@drawable/ic_edit_white_24dp"
+                    android:drawablePadding="@dimen/small_spacing"
+                    tools:text="SomeGroupName"/>
+            </LinearLayout>
 
         </RelativeLayout>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-            <View
-                android:layout_weight="2"
-                android:layout_height="0px"
-                android:layout_width="@dimen/large_spacing"/>
+<!--        <RelativeLayout-->
+<!--            android:id="@+id/ctnGroupNameSection"-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content"-->
+<!--            android:layout_marginLeft="@dimen/large_spacing"-->
+<!--            android:layout_marginTop="@dimen/small_spacing"-->
+<!--            android:layout_marginRight="@dimen/large_spacing"-->
+<!--            tools:visibility="gone">-->
 
-            <View
-                android:layout_weight="2"
-                android:layout_height="0px"
-                android:layout_width="@dimen/large_spacing"
-                />
+<!--            <ImageView-->
+<!--                android:id="@+id/btnCancelGroupNameEdit"-->
+<!--                android:layout_width="36dp"-->
+<!--                android:layout_height="36dp"-->
+<!--                android:layout_toLeftOf="@+id/edtGroupName"-->
+<!--                android:layout_centerVertical="true"-->
+<!--                android:src="@drawable/ic_close_white_24dp"-->
+<!--                android:visibility="gone" />-->
 
+<!--            <EditText-->
+<!--                style="@style/SessionEditText"-->
+<!--                android:id="@+id/edtGroupName"-->
+<!--                android:layout_width="@dimen/album_total_width"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_centerInParent="true"-->
+<!--                android:textAlignment="center"-->
+<!--                android:visibility="invisible"-->
+<!--                android:hint="@string/activity_edit_closed_group_edit_text_hint" />-->
+<!--&lt;!&ndash;            android:layout_width="@dimen/album_total_width"&ndash;&gt;-->
+<!--&lt;!&ndash;            android:paddingTop="12dp"&ndash;&gt;-->
+<!--&lt;!&ndash;            android:paddingBottom="@dimen/large_spacing"&ndash;&gt;-->
+<!--&lt;!&ndash;            android:paddingHorizontal="@dimen/large_spacing"&ndash;&gt;-->
 
-        </LinearLayout>
+<!--&lt;!&ndash;            <EditText&ndash;&gt;-->
+<!--&lt;!&ndash;                style="@style/SessionEditText"&ndash;&gt;-->
+<!--&lt;!&ndash;                android:id="@+id/nameEditText"&ndash;&gt;-->
+<!--&lt;!&ndash;                android:layout_width="match_parent"&ndash;&gt;-->
+<!--&lt;!&ndash;                android:layout_height="wrap_content"&ndash;&gt;-->
+<!--&lt;!&ndash;                android:layout_marginLeft="@dimen/large_spacing"&ndash;&gt;-->
+<!--&lt;!&ndash;                android:layout_marginTop="@dimen/medium_spacing"&ndash;&gt;-->
+<!--&lt;!&ndash;                android:layout_marginRight="@dimen/large_spacing"&ndash;&gt;-->
+<!--&lt;!&ndash;                android:layout_marginBottom="@dimen/medium_spacing"&ndash;&gt;-->
+<!--&lt;!&ndash;                android:hint="@string/activity_create_closed_group_edit_text_hint" />&ndash;&gt;-->
+
+<!--            <TextView-->
+<!--                android:id="@+id/btnGroupNameDisplay"-->
+<!--                android:layout_width="wrap_content"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:layout_centerInParent="true"-->
+<!--                android:textColor="@color/text"-->
+<!--                android:textSize="@dimen/very_large_font_size"-->
+<!--                android:textStyle="bold"-->
+<!--                android:drawableRight="@drawable/ic_edit_white_24dp"-->
+<!--                android:drawablePadding="@dimen/small_spacing"/>-->
+
+<!--            <ImageView-->
+<!--                android:id="@+id/imgSaveGroupName"-->
+<!--                android:layout_width="36dp"-->
+<!--                android:layout_height="36dp"-->
+<!--                android:src="@drawable/ic_check_white_24dp"-->
+<!--                android:layout_toRightOf="@+id/edtGroupName"-->
+<!--                android:layout_centerVertical="true"-->
+<!--                android:visibility="gone" />-->
+
+<!--        </RelativeLayout>-->
+
+<!--        &lt;!&ndash; TODO: WTF? &ndash;&gt;-->
+<!--        <LinearLayout-->
+<!--            android:layout_width="match_parent"-->
+<!--            android:layout_height="wrap_content">-->
+<!--            <View-->
+<!--                android:layout_weight="2"-->
+<!--                android:layout_height="0px"-->
+<!--                android:layout_width="@dimen/large_spacing"/>-->
+<!--            <View-->
+<!--                android:layout_weight="2"-->
+<!--                android:layout_height="0px"-->
+<!--                android:layout_width="@dimen/large_spacing"/>-->
+<!--        </LinearLayout>-->
 
         <TextView
             android:layout_width="match_parent"
@@ -92,8 +180,6 @@
             android:textAlignment="center"
             android:text="@string/activity_edit_closed_group_explanation" />
 
-
-
         <View
             android:layout_width="match_parent"
             android:layout_height="1px"
@@ -106,9 +192,9 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/large_spacing"
+                android:layout_marginStart="@dimen/large_spacing"
                 android:layout_marginTop="@dimen/small_spacing"
-                android:layout_marginRight="@dimen/massive_spacing"
+                android:layout_marginEnd="@dimen/massive_spacing"
                 android:layout_marginBottom="@dimen/small_spacing"
                 android:layout_weight="1"
                 android:alpha="0.8"
@@ -133,7 +219,7 @@
         <android.support.v7.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent" />
+            android:layout_height="match_parent"/>
 
     </LinearLayout>
 
diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml
index df55e40f5e..3f41cde6b9 100644
--- a/res/layout/activity_settings.xml
+++ b/res/layout/activity_settings.xml
@@ -97,7 +97,7 @@
                     android:hint="@string/activity_settings_display_name_edit_text_hint" />
 
                 <TextView
-                    android:id="@+id/txvGroupNameDisplay"
+                    android:id="@+id/btnGroupNameDisplay"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
diff --git a/res/layout/view_conversation.xml b/res/layout/view_conversation.xml
index 73aeb1df21..1311687555 100644
--- a/res/layout/view_conversation.xml
+++ b/res/layout/view_conversation.xml
@@ -35,7 +35,7 @@
             android:gravity="center_vertical">
 
             <TextView
-                android:id="@+id/txvGroupNameDisplay"
+                android:id="@+id/btnGroupNameDisplay"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:maxLines="1"
diff --git a/res/layout/view_mention_candidate.xml b/res/layout/view_mention_candidate.xml
index 886eb2576f..6fd635a84c 100644
--- a/res/layout/view_mention_candidate.xml
+++ b/res/layout/view_mention_candidate.xml
@@ -30,7 +30,7 @@
     </RelativeLayout>
 
     <TextView
-        android:id="@+id/txvGroupNameDisplay"
+        android:id="@+id/btnGroupNameDisplay"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/medium_spacing"
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
index 0e9b7d13c4..8916fa0387 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
@@ -9,13 +9,12 @@ import android.support.v7.widget.LinearLayoutManager
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
+import android.view.inputmethod.EditorInfo
 import android.view.inputmethod.InputMethodManager
 import android.widget.Toast
 import kotlinx.android.synthetic.main.activity_create_closed_group.emptyStateContainer
 import kotlinx.android.synthetic.main.activity_create_closed_group.mainContentContainer
 import kotlinx.android.synthetic.main.activity_edit_closed_group.*
-import kotlinx.android.synthetic.main.activity_edit_closed_group.ctnGroupNameSection
-import kotlinx.android.synthetic.main.activity_edit_closed_group.txvGroupNameDisplay
 import kotlinx.android.synthetic.main.activity_linked_devices.recyclerView
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
@@ -45,7 +44,11 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
     private var nameHasChanged = false
 
     private var isEditingGroupName = false
-        set(value) { field = value; handleIsEditingDisplayNameChanged() }
+        set(value) {
+            if (field == value) return
+            field = value
+            handleIsEditingDisplayNameChanged()
+        }
 
     // region Lifecycle
     override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
@@ -54,14 +57,10 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
 
         this.groupID = intent.getStringExtra(EXTRA_GROUP_ID)
         this.originalName = DatabaseFactory.getGroupDatabase(this).getGroup(groupID).get().title
+        this.newGroupDisplayName = this.originalName
 
         supportActionBar!!.title = resources.getString(R.string.activity_edit_closed_group_title)
 
-        txvGroupNameDisplay.text = originalName
-        ctnGroupNameSection.setOnClickListener { showEditDisplayNameUI() }
-        btnCancelGroupNameEdit.setOnClickListener { cancelEditingDisplayName() }
-        btnSaveGroupName.setOnClickListener { saveDisplayName() }
-
         addMembersClosedGroupButton.setOnClickListener { onAddMembersClick() }
 
         this.memberListAdapter = EditClosedGroupMembersAdapter(
@@ -72,6 +71,21 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
         recyclerView.adapter = this.memberListAdapter
         recyclerView.layoutManager = LinearLayoutManager(this)
 
+        lblGroupNameDisplay.text = this.originalName
+        cntGroupNameDisplay.setOnClickListener { isEditingGroupName = true }
+        btnCancelGroupNameEdit.setOnClickListener { isEditingGroupName = false }
+        btnSaveGroupNameEdit.setOnClickListener { saveDisplayName() }
+        edtGroupName.setImeActionLabel(getString(R.string.save), EditorInfo.IME_ACTION_DONE)
+        edtGroupName.setOnEditorActionListener { _, actionId, _ ->
+            when (actionId) {
+                EditorInfo.IME_ACTION_DONE -> {
+                    saveDisplayName()
+                    return@setOnEditorActionListener true
+                }
+                else -> return@setOnEditorActionListener false
+            }
+        }
+
         // Setup member list loader.
         LoaderManager.getInstance(this).initLoader(LOADER_ID_MEMBERS, null, object : LoaderManager.LoaderCallbacks<List<String>> {
             override fun onCreateLoader(id: Int, bundle: Bundle?): Loader<List<String>> {
@@ -101,8 +115,6 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
     // endregion
 
     // region Updating
-
-
     private fun updateMembers(members: Set<String>) {
         this.members.clear()
         this.members.addAll(members)
@@ -121,13 +133,6 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
         return super.onOptionsItemSelected(item)
     }
 
-    private fun showEditDisplayNameUI() {
-        isEditingGroupName = true
-    }
-    private fun cancelEditingDisplayName() {
-        isEditingGroupName = false
-    }
-
     private fun onMemberClick(member: String) {
         val bottomSheet = GroupEditingOptionsBottomSheet()
         bottomSheet.onRemoveTapped = {
@@ -161,12 +166,12 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
     }
 
     private fun handleIsEditingDisplayNameChanged() {
-        btnCancelGroupNameEdit.visibility = if (isEditingGroupName) View.VISIBLE else View.GONE
-        btnSaveGroupName.visibility = if (isEditingGroupName) View.VISIBLE else View.GONE
-        txvGroupNameDisplay.visibility = if (isEditingGroupName) View.INVISIBLE else View.VISIBLE
-        edtGroupName.visibility = if (isEditingGroupName) View.VISIBLE else View.INVISIBLE
+        cntGroupNameEdit.visibility = if (isEditingGroupName) View.VISIBLE else View.INVISIBLE
+        cntGroupNameDisplay.visibility = if (isEditingGroupName) View.INVISIBLE else View.VISIBLE
         val inputMethodManager = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
         if (isEditingGroupName) {
+            edtGroupName.setText(newGroupDisplayName)
+            edtGroupName.selectAll()
             edtGroupName.requestFocus()
             inputMethodManager.showSoftInput(edtGroupName, 0)
         } else {
@@ -186,7 +191,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
             return Toast.makeText(this, R.string.activity_settings_display_name_too_long_error, Toast.LENGTH_SHORT).show()
         }
         newGroupDisplayName = groupDisplayName
-        txvGroupNameDisplay.text = groupDisplayName
+        lblGroupNameDisplay.text = groupDisplayName
         nameHasChanged = true
         isEditingGroupName = false
     }
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
index 20086dc391..c96a7d0a96 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
@@ -78,7 +78,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
         profilePictureView.update()
         profilePictureView.setOnClickListener { showEditProfilePictureUI() }
         ctnGroupNameSection.setOnClickListener { showEditDisplayNameUI() }
-        txvGroupNameDisplay.text = DatabaseFactory.getLokiUserDatabase(this).getDisplayName(hexEncodedPublicKey)
+        btnGroupNameDisplay.text = DatabaseFactory.getLokiUserDatabase(this).getDisplayName(hexEncodedPublicKey)
         publicKeyTextView.text = hexEncodedPublicKey
         copyButton.setOnClickListener { copyPublicKey() }
         shareButton.setOnClickListener { sharePublicKey() }
@@ -132,7 +132,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
         cancelButton.visibility = if (isEditingDisplayName) View.VISIBLE else View.GONE
         showQRCodeButton.visibility = if (isEditingDisplayName) View.GONE else View.VISIBLE
         saveButton.visibility = if (isEditingDisplayName) View.VISIBLE else View.GONE
-        txvGroupNameDisplay.visibility = if (isEditingDisplayName) View.INVISIBLE else View.VISIBLE
+        btnGroupNameDisplay.visibility = if (isEditingDisplayName) View.INVISIBLE else View.VISIBLE
         displayNameEditText.visibility = if (isEditingDisplayName) View.VISIBLE else View.INVISIBLE
         val titleTextViewLayoutParams = titleTextView.layoutParams as LinearLayout.LayoutParams
         titleTextViewLayoutParams.leftMargin = if (isEditingDisplayName) toPx(16, resources) else 0
@@ -176,7 +176,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
         }
         all(promises).alwaysUi {
             if (displayName != null) {
-                txvGroupNameDisplay.text = displayName
+                btnGroupNameDisplay.text = displayName
             }
             displayNameToBeUploaded = null
             if (isUpdatingProfilePicture && profilePicture != null) {
diff --git a/src/org/thoughtcrime/securesms/loki/views/ConversationView.kt b/src/org/thoughtcrime/securesms/loki/views/ConversationView.kt
index ce8092d2ff..73463326d7 100644
--- a/src/org/thoughtcrime/securesms/loki/views/ConversationView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/ConversationView.kt
@@ -80,7 +80,7 @@ class ConversationView : LinearLayout {
         profilePictureView.glide = glide
         profilePictureView.update()
         val senderDisplayName = if (thread.recipient.isLocalNumber) context.getString(R.string.note_to_self) else if (!thread.recipient.name.isNullOrEmpty()) thread.recipient.name else thread.recipient.address.toString()
-        txvGroupNameDisplay.text = senderDisplayName
+        btnGroupNameDisplay.text = senderDisplayName
         timestampTextView.text = DateUtils.getBriefRelativeTimeSpanString(context, Locale.getDefault(), thread.date)
         muteIndicatorImageView.visibility = if (thread.recipient.isMuted) VISIBLE else GONE
         val rawSnippet = thread.getDisplayBody(context)
diff --git a/src/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt b/src/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt
index 392f234d7f..1e6a0d057c 100644
--- a/src/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/MentionCandidateView.kt
@@ -30,7 +30,7 @@ class MentionCandidateView(context: Context, attrs: AttributeSet?, defStyleAttr:
     }
 
     private fun update() {
-        txvGroupNameDisplay.text = mentionCandidate.displayName
+        btnGroupNameDisplay.text = mentionCandidate.displayName
         profilePictureView.publicKey = mentionCandidate.publicKey
         profilePictureView.additionalPublicKey = null
         profilePictureView.isRSSFeed = false

From 64f3bfd41d8984b70a7ea2768c6f48ae8f1d4654 Mon Sep 17 00:00:00 2001
From: Anton Chekulaev <metaphore@bk.ru>
Date: Mon, 17 Aug 2020 10:53:02 +1000
Subject: [PATCH 16/30] Closed group protocol stub update method.

---
 .../activities/EditClosedGroupActivity.kt     | 21 ++++++++++++++++++-
 .../loki/protocol/ClosedGroupsProtocol.kt     | 12 +++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
index 8916fa0387..6830ca1418 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
@@ -22,9 +22,13 @@ import org.thoughtcrime.securesms.database.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.groups.GroupManager
 import org.thoughtcrime.securesms.loki.dialogs.GroupEditingOptionsBottomSheet
+import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocol
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.recipients.Recipient
+import org.thoughtcrime.securesms.util.GroupUtil
 import org.whispersystems.signalservice.api.crypto.ProfileCipher
+import org.whispersystems.signalservice.loki.utilities.toHexString
+import java.io.IOException
 
 const val EXTRA_GROUP_ID = "GROUP_ID"
 const val REQ_CODE_ADD_USERS = 124
@@ -226,7 +230,22 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
             return Toast.makeText(this, R.string.activity_edit_closed_group_too_many_group_members_error, Toast.LENGTH_LONG).show()
         }
 
-        GroupManager.updateGroup(this, groupID, finalGroupMembers, null, groupDisplayName, finalGroupAdmins)
+        var isSSKBasedClosedGroup: Boolean
+        var groupPublicKey: String?
+        try {
+            groupPublicKey = GroupUtil.getDecodedId(groupID).toHexString()
+            isSSKBasedClosedGroup = DatabaseFactory.getSSKDatabase(this).isSSKBasedClosedGroup(groupPublicKey)
+        } catch (e: IOException) {
+            groupPublicKey = null
+            isSSKBasedClosedGroup = false
+        }
+
+        if (isSSKBasedClosedGroup) {
+            //TODO AC: Should it use "groupPublicKey" or "groupID"?
+            ClosedGroupsProtocol.updateGroup(this, groupPublicKey!!, finalGroupMembers, null, groupDisplayName, finalGroupAdmins)
+        } else {
+            GroupManager.updateGroup(this, groupID, finalGroupMembers, null, groupDisplayName, finalGroupAdmins)
+        }
         finish()
     }
 }
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt b/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
index d43492b48b..3d63c3c26e 100644
--- a/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
+++ b/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.loki.protocol
 
 import android.content.Context
+import android.graphics.Bitmap
 import android.util.Log
 import com.google.protobuf.ByteString
 import org.thoughtcrime.securesms.ApplicationContext
@@ -182,6 +183,17 @@ object ClosedGroupsProtocol {
         insertOutgoingInfoMessage(context, groupID, GroupContext.Type.QUIT, name, members, admins, threadID)
     }
 
+    //TODO AC: This is a reflection of GroupManager's update API.
+    // It needs a valid implementation and probably the signature should be refactored a bit.
+    public fun updateGroup(context: Context,
+                           groupPublicKey: String,
+                           members: Collection<Recipient>,
+                           avatar: Bitmap?,
+                           name: String,
+                           admins: Collection<Recipient>) {
+        // STUB
+    }
+
     @JvmStatic
     public fun requestSenderKey(context: Context, groupPublicKey: String, senderPublicKey: String) {
         // Establish session if needed

From b6b5282a51e0294af10413fe3494a2df51e78760 Mon Sep 17 00:00:00 2001
From: Anton Chekulaev <metaphore@bk.ru>
Date: Mon, 17 Aug 2020 11:10:31 +1000
Subject: [PATCH 17/30] Edit closed group activity follows the same data
 validation as create closed group activity.

---
 .../activities/EditClosedGroupActivity.kt     | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
index 6830ca1418..4a35a912b2 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
@@ -26,7 +26,6 @@ import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocol
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.GroupUtil
-import org.whispersystems.signalservice.api.crypto.ProfileCipher
 import org.whispersystems.signalservice.loki.utilities.toHexString
 import java.io.IOException
 
@@ -34,6 +33,9 @@ const val EXTRA_GROUP_ID = "GROUP_ID"
 const val REQ_CODE_ADD_USERS = 124
 const val LOADER_ID_MEMBERS = 0
 
+const val MAX_GROUP_MEMBERS_LEGACY = 10
+const val MAX_GROUP_MEMBERS_SSK = 50
+
 class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
 
     private lateinit var memberListAdapter: EditClosedGroupMembersAdapter
@@ -186,14 +188,15 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
     private fun saveDisplayName() {
         val groupDisplayName = edtGroupName.text.toString().trim()
         if (groupDisplayName.isEmpty()) {
-            return Toast.makeText(this, R.string.activity_settings_display_name_missing_error, Toast.LENGTH_SHORT).show()
+            return Toast.makeText(this, R.string.activity_edit_closed_group_group_name_missing_error, Toast.LENGTH_SHORT).show()
         }
-        if (!groupDisplayName.matches(Regex("[a-zA-Z0-9_]+"))) {
-            return Toast.makeText(this, R.string.activity_settings_invalid_display_name_error, Toast.LENGTH_SHORT).show()
-        }
-        if (groupDisplayName.toByteArray().size > ProfileCipher.NAME_PADDED_LENGTH) {
-            return Toast.makeText(this, R.string.activity_settings_display_name_too_long_error, Toast.LENGTH_SHORT).show()
+//        if (groupDisplayName.toByteArray().size > ProfileCipher.NAME_PADDED_LENGTH) {
+        if (groupDisplayName.length >= 64) {
+            return Toast.makeText(this, R.string.activity_edit_closed_group_group_name_too_long_error, Toast.LENGTH_SHORT).show()
         }
+//        if (!groupDisplayName.matches(Regex("[a-zA-Z0-9_]+"))) {
+//            return Toast.makeText(this, R.string.activity_settings_invalid_display_name_error, Toast.LENGTH_SHORT).show()
+//        }
         newGroupDisplayName = groupDisplayName
         lblGroupNameDisplay.text = groupDisplayName
         nameHasChanged = true
@@ -219,17 +222,6 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
 //        }.toSet()
         val finalGroupAdmins = finalGroupMembers.toSet() //TODO For now, consider all the users are admins.
 
-
-        if (groupDisplayName.length >= 64) {
-            return Toast.makeText(this, R.string.activity_edit_closed_group_group_name_too_long_error, Toast.LENGTH_LONG).show()
-        }
-        if (finalGroupMembers.size < 2) {
-            return Toast.makeText(this, R.string.activity_edit_closed_group_not_enough_group_members_error, Toast.LENGTH_LONG).show()
-        }
-        if (finalGroupMembers.size > 10) {
-            return Toast.makeText(this, R.string.activity_edit_closed_group_too_many_group_members_error, Toast.LENGTH_LONG).show()
-        }
-
         var isSSKBasedClosedGroup: Boolean
         var groupPublicKey: String?
         try {
@@ -240,6 +232,14 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
             isSSKBasedClosedGroup = false
         }
 
+        if (finalGroupMembers.size < 2) {
+            return Toast.makeText(this, R.string.activity_edit_closed_group_not_enough_group_members_error, Toast.LENGTH_LONG).show()
+        }
+        val maxGroupMembers = if (isSSKBasedClosedGroup) MAX_GROUP_MEMBERS_SSK else MAX_GROUP_MEMBERS_LEGACY
+        if (finalGroupMembers.size > maxGroupMembers) {
+            return Toast.makeText(this, R.string.activity_edit_closed_group_too_many_group_members_error, Toast.LENGTH_LONG).show()
+        }
+
         if (isSSKBasedClosedGroup) {
             //TODO AC: Should it use "groupPublicKey" or "groupID"?
             ClosedGroupsProtocol.updateGroup(this, groupPublicKey!!, finalGroupMembers, null, groupDisplayName, finalGroupAdmins)

From e4d2e572cac626dfbcad7510c41c88b8c4485d5a Mon Sep 17 00:00:00 2001
From: Anton Chekulaev <metaphore@bk.ru>
Date: Mon, 17 Aug 2020 12:12:25 +1000
Subject: [PATCH 18/30] User cannot remove himself from the edit closed group
 activity.

---
 .../activities/CreateClosedGroupActivity.kt   |  1 +
 .../activities/EditClosedGroupActivity.kt     |  9 +++--
 .../loki/activities/EditClosedGroupLoader.kt  |  5 ++-
 .../EditClosedGroupMembersAdapter.kt          | 36 +++++++++++++------
 .../loki/activities/SelectContactsAdapter.kt  |  7 +++-
 .../fragments/ContactSelectionListAdapter.kt  |  7 ++--
 .../securesms/loki/views/UserView.kt          | 25 +++++++++----
 7 files changed, 66 insertions(+), 24 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
index f4efe23150..2282860b69 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
@@ -51,6 +51,7 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), LoaderM
         recyclerView.layoutManager = LinearLayoutManager(this)
 
         btnCreateNewPrivateChat.setOnClickListener { createNewPrivateChat() }
+
         LoaderManager.getInstance(this).initLoader(0, null, this)
     }
 
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
index 4a35a912b2..cb6e80f5ea 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
@@ -26,6 +26,7 @@ import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocol
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.recipients.Recipient
 import org.thoughtcrime.securesms.util.GroupUtil
+import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.signalservice.loki.utilities.toHexString
 import java.io.IOException
 
@@ -95,7 +96,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
         // Setup member list loader.
         LoaderManager.getInstance(this).initLoader(LOADER_ID_MEMBERS, null, object : LoaderManager.LoaderCallbacks<List<String>> {
             override fun onCreateLoader(id: Int, bundle: Bundle?): Loader<List<String>> {
-                return EditClosedGroupLoader(groupID, this@EditClosedGroupActivity)
+                return EditClosedGroupLoader(this@EditClosedGroupActivity, groupID)
             }
 
             override fun onLoadFinished(loader: Loader<List<String>>, members: List<String>) {
@@ -124,7 +125,11 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
     private fun updateMembers(members: Set<String>) {
         this.members.clear()
         this.members.addAll(members)
-        this.memberListAdapter.setItems(members)
+        this.memberListAdapter.setMembers(members)
+
+        val localUserPublicKey = TextSecurePreferences.getLocalNumber(this)
+        this.memberListAdapter.setLockedMembers(arrayListOf(localUserPublicKey))
+
         mainContentContainer.visibility = if (members.isEmpty()) View.GONE else View.VISIBLE
         emptyStateContainer.visibility = if (members.isEmpty()) View.VISIBLE else View.GONE
         invalidateOptionsMenu()
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
index 467423ac90..32a7d32e44 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
@@ -5,7 +5,10 @@ import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.loki.utilities.ContactUtilities
 import org.thoughtcrime.securesms.util.AsyncLoader
 
-class EditClosedGroupLoader(val groupID: String, context: Context) : AsyncLoader<List<String>>(context) {
+class EditClosedGroupLoader(
+        context: Context,
+        val groupID: String
+) : AsyncLoader<List<String>>(context) {
 
     override fun loadInBackground(): List<String> {
         val members = DatabaseFactory.getGroupDatabase(context).getGroupMembers(groupID, true)
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
index 965018f51a..f394a7aa3a 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
@@ -14,17 +14,22 @@ class EditClosedGroupMembersAdapter(
         private val memberClickListener: ((String) -> Unit)? = null
 ) : RecyclerView.Adapter<EditClosedGroupMembersAdapter.ViewHolder>() {
 
-    private val items = ArrayList<String>()
+    private val members = ArrayList<String>()
+    private val lockedMembers = HashSet<String>()
 
-//    private val selectedItems = mutableSetOf<String>()
-
-    fun setItems(items: Collection<String>) {
-        this.items.clear()
-        this.items.addAll(items)
+    fun setMembers(members: Collection<String>) {
+        this.members.clear()
+        this.members.addAll(members)
         notifyDataSetChanged()
     }
 
-    override fun getItemCount(): Int = items.size
+    fun setLockedMembers(members: Collection<String>) {
+        this.lockedMembers.clear()
+        this.lockedMembers.addAll(members)
+        notifyDataSetChanged()
+    }
+
+    override fun getItemCount(): Int = members.size
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         val view = UserView(context)
@@ -32,10 +37,19 @@ class EditClosedGroupMembersAdapter(
     }
 
     override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
-        val item = items[position]
-//        val isSelected = selectedItems.contains(item)
-        viewHolder.view.bind(Recipient.from(context, Address.fromSerialized(item), false), false, glide, true)
-        viewHolder.view.setOnClickListener { this.memberClickListener?.invoke(item) }
+        val member = members[position]
+
+        val lockedMember = lockedMembers.contains(member)
+
+        viewHolder.view.bind(Recipient.from(
+                context,
+                Address.fromSerialized(member), false),
+                glide,
+                (if (lockedMember) UserView.ActionIndicator.NONE else UserView.ActionIndicator.MENU))
+
+        if (!lockedMember) {
+            viewHolder.view.setOnClickListener { this.memberClickListener?.invoke(member) }
+        }
     }
 
     class ViewHolder(val view: UserView) : RecyclerView.ViewHolder(view)
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
index 01278737e4..aa908154ac 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
@@ -33,7 +33,12 @@ class SelectContactsAdapter(
         val member = members[position]
         viewHolder.view.setOnClickListener { onMemberClick(member) }
         val isSelected = selectedMembers.contains(member)
-        viewHolder.view.bind(Recipient.from(context, Address.fromSerialized(member), false), isSelected, glide, false)
+        viewHolder.view.bind(Recipient.from(
+                context,
+                Address.fromSerialized(member), false),
+                glide,
+                UserView.ActionIndicator.CHECK_BOX,
+                isSelected)
     }
 
     private fun onMemberClick(member: String) {
diff --git a/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt b/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt
index 5c7b85fa25..fb1e5c54d3 100644
--- a/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt
@@ -52,8 +52,11 @@ class ContactSelectionListAdapter(private val context: Context, private val mult
             item as ContactSelectionListItem.Contact
             viewHolder.view.setOnClickListener { contactClickListener?.onContactClick(item.recipient) }
             val isSelected = selectedContacts.contains(item.recipient)
-            viewHolder.view.bind(item.recipient, isSelected, glide, false)
-            viewHolder.view.setCheckBoxVisible(multiSelect)
+            viewHolder.view.bind(
+                    item.recipient,
+                    glide,
+                    if (multiSelect) UserView.ActionIndicator.CHECK_BOX else UserView.ActionIndicator.NONE,
+                    isSelected)
         } else if (viewHolder is DividerViewHolder) {
             item as ContactSelectionListItem.Header
             viewHolder.view.label.text = item.name
diff --git a/src/org/thoughtcrime/securesms/loki/views/UserView.kt b/src/org/thoughtcrime/securesms/loki/views/UserView.kt
index 98e4a77955..da549f654b 100644
--- a/src/org/thoughtcrime/securesms/loki/views/UserView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/UserView.kt
@@ -40,11 +40,13 @@ class UserView : LinearLayout {
     // endregion
 
     // region Updating
-    fun setCheckBoxVisible(visible: Boolean) {
-        tickImageView.visibility = if (visible) View.VISIBLE else View.GONE
+    enum class ActionIndicator {
+        NONE,
+        MENU,
+        CHECK_BOX,
     }
 
-    fun bind(user: Recipient, isSelected: Boolean, glide: GlideRequests, isEditingGroup: Boolean) {
+    fun bind(user: Recipient, glide: GlideRequests, actionIndicator: ActionIndicator, isSelected: Boolean = false) {
         val address = user.address.serialize()
         if (user.isGroupRecipient) {
             if ("Session Public Chat" == user.name || user.address.isRSSFeed) {
@@ -70,10 +72,19 @@ class UserView : LinearLayout {
         profilePictureView.glide = glide
         profilePictureView.update()
         nameTextView.text = user.name ?: "Unknown Contact"
-        if (isEditingGroup) {
-            tickImageView.setImageResource(R.drawable.ic_more_horiz_white)
-        } else {
-            tickImageView.setImageResource(if (isSelected) R.drawable.ic_circle_check else R.drawable.ic_circle)
+
+        when (actionIndicator) {
+            ActionIndicator.NONE -> {
+                tickImageView.visibility = View.GONE
+            }
+            ActionIndicator.MENU -> {
+                tickImageView.visibility = View.VISIBLE
+                tickImageView.setImageResource(R.drawable.ic_more_horiz_white)
+            }
+            ActionIndicator.CHECK_BOX -> {
+                tickImageView.visibility = View.VISIBLE
+                tickImageView.setImageResource(if (isSelected) R.drawable.ic_circle_check else R.drawable.ic_circle)
+            }
         }
     }
     // endregion

From 5fb569030adf442a16b86da3fe04b07b002aba48 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Mon, 17 Aug 2020 14:39:13 +1000
Subject: [PATCH 19/30] Disable SSKs for now

---
 .../securesms/loki/protocol/ClosedGroupsProtocol.kt             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt b/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
index 7eb0f694da..e91ef2ce4d 100644
--- a/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
+++ b/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
@@ -31,7 +31,7 @@ import java.io.IOException
 import java.util.*
 
 object ClosedGroupsProtocol {
-    val isSharedSenderKeysEnabled = true
+    val isSharedSenderKeysEnabled = false
     
     public fun createClosedGroup(context: Context, name: String, members: Collection<String>): String {
         // Prepare

From 18870b7e7b3c9bb6308b0bb67cf194b0cd4797af Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 18 Aug 2020 08:29:03 +1000
Subject: [PATCH 20/30] Remove unused code

---
 res/layout/activity_edit_closed_group.xml | 83 +----------------------
 res/layout/activity_select_contacts.xml   |  8 ---
 2 files changed, 2 insertions(+), 89 deletions(-)

diff --git a/res/layout/activity_edit_closed_group.xml b/res/layout/activity_edit_closed_group.xml
index d0591d39db..4d218791f1 100644
--- a/res/layout/activity_edit_closed_group.xml
+++ b/res/layout/activity_edit_closed_group.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
@@ -88,85 +89,6 @@
 
         </RelativeLayout>
 
-<!--        <RelativeLayout-->
-<!--            android:id="@+id/ctnGroupNameSection"-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="wrap_content"-->
-<!--            android:layout_marginLeft="@dimen/large_spacing"-->
-<!--            android:layout_marginTop="@dimen/small_spacing"-->
-<!--            android:layout_marginRight="@dimen/large_spacing"-->
-<!--            tools:visibility="gone">-->
-
-<!--            <ImageView-->
-<!--                android:id="@+id/btnCancelGroupNameEdit"-->
-<!--                android:layout_width="36dp"-->
-<!--                android:layout_height="36dp"-->
-<!--                android:layout_toLeftOf="@+id/edtGroupName"-->
-<!--                android:layout_centerVertical="true"-->
-<!--                android:src="@drawable/ic_close_white_24dp"-->
-<!--                android:visibility="gone" />-->
-
-<!--            <EditText-->
-<!--                style="@style/SessionEditText"-->
-<!--                android:id="@+id/edtGroupName"-->
-<!--                android:layout_width="@dimen/album_total_width"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_centerInParent="true"-->
-<!--                android:textAlignment="center"-->
-<!--                android:visibility="invisible"-->
-<!--                android:hint="@string/activity_edit_closed_group_edit_text_hint" />-->
-<!--&lt;!&ndash;            android:layout_width="@dimen/album_total_width"&ndash;&gt;-->
-<!--&lt;!&ndash;            android:paddingTop="12dp"&ndash;&gt;-->
-<!--&lt;!&ndash;            android:paddingBottom="@dimen/large_spacing"&ndash;&gt;-->
-<!--&lt;!&ndash;            android:paddingHorizontal="@dimen/large_spacing"&ndash;&gt;-->
-
-<!--&lt;!&ndash;            <EditText&ndash;&gt;-->
-<!--&lt;!&ndash;                style="@style/SessionEditText"&ndash;&gt;-->
-<!--&lt;!&ndash;                android:id="@+id/nameEditText"&ndash;&gt;-->
-<!--&lt;!&ndash;                android:layout_width="match_parent"&ndash;&gt;-->
-<!--&lt;!&ndash;                android:layout_height="wrap_content"&ndash;&gt;-->
-<!--&lt;!&ndash;                android:layout_marginLeft="@dimen/large_spacing"&ndash;&gt;-->
-<!--&lt;!&ndash;                android:layout_marginTop="@dimen/medium_spacing"&ndash;&gt;-->
-<!--&lt;!&ndash;                android:layout_marginRight="@dimen/large_spacing"&ndash;&gt;-->
-<!--&lt;!&ndash;                android:layout_marginBottom="@dimen/medium_spacing"&ndash;&gt;-->
-<!--&lt;!&ndash;                android:hint="@string/activity_create_closed_group_edit_text_hint" />&ndash;&gt;-->
-
-<!--            <TextView-->
-<!--                android:id="@+id/btnGroupNameDisplay"-->
-<!--                android:layout_width="wrap_content"-->
-<!--                android:layout_height="wrap_content"-->
-<!--                android:layout_centerInParent="true"-->
-<!--                android:textColor="@color/text"-->
-<!--                android:textSize="@dimen/very_large_font_size"-->
-<!--                android:textStyle="bold"-->
-<!--                android:drawableRight="@drawable/ic_edit_white_24dp"-->
-<!--                android:drawablePadding="@dimen/small_spacing"/>-->
-
-<!--            <ImageView-->
-<!--                android:id="@+id/imgSaveGroupName"-->
-<!--                android:layout_width="36dp"-->
-<!--                android:layout_height="36dp"-->
-<!--                android:src="@drawable/ic_check_white_24dp"-->
-<!--                android:layout_toRightOf="@+id/edtGroupName"-->
-<!--                android:layout_centerVertical="true"-->
-<!--                android:visibility="gone" />-->
-
-<!--        </RelativeLayout>-->
-
-<!--        &lt;!&ndash; TODO: WTF? &ndash;&gt;-->
-<!--        <LinearLayout-->
-<!--            android:layout_width="match_parent"-->
-<!--            android:layout_height="wrap_content">-->
-<!--            <View-->
-<!--                android:layout_weight="2"-->
-<!--                android:layout_height="0px"-->
-<!--                android:layout_width="@dimen/large_spacing"/>-->
-<!--            <View-->
-<!--                android:layout_weight="2"-->
-<!--                android:layout_height="0px"-->
-<!--                android:layout_width="@dimen/large_spacing"/>-->
-<!--        </LinearLayout>-->
-
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -233,5 +155,4 @@
 
     </LinearLayout>
 
-
 </RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/activity_select_contacts.xml b/res/layout/activity_select_contacts.xml
index b412e82ecf..c319dfe884 100644
--- a/res/layout/activity_select_contacts.xml
+++ b/res/layout/activity_select_contacts.xml
@@ -33,14 +33,6 @@
             android:textColor="@color/text"
             android:text="@string/activity_create_closed_group_empty_state_message" />
 
-<!--        <Button-->
-<!--            style="@style/MediumProminentOutlineButton"-->
-<!--            android:id="@+id/btnCreateNewPrivateChat"-->
-<!--            android:layout_width="196dp"-->
-<!--            android:layout_height="@dimen/medium_button_height"-->
-<!--            android:layout_marginTop="@dimen/medium_spacing"-->
-<!--            android:text="@string/activity_create_closed_group_empty_state_button_title" />-->
-
     </LinearLayout>
 
 </RelativeLayout>
\ No newline at end of file

From 5b641f441584cc7a5d6837aeae0eac6b48e0e8fa Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 18 Aug 2020 08:55:17 +1000
Subject: [PATCH 21/30] Minor refactoring

---
 res/layout/activity_edit_closed_group.xml     | 13 -------
 .../fragment_group_edit_bottom_sheet.xml      |  8 ----
 res/layout/view_user.xml                      |  2 +-
 res/values/strings.xml                        | 37 +++++++++----------
 .../activities/CreateClosedGroupActivity.kt   | 37 +++++++++++--------
 .../EditClosedGroupMembersAdapter.kt          |  2 +-
 .../securesms/loki/activities/HomeActivity.kt |  2 +-
 .../loki/activities/MemberClickListener.kt    |  6 ---
 .../loki/activities/SelectContactsAdapter.kt  |  2 +-
 .../fragments/ContactSelectionListAdapter.kt  |  2 +-
 .../securesms/loki/views/UserView.kt          | 35 ++++++++----------
 11 files changed, 60 insertions(+), 86 deletions(-)
 delete mode 100644 src/org/thoughtcrime/securesms/loki/activities/MemberClickListener.kt

diff --git a/res/layout/activity_edit_closed_group.xml b/res/layout/activity_edit_closed_group.xml
index 4d218791f1..9bcbfac4c3 100644
--- a/res/layout/activity_edit_closed_group.xml
+++ b/res/layout/activity_edit_closed_group.xml
@@ -89,19 +89,6 @@
 
         </RelativeLayout>
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/large_spacing"
-            android:layout_marginTop="@dimen/medium_spacing"
-            android:layout_marginRight="@dimen/large_spacing"
-            android:layout_marginBottom="@dimen/medium_spacing"
-            android:textSize="@dimen/small_font_size"
-            android:textColor="@color/text"
-            android:alpha="0.6"
-            android:textAlignment="center"
-            android:text="@string/activity_edit_closed_group_explanation" />
-
         <View
             android:layout_width="match_parent"
             android:layout_height="1px"
diff --git a/res/layout/fragment_group_edit_bottom_sheet.xml b/res/layout/fragment_group_edit_bottom_sheet.xml
index 3c56dfa5e6..cc68d18380 100644
--- a/res/layout/fragment_group_edit_bottom_sheet.xml
+++ b/res/layout/fragment_group_edit_bottom_sheet.xml
@@ -17,12 +17,4 @@
         android:textColor="@color/text"
         android:text="@string/fragment_edit_group_bottom_sheet_remove"/>
 
-<!--    <TextView-->
-<!--        android:id="@+id/makeAdministrator"-->
-<!--        style="@style/ActionItem"-->
-<!--        android:drawableStart="@drawable/ic_edit_white_24dp"-->
-<!--        android:textSize="@dimen/medium_font_size"-->
-<!--        android:textColor="@color/text"-->
-<!--        android:text="@string/fragment_edit_group_bottom_sheet_admin" />-->
-
 </LinearLayout>
diff --git a/res/layout/view_user.xml b/res/layout/view_user.xml
index 8df24dc6a5..34ffd6947a 100644
--- a/res/layout/view_user.xml
+++ b/res/layout/view_user.xml
@@ -37,7 +37,7 @@
             android:layout_weight="1" />
 
         <ImageView
-            android:id="@+id/tickImageView"
+            android:id="@+id/actionIndicatorImageView"
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_marginLeft="@dimen/medium_spacing"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d2ca522451..88844b54fa 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1751,25 +1751,6 @@
     <string name="activity_create_closed_group_too_many_group_members_error">A closed group cannot have more than 10 members</string>
     <string name="activity_create_closed_group_invalid_session_id_error">One of the members of your group has an invalid Session ID</string>
 
-    <string name="activity_edit_closed_group_title">Edit Closed Group</string>
-    <string name="activity_edit_closed_group_edit_text_hint">Enter a new group name</string>
-    <string name="activity_edit_closed_group_explanation">Closed groups support up to 10 members and provide the same privacy protections as one-on-one sessions.</string>
-    <string name="activity_edit_closed_group_edit_members">Edit members</string>
-    <string name="activity_edit_closed_group_add_members">Add members</string>
-    <string name="activity_edit_closed_group_group_name_missing_error">Group name can\'t be empty</string>
-    <string name="activity_edit_closed_group_group_name_too_long_error">Please enter a shorter group name</string>
-    <string name="activity_edit_closed_group_not_enough_group_members_error">Groups must have at least 2 group members</string>
-    <string name="activity_edit_closed_group_too_many_group_members_error">A closed group cannot have more than 10 members</string>
-    <string name="activity_edit_closed_group_invalid_session_id_error">One of the members of your group has an invalid Session ID</string>
-    <string name="activity_edit_closed_group_confirm_removal">Are you sure you want to remove this user?</string>
-    <string name="activity_edit_closed_group_member_removed">User removed from group</string>
-
-
-    <string name="fragment_edit_group_bottom_sheet_remove">Remove user from group</string>
-    <string name="fragment_edit_group_bottom_sheet_admin">Make this user a group admin</string>
-
-    <string name="activity_select_contacts_title">Select Contacts</string>
-
     <string name="activity_join_public_chat_title">Join Open Group</string>
     <string name="activity_join_public_chat_error">Couldn\'t join group</string>
     <string name="activity_join_public_chat_enter_group_url_tab_title">Open Group URL</string>
@@ -1852,4 +1833,22 @@
     <string name="menu_apply_button">Apply</string>
     <string name="menu_done_button">Done</string>
 
+    <!-- Next round of translation -->
+
+    <string name="activity_edit_closed_group_title">Edit Closed Group</string>
+    <string name="activity_edit_closed_group_edit_text_hint">Enter a new group name</string>
+    <string name="activity_edit_closed_group_edit_members">Edit members</string>
+    <string name="activity_edit_closed_group_add_members">Add members</string>
+    <string name="activity_edit_closed_group_group_name_missing_error">Group name can\'t be empty</string>
+    <string name="activity_edit_closed_group_group_name_too_long_error">Please enter a shorter group name</string>
+    <string name="activity_edit_closed_group_not_enough_group_members_error">Groups must have at least 2 group members</string>
+    <string name="activity_edit_closed_group_too_many_group_members_error">A closed group cannot have more than 10 members</string>
+    <string name="activity_edit_closed_group_invalid_session_id_error">One of the members of your group has an invalid Session ID</string>
+    <string name="activity_edit_closed_group_confirm_removal">Are you sure you want to remove this user?</string>
+    <string name="activity_edit_closed_group_member_removed">User removed from group</string>
+
+    <string name="fragment_edit_group_bottom_sheet_remove">Remove user from group</string>
+
+    <string name="activity_select_contacts_title">Select Contacts</string>
+
 </resources>
diff --git a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
index 2282860b69..3108f5f699 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
@@ -28,25 +28,28 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.libsignal.util.guava.Optional
 import java.lang.ref.WeakReference
 
-const val RESULT_CODE_CREATE_CLOSED_GROUP = 100
-
 class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), LoaderManager.LoaderCallbacks<List<String>> {
-
-    private lateinit var selectContactsAdapter: SelectContactsAdapter
-
     private var members = listOf<String>()
         set(value) {
             field = value
             selectContactsAdapter.members = value
         }
 
+    private val selectContactsAdapter by lazy {
+        SelectContactsAdapter(this, GlideApp.with(this))
+    }
+
+    companion object {
+        val closedGroupCreatedResultCode = 100
+    }
+
     // region Lifecycle
     override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
         super.onCreate(savedInstanceState, isReady)
+
         setContentView(R.layout.activity_create_closed_group)
         supportActionBar!!.title = resources.getString(R.string.activity_create_closed_group_title)
 
-        this.selectContactsAdapter = SelectContactsAdapter(this, GlideApp.with(this))
         recyclerView.adapter = this.selectContactsAdapter
         recyclerView.layoutManager = LinearLayoutManager(this)
 
@@ -91,7 +94,7 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), LoaderM
     }
 
     private fun createNewPrivateChat() {
-        setResult(RESULT_CODE_CREATE_CLOSED_GROUP)
+        setResult(Companion.closedGroupCreatedResultCode)
         finish()
     }
 
@@ -145,17 +148,17 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), LoaderM
         val masterHexEncodedPublicKey = TextSecurePreferences.getMasterHexEncodedPublicKey(this) ?: TextSecurePreferences.getLocalNumber(this)
         val admin = Recipient.from(this, Address.fromSerialized(masterHexEncodedPublicKey), false)
         CreateClosedGroupTask(WeakReference(this), null, name.toString(), recipients, setOf( admin ))
-                .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR)
+            .executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR)
     }
     // endregion
 
-    // region Tasks
+    // region Group Creation Task (Legacy)
     internal class CreateClosedGroupTask(
-            private val activity: WeakReference<CreateClosedGroupActivity>,
-            private val profilePicture: Bitmap?,
-            private val name: String?,
-            private val members: Set<Recipient>,
-            private val admins: Set<Recipient>
+        private val activity: WeakReference<CreateClosedGroupActivity>,
+        private val profilePicture: Bitmap?,
+        private val name: String?,
+        private val members: Set<Recipient>,
+        private val admins: Set<Recipient>
     ) : AsyncTask<Void, Void, Optional<GroupManager.GroupActionResult>>() {
 
         override fun doInBackground(vararg params: Void?): Optional<GroupManager.GroupActionResult> {
@@ -176,13 +179,15 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), LoaderM
             }
         }
     }
-    // endregion
 }
+// endregion
 
+// region Convenience
 private fun openConversationActivity(context: Context, threadId: Long, recipient: Recipient) {
     val intent = Intent(context, ConversationActivity::class.java)
     intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, threadId)
     intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT)
     intent.putExtra(ConversationActivity.ADDRESS_EXTRA, recipient.address)
     context.startActivity(intent)
-}
\ No newline at end of file
+}
+// endregion
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
index f394a7aa3a..c0b1840262 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
@@ -45,7 +45,7 @@ class EditClosedGroupMembersAdapter(
                 context,
                 Address.fromSerialized(member), false),
                 glide,
-                (if (lockedMember) UserView.ActionIndicator.NONE else UserView.ActionIndicator.MENU))
+                (if (lockedMember) UserView.ActionIndicator.None else UserView.ActionIndicator.Menu))
 
         if (!lockedMember) {
             viewHolder.view.setOnClickListener { this.memberClickListener?.invoke(member) }
diff --git a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
index b670bf14d5..1c799248d9 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
@@ -223,7 +223,7 @@ class HomeActivity : PassphraseRequiredActionBarActivity, ConversationClickListe
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
-        if (resultCode == RESULT_CODE_CREATE_CLOSED_GROUP) {
+        if (resultCode == CreateClosedGroupActivity.closedGroupCreatedResultCode) {
             createNewPrivateChat()
         }
     }
diff --git a/src/org/thoughtcrime/securesms/loki/activities/MemberClickListener.kt b/src/org/thoughtcrime/securesms/loki/activities/MemberClickListener.kt
deleted file mode 100644
index b5b0eeaa1e..0000000000
--- a/src/org/thoughtcrime/securesms/loki/activities/MemberClickListener.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.thoughtcrime.securesms.loki.activities
-
-@FunctionalInterface
-interface MemberClickListener {
-    fun onMemberClick(member: String)
-}
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
index aa908154ac..10e13f23c9 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
@@ -37,7 +37,7 @@ class SelectContactsAdapter(
                 context,
                 Address.fromSerialized(member), false),
                 glide,
-                UserView.ActionIndicator.CHECK_BOX,
+                UserView.ActionIndicator.Tick,
                 isSelected)
     }
 
diff --git a/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt b/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt
index fb1e5c54d3..1180305d5d 100644
--- a/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt
@@ -55,7 +55,7 @@ class ContactSelectionListAdapter(private val context: Context, private val mult
             viewHolder.view.bind(
                     item.recipient,
                     glide,
-                    if (multiSelect) UserView.ActionIndicator.CHECK_BOX else UserView.ActionIndicator.NONE,
+                    if (multiSelect) UserView.ActionIndicator.Tick else UserView.ActionIndicator.None,
                     isSelected)
         } else if (viewHolder is DividerViewHolder) {
             item as ContactSelectionListItem.Header
diff --git a/src/org/thoughtcrime/securesms/loki/views/UserView.kt b/src/org/thoughtcrime/securesms/loki/views/UserView.kt
index da549f654b..3305294a34 100644
--- a/src/org/thoughtcrime/securesms/loki/views/UserView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/UserView.kt
@@ -15,6 +15,12 @@ import org.whispersystems.signalservice.loki.protocol.mentions.MentionsManager
 
 class UserView : LinearLayout {
 
+    enum class ActionIndicator {
+        None,
+        Menu,
+        Tick
+    }
+
     // region Lifecycle
     constructor(context: Context) : super(context) {
         setUpViewHierarchy()
@@ -40,12 +46,6 @@ class UserView : LinearLayout {
     // endregion
 
     // region Updating
-    enum class ActionIndicator {
-        NONE,
-        MENU,
-        CHECK_BOX,
-    }
-
     fun bind(user: Recipient, glide: GlideRequests, actionIndicator: ActionIndicator, isSelected: Boolean = false) {
         val address = user.address.serialize()
         if (user.isGroupRecipient) {
@@ -55,35 +55,32 @@ class UserView : LinearLayout {
                 profilePictureView.isRSSFeed = true
             } else {
                 val threadID = GroupManager.getThreadIDFromGroupID(address, context)
-                val users = MentionsManager.shared.userPublicKeyCache[threadID]?.toList()
-                        ?: listOf()
+                val users = MentionsManager.shared.userPublicKeyCache[threadID]?.toList() ?: listOf()
                 val randomUsers = users.sorted() // Sort to provide a level of stability
                 profilePictureView.publicKey = randomUsers.getOrNull(0) ?: ""
                 profilePictureView.additionalPublicKey = randomUsers.getOrNull(1) ?: ""
                 profilePictureView.isRSSFeed = false
-
             }
         } else {
             profilePictureView.publicKey = address
             profilePictureView.additionalPublicKey = null
             profilePictureView.isRSSFeed = false
         }
-        tickImageView.setImageResource(R.drawable.ic_edit_white_24dp)
+        actionIndicatorImageView.setImageResource(R.drawable.ic_edit_white_24dp)
         profilePictureView.glide = glide
         profilePictureView.update()
         nameTextView.text = user.name ?: "Unknown Contact"
-
         when (actionIndicator) {
-            ActionIndicator.NONE -> {
-                tickImageView.visibility = View.GONE
+            ActionIndicator.None -> {
+                actionIndicatorImageView.visibility = View.GONE
             }
-            ActionIndicator.MENU -> {
-                tickImageView.visibility = View.VISIBLE
-                tickImageView.setImageResource(R.drawable.ic_more_horiz_white)
+            ActionIndicator.Menu -> {
+                actionIndicatorImageView.visibility = View.VISIBLE
+                actionIndicatorImageView.setImageResource(R.drawable.ic_more_horiz_white)
             }
-            ActionIndicator.CHECK_BOX -> {
-                tickImageView.visibility = View.VISIBLE
-                tickImageView.setImageResource(if (isSelected) R.drawable.ic_circle_check else R.drawable.ic_circle)
+            ActionIndicator.Tick -> {
+                actionIndicatorImageView.visibility = View.VISIBLE
+                actionIndicatorImageView.setImageResource(if (isSelected) R.drawable.ic_circle_check else R.drawable.ic_circle)
             }
         }
     }

From fdec8eae4b521b2c17980a75394935e02fe4fff0 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 18 Aug 2020 09:01:55 +1000
Subject: [PATCH 22/30] Fill in stub

---
 .../activities/EditClosedGroupActivity.kt     |  3 ++-
 .../loki/protocol/ClosedGroupsProtocol.kt     | 26 ++++++++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
index cb6e80f5ea..dfa13e8003 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
@@ -247,7 +247,8 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
 
         if (isSSKBasedClosedGroup) {
             //TODO AC: Should it use "groupPublicKey" or "groupID"?
-            ClosedGroupsProtocol.updateGroup(this, groupPublicKey!!, finalGroupMembers, null, groupDisplayName, finalGroupAdmins)
+            ClosedGroupsProtocol.update(this, groupPublicKey!!, finalGroupMembers.map { it.address.serialize() },
+                groupDisplayName, finalGroupAdmins.map { it.address.serialize() })
         } else {
             GroupManager.updateGroup(this, groupID, finalGroupMembers, null, groupDisplayName, finalGroupAdmins)
         }
diff --git a/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt b/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
index 13c416fe55..9ec9fe5563 100644
--- a/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
+++ b/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
@@ -184,15 +184,23 @@ object ClosedGroupsProtocol {
         insertOutgoingInfoMessage(context, groupID, GroupContext.Type.QUIT, name, members, admins, threadID)
     }
 
-    //TODO AC: This is a reflection of GroupManager's update API.
-    // It needs a valid implementation and probably the signature should be refactored a bit.
-    public fun updateGroup(context: Context,
-                           groupPublicKey: String,
-                           members: Collection<Recipient>,
-                           avatar: Bitmap?,
-                           name: String,
-                           admins: Collection<Recipient>) {
-        // STUB
+    public fun update(context: Context, groupPublicKey: String, members: Collection<String>, name: String, admins: Collection<String>) {
+        val groupDB = DatabaseFactory.getGroupDatabase(context)
+        val groupID = doubleEncodeGroupID(groupPublicKey)
+        if (groupDB.getGroup(groupID).orNull() == null) {
+            Log.d("Loki", "Can't update nonexistent closed group.")
+            return
+        }
+        // Send the update to the group
+        val closedGroupUpdateKind = ClosedGroupUpdateMessageSendJob.Kind.Info(Hex.fromStringCondensed(groupPublicKey),
+            name, setOf(), members.map { Hex.fromStringCondensed(it) }, admins.map { Hex.fromStringCondensed(it) })
+        val job = ClosedGroupUpdateMessageSendJob(groupPublicKey, closedGroupUpdateKind)
+        ApplicationContext.getInstance(context).jobManager.add(job)
+        // Update the group
+        groupDB.updateMembers(groupID, members.map { Address.fromSerialized(it) })
+        // Notify the user
+        val threadID = DatabaseFactory.getThreadDatabase(context).getThreadIdFor(Recipient.from(context, Address.fromSerialized(groupID), false))
+        insertOutgoingInfoMessage(context, groupID, GroupContext.Type.UPDATE, name, members, admins, threadID)
     }
 
     @JvmStatic

From 74dac8479678265323d608c8c70fc7ab02182e84 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 18 Aug 2020 09:34:22 +1000
Subject: [PATCH 23/30] Implement remaining feedback

---
 ...agment_closed_group_edit_bottom_sheet.xml} |   0
 .../conversation/ConversationActivity.java    |   2 +-
 .../activities/CreateClosedGroupActivity.kt   |   2 +-
 .../activities/EditClosedGroupActivity.kt     | 220 ++++++++----------
 .../loki/activities/EditClosedGroupLoader.kt  |   6 +-
 .../EditClosedGroupMembersAdapter.kt          |  15 +-
 .../loki/activities/SelectContactsActivity.kt |  24 +-
 .../loki/activities/SelectContactsAdapter.kt  |  17 +-
 ...> ClosedGroupEditingOptionsBottomSheet.kt} |   8 +-
 .../loki/protocol/ClosedGroupsProtocol.kt     |   1 +
 10 files changed, 133 insertions(+), 162 deletions(-)
 rename res/layout/{fragment_group_edit_bottom_sheet.xml => fragment_closed_group_edit_bottom_sheet.xml} (100%)
 rename src/org/thoughtcrime/securesms/loki/dialogs/{GroupEditingOptionsBottomSheet.kt => ClosedGroupEditingOptionsBottomSheet.kt} (63%)

diff --git a/res/layout/fragment_group_edit_bottom_sheet.xml b/res/layout/fragment_closed_group_edit_bottom_sheet.xml
similarity index 100%
rename from res/layout/fragment_group_edit_bottom_sheet.xml
rename to res/layout/fragment_closed_group_edit_bottom_sheet.xml
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 1ae9015448..8d71df078d 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -1199,7 +1199,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private void handleEditPushGroup() {
     Intent intent = new Intent(this, EditClosedGroupActivity.class);
     String groupID = this.recipient.getAddress().toGroupString();
-    intent.putExtra(EditClosedGroupActivityKt.EXTRA_GROUP_ID, groupID);
+    intent.putExtra(EditClosedGroupActivity.Companion.getGroupIDKey(), groupID);
     startActivity(intent);
   }
 
diff --git a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
index 3108f5f699..2add7f3e56 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
@@ -118,7 +118,7 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), LoaderM
         if (selectedMembers.count() < 2) {
             return Toast.makeText(this, R.string.activity_create_closed_group_not_enough_group_members_error, Toast.LENGTH_LONG).show()
         }
-        if (selectedMembers.count() > 49) { // Minus one because we're going to include self later
+        if (selectedMembers.count() > ClosedGroupsProtocol.groupSizeLimit) { // Minus one because we're going to include self later
             return Toast.makeText(this, R.string.activity_create_closed_group_too_many_group_members_error, Toast.LENGTH_LONG).show()
         }
         val userPublicKey = TextSecurePreferences.getLocalNumber(this)
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
index dfa13e8003..75f6f2a18d 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
@@ -21,7 +21,7 @@ import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.database.Address
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.groups.GroupManager
-import org.thoughtcrime.securesms.loki.dialogs.GroupEditingOptionsBottomSheet
+import org.thoughtcrime.securesms.loki.dialogs.ClosedGroupEditingOptionsBottomSheet
 import org.thoughtcrime.securesms.loki.protocol.ClosedGroupsProtocol
 import org.thoughtcrime.securesms.mms.GlideApp
 import org.thoughtcrime.securesms.recipients.Recipient
@@ -30,71 +30,66 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences
 import org.whispersystems.signalservice.loki.utilities.toHexString
 import java.io.IOException
 
-const val EXTRA_GROUP_ID = "GROUP_ID"
-const val REQ_CODE_ADD_USERS = 124
-const val LOADER_ID_MEMBERS = 0
-
-const val MAX_GROUP_MEMBERS_LEGACY = 10
-const val MAX_GROUP_MEMBERS_SSK = 50
-
 class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
-
-    private lateinit var memberListAdapter: EditClosedGroupMembersAdapter
     private val originalMembers = HashSet<String>()
     private val members = HashSet<String>()
-//    private var adminMembers = HashSet<String>()
+    private var hasNameChanged = false
 
     private lateinit var groupID: String
     private lateinit var originalName: String
-    private lateinit var newGroupDisplayName: String
+    private lateinit var name: String
 
-    private var nameHasChanged = false
-
-    private var isEditingGroupName = false
+    private var isEditingName = false
         set(value) {
             if (field == value) return
             field = value
-            handleIsEditingDisplayNameChanged()
+            handleIsEditingNameChanged()
         }
 
+    private val memberListAdapter by lazy {
+        EditClosedGroupMembersAdapter(this, GlideApp.with(this), this::onMemberClick)
+    }
+
+    companion object {
+        @JvmStatic val groupIDKey = "groupIDKey"
+        private val loaderID = 0
+        val addUsersRequestCode = 124
+        val legacyGroupSizeLimit = 10
+    }
+
     // region Lifecycle
     override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
         super.onCreate(savedInstanceState, isReady)
+
         setContentView(R.layout.activity_edit_closed_group)
-
-        this.groupID = intent.getStringExtra(EXTRA_GROUP_ID)
-        this.originalName = DatabaseFactory.getGroupDatabase(this).getGroup(groupID).get().title
-        this.newGroupDisplayName = this.originalName
-
         supportActionBar!!.title = resources.getString(R.string.activity_edit_closed_group_title)
 
+        groupID = intent.getStringExtra(Companion.groupIDKey)
+        originalName = DatabaseFactory.getGroupDatabase(this).getGroup(groupID).get().title
+        name = originalName
+
         addMembersClosedGroupButton.setOnClickListener { onAddMembersClick() }
 
-        this.memberListAdapter = EditClosedGroupMembersAdapter(
-                this,
-                GlideApp.with(this),
-                this::onMemberClick
-        )
-        recyclerView.adapter = this.memberListAdapter
+        recyclerView.adapter = memberListAdapter
         recyclerView.layoutManager = LinearLayoutManager(this)
 
-        lblGroupNameDisplay.text = this.originalName
-        cntGroupNameDisplay.setOnClickListener { isEditingGroupName = true }
-        btnCancelGroupNameEdit.setOnClickListener { isEditingGroupName = false }
-        btnSaveGroupNameEdit.setOnClickListener { saveDisplayName() }
+        lblGroupNameDisplay.text = originalName
+        cntGroupNameDisplay.setOnClickListener { isEditingName = true }
+        btnCancelGroupNameEdit.setOnClickListener { isEditingName = false }
+        btnSaveGroupNameEdit.setOnClickListener { saveName() }
         edtGroupName.setImeActionLabel(getString(R.string.save), EditorInfo.IME_ACTION_DONE)
         edtGroupName.setOnEditorActionListener { _, actionId, _ ->
             when (actionId) {
                 EditorInfo.IME_ACTION_DONE -> {
-                    saveDisplayName()
+                    saveName()
                     return@setOnEditorActionListener true
                 }
                 else -> return@setOnEditorActionListener false
             }
         }
 
-        // Setup member list loader.
-        LoaderManager.getInstance(this).initLoader(LOADER_ID_MEMBERS, null, object : LoaderManager.LoaderCallbacks<List<String>> {
+        LoaderManager.getInstance(this).initLoader(Companion.loaderID, null, object : LoaderManager.LoaderCallbacks<List<String>> {
+
             override fun onCreateLoader(id: Int, bundle: Bundle?): Loader<List<String>> {
                 return EditClosedGroupLoader(this@EditClosedGroupActivity, groupID)
             }
@@ -102,7 +97,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
             override fun onLoadFinished(loader: Loader<List<String>>, members: List<String>) {
                 // We no longer need any subsequent loading events
                 // (they will occur on every activity resume).
-                LoaderManager.getInstance(this@EditClosedGroupActivity).destroyLoader(LOADER_ID_MEMBERS)
+                LoaderManager.getInstance(this@EditClosedGroupActivity).destroyLoader(Companion.loaderID)
 
                 originalMembers.clear()
                 originalMembers.addAll(members.toHashSet())
@@ -122,66 +117,26 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
     // endregion
 
     // region Updating
-    private fun updateMembers(members: Set<String>) {
-        this.members.clear()
-        this.members.addAll(members)
-        this.memberListAdapter.setMembers(members)
-
-        val localUserPublicKey = TextSecurePreferences.getLocalNumber(this)
-        this.memberListAdapter.setLockedMembers(arrayListOf(localUserPublicKey))
-
-        mainContentContainer.visibility = if (members.isEmpty()) View.GONE else View.VISIBLE
-        emptyStateContainer.visibility = if (members.isEmpty()) View.VISIBLE else View.GONE
-        invalidateOptionsMenu()
-    }
-    // endregion
-
-    // region Interaction
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when(item.itemId) {
-            R.id.applyButton -> commitClosedGroupChanges()
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
-    private fun onMemberClick(member: String) {
-        val bottomSheet = GroupEditingOptionsBottomSheet()
-        bottomSheet.onRemoveTapped = {
-            val changedMembers = members - member
-            updateMembers(changedMembers)
-            bottomSheet.dismiss()
-        }
- //       bottomSheet.onAdminTapped = {
- //           bottomSheet.dismiss()
- //       }
-        bottomSheet.show(supportFragmentManager, "MEMBER_BOTTOM_SHEET")
-    }
-
-    private fun onAddMembersClick() {
-        val intent = Intent(this@EditClosedGroupActivity, SelectContactsActivity::class.java)
-        startActivityForResult(intent, REQ_CODE_ADD_USERS)
-    }
-
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         when (requestCode) {
-            REQ_CODE_ADD_USERS -> {
+            Companion.addUsersRequestCode -> {
                 if (resultCode != RESULT_OK) return
-                if (data == null || data.extras == null || !data.hasExtra(EXTRA_RESULT_SELECTED_CONTACTS)) return
+                if (data == null || data.extras == null || !data.hasExtra(SelectContactsActivity.selectedContactsKey)) return
 
-                val selectedContacts = data.extras!!.getStringArray(EXTRA_RESULT_SELECTED_CONTACTS)!!.toSet()
+                val selectedContacts = data.extras!!.getStringArray(SelectContactsActivity.selectedContactsKey)!!.toSet()
                 val changedMembers = members + selectedContacts
                 updateMembers(changedMembers)
             }
         }
     }
 
-    private fun handleIsEditingDisplayNameChanged() {
-        cntGroupNameEdit.visibility = if (isEditingGroupName) View.VISIBLE else View.INVISIBLE
-        cntGroupNameDisplay.visibility = if (isEditingGroupName) View.INVISIBLE else View.VISIBLE
+    private fun handleIsEditingNameChanged() {
+        cntGroupNameEdit.visibility = if (isEditingName) View.VISIBLE else View.INVISIBLE
+        cntGroupNameDisplay.visibility = if (isEditingName) View.INVISIBLE else View.VISIBLE
         val inputMethodManager = getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-        if (isEditingGroupName) {
-            edtGroupName.setText(newGroupDisplayName)
+        if (isEditingName) {
+            edtGroupName.setText(name)
             edtGroupName.selectAll()
             edtGroupName.requestFocus()
             inputMethodManager.showSoftInput(edtGroupName, 0)
@@ -190,67 +145,98 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
         }
     }
 
-    private fun saveDisplayName() {
-        val groupDisplayName = edtGroupName.text.toString().trim()
-        if (groupDisplayName.isEmpty()) {
-            return Toast.makeText(this, R.string.activity_edit_closed_group_group_name_missing_error, Toast.LENGTH_SHORT).show()
+    private fun updateMembers(members: Set<String>) {
+        this.members.clear()
+        this.members.addAll(members)
+        memberListAdapter.setMembers(members)
+
+        val userPublicKey = TextSecurePreferences.getLocalNumber(this)
+        memberListAdapter.setLockedMembers(arrayListOf(userPublicKey))
+
+        mainContentContainer.visibility = if (members.isEmpty()) View.GONE else View.VISIBLE
+        emptyStateContainer.visibility = if (members.isEmpty()) View.VISIBLE else View.GONE
+
+        invalidateOptionsMenu()
+    }
+    // endregion
+
+    // region Interaction
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when(item.itemId) {
+            R.id.applyButton -> commitChanges()
         }
-//        if (groupDisplayName.toByteArray().size > ProfileCipher.NAME_PADDED_LENGTH) {
-        if (groupDisplayName.length >= 64) {
-            return Toast.makeText(this, R.string.activity_edit_closed_group_group_name_too_long_error, Toast.LENGTH_SHORT).show()
-        }
-//        if (!groupDisplayName.matches(Regex("[a-zA-Z0-9_]+"))) {
-//            return Toast.makeText(this, R.string.activity_settings_invalid_display_name_error, Toast.LENGTH_SHORT).show()
-//        }
-        newGroupDisplayName = groupDisplayName
-        lblGroupNameDisplay.text = groupDisplayName
-        nameHasChanged = true
-        isEditingGroupName = false
+        return super.onOptionsItemSelected(item)
     }
 
-    private fun commitClosedGroupChanges() {
-        val membersHaveChanged = members.size != originalMembers.size || !members.containsAll(originalMembers)
+    private fun onMemberClick(member: String) {
+        val bottomSheet = ClosedGroupEditingOptionsBottomSheet()
+        bottomSheet.onRemoveTapped = {
+            val changedMembers = members - member
+            updateMembers(changedMembers)
+            bottomSheet.dismiss()
+        }
+        bottomSheet.show(supportFragmentManager, "GroupEditingOptionsBottomSheet")
+    }
 
-        if (!nameHasChanged && !membersHaveChanged) {
-            finish()
-            return
+    private fun onAddMembersClick() {
+        val intent = Intent(this@EditClosedGroupActivity, SelectContactsActivity::class.java)
+        startActivityForResult(intent, Companion.addUsersRequestCode)
+    }
+
+    private fun saveName() {
+        val name = edtGroupName.text.toString().trim()
+        if (name.isEmpty()) {
+            return Toast.makeText(this, R.string.activity_edit_closed_group_group_name_missing_error, Toast.LENGTH_SHORT).show()
+        }
+        if (name.length >= 64) {
+            return Toast.makeText(this, R.string.activity_edit_closed_group_group_name_too_long_error, Toast.LENGTH_SHORT).show()
+        }
+        this.name = name
+        lblGroupNameDisplay.text = name
+        hasNameChanged = true
+        isEditingName = false
+    }
+
+    private fun commitChanges() {
+        val hasMemberListChanges = members != originalMembers
+
+        if (!hasNameChanged && !hasMemberListChanges) {
+            return finish()
         }
 
-        val groupDisplayName = if (nameHasChanged) newGroupDisplayName else originalName
+        val name = if (hasNameChanged) this.name else originalName
 
-        val finalGroupMembers = members.map {
+        val members = this.members.map {
             Recipient.from(this, Address.fromSerialized(it), false)
         }.toSet()
 
-//        val finalGroupAdmins = adminMembers.map {
-//            Recipient.from(this, Address.fromSerialized(it), false)
-//        }.toSet()
-        val finalGroupAdmins = finalGroupMembers.toSet() //TODO For now, consider all the users are admins.
+        val admins = members.toSet() //TODO For now, consider all the users to be admins.
 
         var isSSKBasedClosedGroup: Boolean
         var groupPublicKey: String?
         try {
-            groupPublicKey = GroupUtil.getDecodedId(groupID).toHexString()
+            groupPublicKey = ClosedGroupsProtocol.doubleDecodeGroupID(groupID).toHexString()
             isSSKBasedClosedGroup = DatabaseFactory.getSSKDatabase(this).isSSKBasedClosedGroup(groupPublicKey)
         } catch (e: IOException) {
             groupPublicKey = null
             isSSKBasedClosedGroup = false
         }
 
-        if (finalGroupMembers.size < 2) {
+        if (members.size < 2) {
             return Toast.makeText(this, R.string.activity_edit_closed_group_not_enough_group_members_error, Toast.LENGTH_LONG).show()
         }
-        val maxGroupMembers = if (isSSKBasedClosedGroup) MAX_GROUP_MEMBERS_SSK else MAX_GROUP_MEMBERS_LEGACY
-        if (finalGroupMembers.size > maxGroupMembers) {
+
+        val maxGroupMembers = if (isSSKBasedClosedGroup) ClosedGroupsProtocol.groupSizeLimit else Companion.legacyGroupSizeLimit
+        if (members.size > maxGroupMembers) {
+            // TODO: Update copy for SSK based closed groups
             return Toast.makeText(this, R.string.activity_edit_closed_group_too_many_group_members_error, Toast.LENGTH_LONG).show()
         }
 
         if (isSSKBasedClosedGroup) {
-            //TODO AC: Should it use "groupPublicKey" or "groupID"?
-            ClosedGroupsProtocol.update(this, groupPublicKey!!, finalGroupMembers.map { it.address.serialize() },
-                groupDisplayName, finalGroupAdmins.map { it.address.serialize() })
+            ClosedGroupsProtocol.update(this, groupPublicKey!!, members.map { it.address.serialize() },
+                name, admins.map { it.address.serialize() })
         } else {
-            GroupManager.updateGroup(this, groupID, finalGroupMembers, null, groupDisplayName, finalGroupAdmins)
+            GroupManager.updateGroup(this, groupID, members, null, name, admins)
         }
         finish()
     }
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
index 32a7d32e44..07d86f4a4e 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupLoader.kt
@@ -5,16 +5,12 @@ import org.thoughtcrime.securesms.database.DatabaseFactory
 import org.thoughtcrime.securesms.loki.utilities.ContactUtilities
 import org.thoughtcrime.securesms.util.AsyncLoader
 
-class EditClosedGroupLoader(
-        context: Context,
-        val groupID: String
-) : AsyncLoader<List<String>>(context) {
+class EditClosedGroupLoader(context: Context, val groupID: String) : AsyncLoader<List<String>>(context) {
 
     override fun loadInBackground(): List<String> {
         val members = DatabaseFactory.getGroupDatabase(context).getGroupMembers(groupID, true)
         return members.map {
             it.address.toPhoneString()
         }
-        /* TODO:Load admins in the process here */
     }
 }
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
index c0b1840262..2ea2a4b56a 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
@@ -9,11 +9,10 @@ import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.recipients.Recipient
 
 class EditClosedGroupMembersAdapter(
-        private val context: Context,
-        private val glide: GlideRequests,
-        private val memberClickListener: ((String) -> Unit)? = null
+    private val context: Context,
+    private val glide: GlideRequests,
+    private val memberClickListener: ((String) -> Unit)? = null
 ) : RecyclerView.Adapter<EditClosedGroupMembersAdapter.ViewHolder>() {
-
     private val members = ArrayList<String>()
     private val lockedMembers = HashSet<String>()
 
@@ -42,10 +41,10 @@ class EditClosedGroupMembersAdapter(
         val lockedMember = lockedMembers.contains(member)
 
         viewHolder.view.bind(Recipient.from(
-                context,
-                Address.fromSerialized(member), false),
-                glide,
-                (if (lockedMember) UserView.ActionIndicator.None else UserView.ActionIndicator.Menu))
+            context,
+            Address.fromSerialized(member), false),
+            glide,
+            if (lockedMember) UserView.ActionIndicator.None else UserView.ActionIndicator.Menu)
 
         if (!lockedMember) {
             viewHolder.view.setOnClickListener { this.memberClickListener?.invoke(member) }
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
index e71554fb20..5f2c3942da 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
@@ -15,27 +15,28 @@ import network.loki.messenger.R
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity
 import org.thoughtcrime.securesms.mms.GlideApp
 
-const val EXTRA_RESULT_SELECTED_CONTACTS = "RESULT_SELECTED_CONTACTS"
-//const val RESULT_CREATE_PRIVATE_CHAT = 100;
-
 class SelectContactsActivity : PassphraseRequiredActionBarActivity(), LoaderManager.LoaderCallbacks<List<String>> {
     private var members = listOf<String>()
         set(value) { field = value; selectContactsAdapter.members = value }
 
-    private lateinit var selectContactsAdapter: SelectContactsAdapter
+    private val selectContactsAdapter by lazy {
+        SelectContactsAdapter(this, GlideApp.with(this))
+    }
+
+    companion object {
+        val selectedContactsKey = "selectedContactsKey"
+    }
 
     // region Lifecycle
     override fun onCreate(savedInstanceState: Bundle?, isReady: Boolean) {
         super.onCreate(savedInstanceState, isReady)
+
         setContentView(R.layout.activity_select_contacts)
         supportActionBar!!.title = resources.getString(R.string.activity_select_contacts_title)
 
-        this.selectContactsAdapter = SelectContactsAdapter(this, GlideApp.with(this))
         recyclerView.adapter = selectContactsAdapter
         recyclerView.layoutManager = LinearLayoutManager(this)
 
-//        btnCreateNewPrivateChat.setOnClickListener { closeAndCreatePrivateChat() }
-
         LoaderManager.getInstance(this).initLoader(0, null, this)
     }
 
@@ -74,16 +75,11 @@ class SelectContactsActivity : PassphraseRequiredActionBarActivity(), LoaderMana
         return super.onOptionsItemSelected(item)
     }
 
-//    private fun closeAndCreatePrivateChat() {
-//        setResult(RESULT_CREATE_PRIVATE_CHAT)
-//        finish()
-//    }
-
     private fun closeAndReturnSelected() {
-        val selectedMembers = this.selectContactsAdapter.selectedMembers
+        val selectedMembers = selectContactsAdapter.selectedMembers
         val selectedContacts = selectedMembers.toTypedArray()
         val intent = Intent()
-        intent.putExtra(EXTRA_RESULT_SELECTED_CONTACTS, selectedContacts)
+        intent.putExtra(selectedContactsKey, selectedContacts)
         setResult(Activity.RESULT_OK, intent)
         finish()
     }
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
index 10e13f23c9..abe2849165 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
@@ -8,13 +8,8 @@ import org.thoughtcrime.securesms.loki.views.UserView
 import org.thoughtcrime.securesms.mms.GlideRequests
 import org.thoughtcrime.securesms.recipients.Recipient
 
-class SelectContactsAdapter(
-        private val context: Context,
-        private val glide: GlideRequests)
-    : RecyclerView.Adapter<SelectContactsAdapter.ViewHolder>() {
-
+class SelectContactsAdapter(private val context: Context, private val glide: GlideRequests) : RecyclerView.Adapter<SelectContactsAdapter.ViewHolder>() {
     val selectedMembers = mutableSetOf<String>()
-
     var members = listOf<String>()
         set(value) { field = value; notifyDataSetChanged() }
 
@@ -34,11 +29,11 @@ class SelectContactsAdapter(
         viewHolder.view.setOnClickListener { onMemberClick(member) }
         val isSelected = selectedMembers.contains(member)
         viewHolder.view.bind(Recipient.from(
-                context,
-                Address.fromSerialized(member), false),
-                glide,
-                UserView.ActionIndicator.Tick,
-                isSelected)
+            context,
+            Address.fromSerialized(member), false),
+            glide,
+            UserView.ActionIndicator.Tick,
+            isSelected)
     }
 
     private fun onMemberClick(member: String) {
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/GroupEditingOptionsBottomSheet.kt b/src/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt
similarity index 63%
rename from src/org/thoughtcrime/securesms/loki/dialogs/GroupEditingOptionsBottomSheet.kt
rename to src/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt
index fe967ef652..092b37bc75 100644
--- a/src/org/thoughtcrime/securesms/loki/dialogs/GroupEditingOptionsBottomSheet.kt
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt
@@ -5,20 +5,18 @@ import android.support.design.widget.BottomSheetDialogFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import kotlinx.android.synthetic.main.fragment_group_edit_bottom_sheet.*
+import kotlinx.android.synthetic.main.fragment_closed_group_edit_bottom_sheet.*
 import network.loki.messenger.R
 
-public class GroupEditingOptionsBottomSheet : BottomSheetDialogFragment() {
+public class ClosedGroupEditingOptionsBottomSheet : BottomSheetDialogFragment() {
     var onRemoveTapped: (() -> Unit)? = null
-//    var onAdminTapped: (() -> Unit)? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_group_edit_bottom_sheet, container, false)
+        return inflater.inflate(R.layout.fragment_closed_group_edit_bottom_sheet, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         removeFromGroup.setOnClickListener { onRemoveTapped?.invoke() }
-//        makeAdministrator.setOnClickListener { onAdminTapped?.invoke() }
     }
 }
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt b/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
index 9ec9fe5563..80b3f98496 100644
--- a/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
+++ b/src/org/thoughtcrime/securesms/loki/protocol/ClosedGroupsProtocol.kt
@@ -33,6 +33,7 @@ import java.util.*
 
 object ClosedGroupsProtocol {
     val isSharedSenderKeysEnabled = false
+    val groupSizeLimit = 10
     
     public fun createClosedGroup(context: Context, name: String, members: Collection<String>): String {
         // Prepare

From f0aa8438250591ea631bc8010e9ed30df03eedfa Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 18 Aug 2020 10:05:24 +1000
Subject: [PATCH 24/30] Tweak edit closed group screen layout

---
 res/layout/activity_edit_closed_group.xml     | 52 ++++++++++---------
 res/values/strings.xml                        |  4 +-
 .../conversation/ConversationActivity.java    |  1 -
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/res/layout/activity_edit_closed_group.xml b/res/layout/activity_edit_closed_group.xml
index 9bcbfac4c3..90105bc840 100644
--- a/res/layout/activity_edit_closed_group.xml
+++ b/res/layout/activity_edit_closed_group.xml
@@ -17,36 +17,35 @@
             android:id="@+id/ctnGroupNameSection"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/large_spacing"
-            android:layout_marginTop="@dimen/small_spacing"
-            android:layout_marginRight="@dimen/large_spacing">
+            android:padding="@dimen/large_spacing"
+            android:gravity="center">
 
             <LinearLayout
                 android:id="@+id/cntGroupNameEdit"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
+                android:gravity="center"
                 android:orientation="horizontal"
                 android:visibility="invisible"
                 tools:visibility="visible">
 
                 <ImageView
                     android:id="@+id/btnCancelGroupNameEdit"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_gravity="center"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
                     android:src="@drawable/ic_close_white_24dp"/>
 
                 <EditText
                     style="@style/SessionEditText"
                     android:id="@+id/edtGroupName"
-                    android:layout_width="0dp"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
                     android:layout_gravity="center"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginEnd="4dp"
+                    android:layout_marginStart="@dimen/small_spacing"
+                    android:layout_marginEnd="@dimen/small_spacing"
                     android:textAlignment="center"
+                    android:paddingTop="12dp"
+                    android:paddingBottom="12dp"
                     android:inputType="text"
                     android:singleLine="true"
                     android:imeOptions="actionDone"
@@ -54,8 +53,8 @@
 
                 <ImageView
                     android:id="@+id/btnSaveGroupNameEdit"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
                     android:layout_gravity="center"
                     android:src="@drawable/ic_check_white_24dp"/>
 
@@ -65,8 +64,6 @@
                 android:id="@+id/cntGroupNameDisplay"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:paddingVertical="@dimen/medium_spacing"
                 android:gravity="center"
                 android:visibility="visible"
                 tools:visibility="invisible">
@@ -85,6 +82,7 @@
                     android:drawableEnd="@drawable/ic_edit_white_24dp"
                     android:drawablePadding="@dimen/small_spacing"
                     tools:text="SomeGroupName"/>
+
             </LinearLayout>
 
         </RelativeLayout>
@@ -96,17 +94,17 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/large_spacing"
+                android:layout_marginStart="@dimen/medium_spacing"
                 android:layout_marginTop="@dimen/small_spacing"
-                android:layout_marginEnd="@dimen/massive_spacing"
+                android:layout_marginEnd="@dimen/small_spacing"
                 android:layout_marginBottom="@dimen/small_spacing"
                 android:layout_weight="1"
-                android:alpha="0.8"
                 android:text="@string/activity_edit_closed_group_edit_members"
                 android:textColor="@color/text"
                 android:textSize="@dimen/medium_font_size" />
@@ -114,17 +112,23 @@
             <Button
                 android:id="@+id/addMembersClosedGroupButton"
                 style="@style/MediumProminentOutlineButton"
-                android:layout_width="135dp"
+                android:layout_width="wrap_content"
                 android:layout_height="@dimen/small_button_height"
                 android:layout_marginTop="@dimen/small_spacing"
-                android:layout_marginRight="@dimen/large_spacing"
-                android:layout_marginLeft="@dimen/very_large_spacing"
+                android:layout_marginEnd="@dimen/medium_spacing"
+                android:layout_marginStart="@dimen/small_spacing"
                 android:layout_marginBottom="@dimen/small_spacing"
-                android:layout_weight="1"
+                android:paddingStart="@dimen/medium_spacing"
+                android:paddingEnd="@dimen/medium_spacing"
                 android:text="@string/activity_edit_closed_group_add_members" />
 
         </LinearLayout>
 
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="1px"
+            android:background="@color/separator" />
+
         <android.support.v7.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 88844b54fa..158f0f8a67 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1835,9 +1835,9 @@
 
     <!-- Next round of translation -->
 
-    <string name="activity_edit_closed_group_title">Edit Closed Group</string>
+    <string name="activity_edit_closed_group_title">Edit Group</string>
     <string name="activity_edit_closed_group_edit_text_hint">Enter a new group name</string>
-    <string name="activity_edit_closed_group_edit_members">Edit members</string>
+    <string name="activity_edit_closed_group_edit_members">Members</string>
     <string name="activity_edit_closed_group_add_members">Add members</string>
     <string name="activity_edit_closed_group_group_name_missing_error">Group name can\'t be empty</string>
     <string name="activity_edit_closed_group_group_name_too_long_error">Please enter a shorter group name</string>
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 8d71df078d..2d7525e804 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -153,7 +153,6 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil;
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewViewModel;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivity;
-import org.thoughtcrime.securesms.loki.activities.EditClosedGroupActivityKt;
 import org.thoughtcrime.securesms.loki.activities.HomeActivity;
 import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase;
 import org.thoughtcrime.securesms.loki.database.LokiThreadDatabaseDelegate;

From 43909c35010514f654c72114a3e8e18c79b867a7 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 18 Aug 2020 10:22:21 +1000
Subject: [PATCH 25/30] Disable member list button

---
 .../securesms/conversation/ConversationActivity.java            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 2d7525e804..2cdbe5334f 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -761,7 +761,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
         inflater.inflate(R.menu.conversation_block, menu);
       }
     } else if (isGroupConversation() && !isOpenGroupOrRSSFeed) {
-      inflater.inflate(R.menu.conversation_group_options, menu);
+//      inflater.inflate(R.menu.conversation_group_options, menu);
 
       if (!isPushGroupConversation()) {
         inflater.inflate(R.menu.conversation_mms_group_options, menu);

From a73acae9526c132fa1e3848abd5b53fe0d8713ed Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 18 Aug 2020 13:27:53 +1000
Subject: [PATCH 26/30] Fix home screen layout bug

---
 res/layout/view_conversation.xml | 11 ++++-------
 res/layout/view_user.xml         |  8 ++++----
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/res/layout/view_conversation.xml b/res/layout/view_conversation.xml
index 1311687555..0df9155353 100644
--- a/res/layout/view_conversation.xml
+++ b/res/layout/view_conversation.xml
@@ -36,19 +36,16 @@
 
             <TextView
                 android:id="@+id/btnGroupNameDisplay"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_weight="1"
                 android:maxLines="1"
                 android:ellipsize="end"
+                android:textAlignment="viewStart"
                 android:textSize="@dimen/medium_font_size"
                 android:textStyle="bold"
                 android:textColor="@color/text"
-                android:text="Spiderman" />
-
-            <View
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_weight="1" />
+                android:text="I'm a very long display name. What are you going to do about it?" />
 
             <TextView
                 android:id="@+id/timestampTextView"
diff --git a/res/layout/view_user.xml b/res/layout/view_user.xml
index a0d51412de..6d9aa37e09 100644
--- a/res/layout/view_user.xml
+++ b/res/layout/view_user.xml
@@ -21,11 +21,11 @@
 
         <TextView
             android:id="@+id/nameTextView"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/medium_spacing"
+            android:layout_marginStart="@dimen/medium_spacing"
             android:maxLines="1"
-            android:gravity="left"
+            android:textAlignment="viewStart"
             android:ellipsize="end"
             android:textSize="@dimen/medium_font_size"
             android:textStyle="bold"
@@ -37,7 +37,7 @@
             android:id="@+id/actionIndicatorImageView"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:layout_marginLeft="@dimen/medium_spacing"
+            android:layout_marginStart="@dimen/medium_spacing"
             android:src="@drawable/ic_circle" />
 
     </LinearLayout>

From 6e2cbb23cc3de7bc014bbf216ad477f6651ed593 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Tue, 18 Aug 2020 15:40:24 +1000
Subject: [PATCH 27/30] Exclude existing group members from the add members
 screen

---
 .../securesms/loki/activities/CreateClosedGroupActivity.kt  | 2 +-
 .../securesms/loki/activities/EditClosedGroupActivity.kt    | 1 +
 .../securesms/loki/activities/SelectContactsActivity.kt     | 6 +++++-
 .../securesms/loki/activities/SelectContactsLoader.kt       | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
index 2add7f3e56..35855ccad7 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
@@ -66,7 +66,7 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), LoaderM
 
     // region Updating
     override fun onCreateLoader(id: Int, bundle: Bundle?): Loader<List<String>> {
-        return SelectContactsLoader(this)
+        return SelectContactsLoader(this, setOf())
     }
 
     override fun onLoadFinished(loader: Loader<List<String>>, members: List<String>) {
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
index 75f6f2a18d..e66883325c 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
@@ -180,6 +180,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
 
     private fun onAddMembersClick() {
         val intent = Intent(this@EditClosedGroupActivity, SelectContactsActivity::class.java)
+        intent.putExtra(SelectContactsActivity.Companion.usersToExcludeKey, members.toTypedArray())
         startActivityForResult(intent, Companion.addUsersRequestCode)
     }
 
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
index 5f2c3942da..9292f143bd 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
@@ -18,12 +18,14 @@ import org.thoughtcrime.securesms.mms.GlideApp
 class SelectContactsActivity : PassphraseRequiredActionBarActivity(), LoaderManager.LoaderCallbacks<List<String>> {
     private var members = listOf<String>()
         set(value) { field = value; selectContactsAdapter.members = value }
+    private lateinit var usersToExclude: Set<String>
 
     private val selectContactsAdapter by lazy {
         SelectContactsAdapter(this, GlideApp.with(this))
     }
 
     companion object {
+        val usersToExcludeKey = "usersToExcludeKey"
         val selectedContactsKey = "selectedContactsKey"
     }
 
@@ -34,6 +36,8 @@ class SelectContactsActivity : PassphraseRequiredActionBarActivity(), LoaderMana
         setContentView(R.layout.activity_select_contacts)
         supportActionBar!!.title = resources.getString(R.string.activity_select_contacts_title)
 
+        usersToExclude = intent.getStringArrayExtra(Companion.usersToExcludeKey)?.toSet() ?: setOf()
+
         recyclerView.adapter = selectContactsAdapter
         recyclerView.layoutManager = LinearLayoutManager(this)
 
@@ -48,7 +52,7 @@ class SelectContactsActivity : PassphraseRequiredActionBarActivity(), LoaderMana
 
     // region Updating
     override fun onCreateLoader(id: Int, bundle: Bundle?): Loader<List<String>> {
-        return SelectContactsLoader(this)
+        return SelectContactsLoader(this, usersToExclude)
     }
 
     override fun onLoadFinished(loader: Loader<List<String>>, members: List<String>) {
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsLoader.kt b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsLoader.kt
index 44a3d8cd1f..35e1b2cc7d 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsLoader.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsLoader.kt
@@ -4,12 +4,12 @@ import android.content.Context
 import org.thoughtcrime.securesms.loki.utilities.ContactUtilities
 import org.thoughtcrime.securesms.util.AsyncLoader
 
-class SelectContactsLoader(context: Context) : AsyncLoader<List<String>>(context) {
+class SelectContactsLoader(context: Context, val usersToExclude: Set<String>) : AsyncLoader<List<String>>(context) {
 
     override fun loadInBackground(): List<String> {
         val contacts = ContactUtilities.getAllContacts(context)
         return contacts.filter { contact ->
-            !contact.recipient.isGroupRecipient && !contact.isOurDevice && !contact.isSlave
+            !contact.recipient.isGroupRecipient && !contact.isOurDevice && !contact.isSlave && !usersToExclude.contains(contact.recipient.address.toPhoneString())
         }.map {
             it.recipient.address.toPhoneString()
         }

From 96736a8095c253832d8050fb9f37c5266e9dfd23 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Wed, 19 Aug 2020 10:06:26 +1000
Subject: [PATCH 28/30] Raise deployment target and migrate to AndroidX

---
 AndroidManifest.xml                           |  2 +-
 build.gradle                                  | 42 +++++++++----------
 gradle.properties                             |  2 +
 res/layout/activity_contact_name_edit.xml     |  2 +-
 res/layout/activity_contact_share_edit.xml    |  4 +-
 res/layout/activity_create_closed_group.xml   |  2 +-
 res/layout/activity_create_private_chat.xml   |  6 +--
 res/layout/activity_edit_closed_group.xml     |  2 +-
 res/layout/activity_home.xml                  |  6 +--
 res/layout/activity_join_public_chat.xml      |  6 +--
 res/layout/activity_link_device.xml           |  6 +--
 res/layout/activity_linked_devices.xml        |  2 +-
 res/layout/activity_qr_code.xml               |  6 +--
 res/layout/activity_select_contacts.xml       |  2 +-
 res/layout/activity_settings.xml              |  4 +-
 .../activity_shared_contact_details.xml       | 16 +++----
 res/layout/captcha_activity.xml               |  4 +-
 res/layout/change_passphrase_activity.xml     | 12 +++---
 .../contact_selection_list_fragment.xml       |  6 +--
 res/layout/conversation_activity.xml          |  4 +-
 res/layout/conversation_fragment.xml          |  2 +-
 res/layout/conversation_input_panel.xml       |  2 +-
 res/layout/conversation_list_activity.xml     |  4 +-
 res/layout/conversation_list_fragment.xml     |  6 +--
 res/layout/conversation_search_nav.xml        |  2 +-
 res/layout/device_link_fragment.xml           |  4 +-
 res/layout/emoji_grid_layout.xml              |  2 +-
 res/layout/enter_backup_passphrase_dialog.xml |  6 +--
 res/layout/experience_upgrade_activity.xml    |  2 +-
 ...erience_upgrade_link_previews_fragment.xml |  6 +--
 ...experience_upgrade_preference_fragment.xml |  2 +-
 ...nce_upgrade_typing_indicators_fragment.xml |  4 +-
 res/layout/fragment_search.xml                |  2 +-
 res/layout/fragment_submit_log.xml            |  2 +-
 res/layout/giphy_activity.xml                 | 12 +++---
 res/layout/giphy_fragment.xml                 |  2 +-
 res/layout/image_editor_hud.xml               |  6 +--
 res/layout/item_editable_contact.xml          |  2 +-
 res/layout/link_preview.xml                   |  4 +-
 res/layout/media_keyboard.xml                 |  6 +--
 res/layout/media_overview_activity.xml        | 10 ++---
 .../media_overview_documents_fragment.xml     |  2 +-
 .../media_overview_gallery_fragment.xml       |  2 +-
 res/layout/media_preview_activity.xml         |  2 +-
 res/layout/mediapicker_folder_fragment.xml    |  4 +-
 res/layout/mediapicker_item_fragment.xml      |  4 +-
 res/layout/mediasend_fragment.xml             |  2 +-
 res/layout/profile_create_activity.xml        |  4 +-
 res/layout/prompt_passphrase_activity.xml     |  4 +-
 res/layout/recent_photo_view.xml              |  2 +-
 res/layout/recipient_preference_activity.xml  | 20 ++++-----
 .../recipient_preference_photo_rail.xml       |  2 +-
 res/layout/recording_layout.xml               |  4 +-
 res/layout/registration_activity.xml          | 10 ++---
 res/layout/registration_lock_dialog_view.xml  | 12 +++---
 .../registration_lock_reminder_view.xml       |  6 +--
 res/layout/registration_welcome_activity.xml  |  4 +-
 .../scribble_select_sticker_activity.xml      |  4 +-
 .../scribble_select_sticker_fragment.xml      |  2 +-
 res/layout/search_toolbar.xml                 |  2 +-
 res/layout/share_activity.xml                 |  4 +-
 res/layout/sticker_keyboard_page.xml          |  2 +-
 res/layout/sticker_management_activity.xml    |  2 +-
 .../sticker_management_sticker_item.xml       |  4 +-
 res/layout/sticker_preview_activity.xml       | 10 ++---
 res/layout/switch_compat_preference.xml       |  2 +-
 res/layout/verify_display_fragment.xml        |  2 +-
 res/layout/webrtc_call_screen.xml             |  6 +--
 res/menu/conversation.xml                     |  2 +-
 res/menu/conversation_list_search.xml         |  2 +-
 .../securesms/ApplicationContext.java         | 12 +++---
 .../ApplicationPreferencesActivity.java       | 16 +++----
 .../securesms/BaseActionBarActivity.java      | 10 ++---
 .../thoughtcrime/securesms/BaseActivity.java  |  4 +-
 .../securesms/BasicIntroFragment.java         |  4 +-
 .../securesms/BindableConversationItem.java   |  4 +-
 .../BindableConversationListItem.java         |  3 +-
 .../securesms/BlockedContactsActivity.java    | 12 +++---
 .../securesms/ClearProfileAvatarActivity.java |  2 +-
 .../securesms/ConfirmIdentityDialog.java      |  2 +-
 .../securesms/ContactSelectionActivity.java   |  2 +-
 .../securesms/ConversationListActivity.java   |  7 ++--
 .../securesms/ConversationListAdapter.java    |  6 +--
 .../securesms/ConversationListFragment.java   | 25 ++++++-----
 .../securesms/ConversationListItem.java       |  4 +-
 .../securesms/ConversationListItemAction.java |  2 +-
 .../ConversationListItemInboxZero.java        |  6 +--
 .../securesms/CountrySelectionFragment.java   |  8 ++--
 .../securesms/CreateProfileActivity.java      |  4 +-
 .../securesms/DatabaseUpgradeActivity.java    |  3 +-
 .../securesms/DeviceActivity.java             |  2 +-
 .../securesms/DeviceAddFragment.java          |  4 +-
 .../securesms/DeviceLinkFragment.java         |  4 +-
 .../securesms/DeviceListFragment.java         | 10 ++---
 .../securesms/DeviceProvisioningActivity.java |  2 +-
 .../securesms/ExperienceUpgradeActivity.java  | 10 ++---
 .../securesms/ExpirationDialog.java           |  4 +-
 .../securesms/GroupCreateActivity.java        |  4 +-
 .../securesms/GroupMembersDialog.java         |  2 +-
 .../securesms/IntroPagerAdapter.java          |  6 +--
 .../securesms/InviteActivity.java             |  6 +--
 .../securesms/LinkPreviewsIntroFragment.java  |  4 +-
 .../securesms/LogSubmitActivity.java          |  2 +-
 .../securesms/MediaDocumentsAdapter.java      |  4 +-
 .../securesms/MediaGalleryAdapter.java        |  2 +-
 .../securesms/MediaOverviewActivity.java      | 30 ++++++-------
 .../securesms/MediaPreviewActivity.java       | 22 +++++-----
 .../securesms/MessageDetailsActivity.java     |  9 ++--
 .../MessageDetailsRecipientAdapter.java       |  2 +-
 .../thoughtcrime/securesms/MuteDialog.java    |  4 +-
 .../securesms/PassphrasePromptActivity.java   |  6 +--
 .../PassphraseRequiredActionBarActivity.java  |  8 ++--
 .../securesms/ReadReceiptsIntroFragment.java  |  6 +--
 .../RecipientPreferenceActivity.java          | 26 ++++++------
 .../securesms/RegistrationActivity.java       |  6 +--
 .../thoughtcrime/securesms/ShareActivity.java |  6 +--
 .../securesms/ShortcutLauncherActivity.java   |  8 ++--
 .../securesms/SmsSendtoActivity.java          |  2 +-
 .../securesms/TransportOption.java            |  4 +-
 .../securesms/TransportOptions.java           |  6 +--
 .../securesms/TransportOptionsAdapter.java    |  2 +-
 .../securesms/TransportOptionsPopup.java      |  4 +-
 .../TypingIndicatorIntroFragment.java         |  4 +-
 .../securesms/VerifyIdentityActivity.java     | 12 +++---
 .../securesms/WebRtcCallActivity.java         |  4 +-
 .../securesms/attachments/Attachment.java     |  4 +-
 .../securesms/attachments/AttachmentId.java   |  2 +-
 .../attachments/AttachmentServer.java         |  2 +-
 .../attachments/DatabaseAttachment.java       |  2 +-
 .../MmsNotificationAttachment.java            |  2 +-
 .../attachments/PointerAttachment.java        |  4 +-
 .../securesms/attachments/UriAttachment.java  |  4 +-
 .../securesms/audio/AudioRecorder.java        |  2 +-
 .../securesms/audio/AudioSlidePlayer.java     |  4 +-
 .../securesms/avatar/AvatarSelection.java     |  6 +--
 .../securesms/backup/BackupDialog.java        |  4 +-
 .../securesms/backup/BackupPassphrase.java    |  4 +-
 .../securesms/backup/FullBackupBase.java      |  4 +-
 .../securesms/backup/FullBackupExporter.java  |  4 +-
 .../securesms/backup/FullBackupImporter.java  |  2 +-
 .../securesms/color/MaterialColor.java        |  6 +--
 .../securesms/color/MaterialColors.java       |  4 +-
 .../components/AccessibleToggleButton.java    |  2 +-
 .../components/AlbumThumbnailView.java        |  8 ++--
 .../securesms/components/AlertView.java       |  2 +-
 .../securesms/components/AnimatingToggle.java |  6 +--
 .../components/AttachmentTypeSelector.java    |  6 +--
 .../securesms/components/AudioView.java       |  4 +-
 .../securesms/components/AvatarImageView.java |  6 +--
 .../components/CircleColorImageView.java      |  2 +-
 .../securesms/components/ComposeText.java     | 14 +++----
 .../components/ContactFilterToolbar.java      |  2 +-
 .../components/ControllableTabLayout.java     |  2 +-
 .../components/ControllableViewPager.java     |  6 +--
 .../components/ConversationItemFooter.java    |  4 +-
 .../components/ConversationItemThumbnail.java |  8 ++--
 .../ConversationSearchBottomBar.java          |  6 +--
 .../components/ConversationTypingView.java    |  4 +-
 .../securesms/components/CornerMask.java      |  4 +-
 .../components/CustomDefaultPreference.java   |  8 ++--
 .../securesms/components/DocumentView.java    |  6 +--
 .../components/ExpirationTimerView.java       |  6 +--
 .../securesms/components/FromTextView.java    |  3 +-
 .../GlideBitmapListeningTarget.java           |  4 +-
 .../GlideDrawableListeningTarget.java         |  4 +-
 .../components/HidingLinearLayout.java        |  7 +---
 .../securesms/components/ImageDivet.java      |  2 +-
 .../components/InputAwareLayout.java          |  4 +-
 .../securesms/components/InputPanel.java      | 14 +++----
 .../components/KeyboardAwareLinearLayout.java |  2 +-
 .../securesms/components/LabeledEditText.java |  6 +--
 .../securesms/components/LinkPreviewView.java |  4 +-
 .../components/MaxHeightScrollView.java       |  2 +-
 .../securesms/components/MediaView.java       |  7 ++--
 .../components/MicrophoneRecorderView.java    |  6 +--
 .../securesms/components/Outliner.java        |  9 +---
 .../components/PushRecipientsPanel.java       |  4 +-
 .../securesms/components/QuoteView.java       |  6 +--
 .../securesms/components/RatingManager.java   |  2 +-
 .../components/RecentPhotoViewRail.java       | 15 ++++---
 .../components/RecyclerViewFastScroller.java  |  8 ++--
 .../RemovableEditableMediaView.java           |  4 +-
 .../components/RepeatableImageKey.java        |  2 +-
 .../securesms/components/SearchToolbar.java   | 14 ++++---
 .../securesms/components/SendButton.java      |  4 +-
 .../components/SharedContactView.java         |  6 +--
 .../securesms/components/SquareImageView.java |  2 +-
 .../securesms/components/StickerView.java     |  4 +-
 .../components/SwitchPreferenceCompat.java    |  5 +--
 .../components/ThreadPhotoRailView.java       | 10 ++---
 .../securesms/components/ThumbnailView.java   |  4 +-
 .../securesms/components/TooltipPopup.java    |  8 ++--
 .../components/TransferControlView.java       |  6 +--
 .../components/TypingIndicatorView.java       |  3 +-
 .../components/TypingStatusRepository.java    |  6 +--
 .../components/TypingStatusSender.java        |  2 +-
 .../components/ZoomingImageView.java          |  4 +-
 .../components/camera/CameraUtils.java        |  4 +-
 .../components/camera/CameraView.java         |  4 +-
 .../components/emoji/AsciiEmojiView.java      |  2 +-
 .../emoji/CompositeEmojiPageModel.java        | 10 ++---
 .../components/emoji/EmojiEditText.java       |  6 +--
 .../emoji/EmojiKeyboardProvider.java          |  6 +--
 .../components/emoji/EmojiPageView.java       |  6 +--
 .../emoji/EmojiPageViewGridAdapter.java       |  4 +-
 .../components/emoji/EmojiProvider.java       |  4 +-
 .../securesms/components/emoji/EmojiSpan.java |  2 +-
 .../components/emoji/EmojiTextView.java       |  8 ++--
 .../components/emoji/EmojiToggle.java         |  4 +-
 .../emoji/EmojiVariationSelectorPopup.java    |  2 +-
 .../components/emoji/MediaKeyboard.java       | 12 +++---
 .../emoji/MediaKeyboardBottomTabAdapter.java  |  4 +-
 .../emoji/MediaKeyboardProvider.java          |  8 ++--
 .../emoji/RecentEmojiPageModel.java           |  2 +-
 .../emoji/StaticEmojiPageModel.java           |  6 +--
 .../emoji/parsing/EmojiDrawInfo.java          |  2 +-
 .../emoji/parsing/EmojiPageBitmap.java        |  6 +--
 .../components/emoji/parsing/EmojiParser.java |  4 +-
 .../components/emoji/parsing/EmojiTree.java   |  2 +-
 .../identity/UntrustedSendDialog.java         |  4 +-
 .../identity/UnverifiedBannerView.java        |  6 +--
 .../identity/UnverifiedSendDialog.java        |  4 +-
 .../components/location/SignalPlace.java      |  4 +-
 .../recyclerview/DeleteItemAnimator.java      |  4 +-
 .../SmoothScrollingLinearLayoutManager.java   |  6 +--
 .../registration/CallMeCountDownView.java     | 12 +-----
 .../PulsingFloatingActionButton.java          |  2 +-
 .../registration/VerificationCodeView.java    |  8 ++--
 .../registration/VerificationPinKeyboard.java |  6 +--
 .../components/reminder/DozeReminder.java     |  4 +-
 .../components/reminder/InviteReminder.java   |  2 +-
 .../components/reminder/Reminder.java         |  4 +-
 .../reminder/ServiceOutageReminder.java       |  2 +-
 .../components/reminder/ShareReminder.java    |  2 +-
 .../ExtendedOnPageChangedListener.java        |  2 +-
 .../components/viewpager/HackyViewPager.java  |  2 +-
 .../components/webrtc/PercentFrameLayout.java | 11 -----
 .../webrtc/WebRtcAnswerDeclineButton.java     |  4 +-
 .../components/webrtc/WebRtcCallControls.java |  3 +-
 .../components/webrtc/WebRtcCallScreen.java   |  9 ++--
 .../contacts/ContactsCursorLoader.java        |  6 +--
 .../securesms/contacts/ContactsDatabase.java  |  4 +-
 .../securesms/contacts/RecipientsEditor.java  |  2 +-
 .../contacts/avatars/ContactColors.java       |  3 +-
 .../contacts/avatars/ContactColorsLegacy.java |  3 +-
 .../contacts/avatars/ContactPhoto.java        |  4 +-
 .../avatars/GeneratedContactPhoto.java        |  8 ++--
 .../avatars/GroupRecordContactPhoto.java      |  4 +-
 .../contacts/avatars/ProfileContactPhoto.java |  4 +-
 .../avatars/ResourceContactPhoto.java         |  4 +-
 .../contacts/avatars/SystemContactPhoto.java  |  4 +-
 .../avatars/TransparentContactPhoto.java      |  2 +-
 .../securesms/contactshare/Contact.java       |  4 +-
 .../contactshare/ContactFieldAdapter.java     |  6 +--
 .../contactshare/ContactModelMapper.java      |  4 +-
 .../contactshare/ContactNameEditActivity.java |  6 +--
 .../ContactNameEditViewModel.java             | 11 +++--
 .../contactshare/ContactRepository.java       |  6 +--
 .../ContactShareEditActivity.java             | 12 +++---
 .../contactshare/ContactShareEditAdapter.java | 12 +++---
 .../ContactShareEditViewModel.java            | 10 ++---
 .../securesms/contactshare/ContactUtil.java   | 10 ++---
 .../SharedContactDetailsActivity.java         | 10 ++---
 .../conversation/ConversationActivity.java    | 24 +++++------
 .../conversation/ConversationAdapter.java     | 10 ++---
 .../conversation/ConversationFragment.java    | 26 ++++++------
 .../conversation/ConversationItem.java        |  8 ++--
 .../ConversationPopupActivity.java            |  2 +-
 .../ConversationSearchViewModel.java          |  6 +--
 .../ConversationStickerSuggestionAdapter.java |  4 +-
 .../ConversationStickerViewModel.java         | 10 ++---
 .../conversation/ConversationTitleView.java   |  4 +-
 .../conversation/ConversationUpdateItem.java  |  4 +-
 .../securesms/crypto/AttachmentSecret.java    |  2 +-
 .../crypto/AttachmentSecretProvider.java      |  2 +-
 .../ClassicDecryptingPartInputStream.java     |  2 +-
 .../securesms/crypto/DatabaseSecret.java      |  2 +-
 .../crypto/DatabaseSecretProvider.java        |  2 +-
 .../securesms/crypto/IdentityKeyUtil.java     |  2 +-
 .../securesms/crypto/KeyStoreHelper.java      |  4 +-
 .../securesms/crypto/MasterCipher.java        |  2 +-
 .../securesms/crypto/MasterSecretUtil.java    |  4 +-
 .../ModernDecryptingPartInputStream.java      |  2 +-
 .../ModernEncryptingPartOutputStream.java     |  2 +-
 .../securesms/crypto/ProfileKeyUtil.java      |  4 +-
 .../securesms/crypto/SessionUtil.java         |  5 +--
 .../crypto/UnidentifiedAccessUtil.java        |  6 +--
 .../crypto/storage/TextSecurePreKeyStore.java |  2 +-
 .../storage/TextSecureSessionStore.java       |  2 +-
 .../securesms/database/Address.java           |  6 +--
 .../database/AttachmentDatabase.java          |  6 +--
 .../securesms/database/CursorList.java        |  4 +-
 .../database/CursorRecyclerViewAdapter.java   | 10 ++---
 .../securesms/database/Database.java          |  2 +-
 .../database/DatabaseContentProviders.java    |  4 +-
 .../securesms/database/DatabaseFactory.java   |  2 +-
 .../securesms/database/DraftDatabase.java     |  2 +-
 .../FastCursorRecyclerViewAdapter.java        |  4 +-
 .../securesms/database/GroupDatabase.java     |  4 +-
 .../database/GroupReceiptDatabase.java        |  2 +-
 .../securesms/database/IdentityDatabase.java  |  4 +-
 .../securesms/database/JobDatabase.java       |  2 +-
 .../securesms/database/MediaDatabase.java     |  4 +-
 .../securesms/database/MmsDatabase.java       |  4 +-
 .../securesms/database/MmsSmsDatabase.java    |  4 +-
 .../securesms/database/ObservableContent.java |  2 +-
 .../database/OneTimePreKeyDatabase.java       |  2 +-
 .../securesms/database/PushDatabase.java      |  2 +-
 .../securesms/database/RecipientDatabase.java |  4 +-
 .../securesms/database/SearchDatabase.java    |  2 +-
 .../securesms/database/SessionDatabase.java   |  4 +-
 .../database/SignedPreKeyDatabase.java        |  4 +-
 .../securesms/database/SmsDatabase.java       |  2 +-
 .../securesms/database/SmsMigrator.java       |  2 +-
 .../securesms/database/StickerDatabase.java   |  4 +-
 .../securesms/database/ThreadDatabase.java    |  4 +-
 .../database/helpers/ClassicOpenHelper.java   |  3 +-
 .../helpers/PreKeyMigrationHelper.java        |  2 +-
 .../helpers/SQLCipherMigrationHelper.java     |  4 +-
 .../database/helpers/SQLCipherOpenHelper.java |  2 +-
 .../loaders/BucketedThreadMediaLoader.java    |  5 +--
 .../database/loaders/CountryListLoader.java   |  2 +-
 .../database/loaders/DeviceListLoader.java    |  2 +-
 .../database/loaders/PagingMediaLoader.java   |  6 +--
 .../database/loaders/RecentPhotosLoader.java  |  2 +-
 .../database/loaders/ThreadMediaLoader.java   |  2 +-
 .../database/model/DisplayRecord.java         |  2 +-
 .../database/model/IncomingSticker.java       |  2 +-
 .../database/model/MediaMmsMessageRecord.java |  4 +-
 .../database/model/MessageRecord.java         |  2 +-
 .../database/model/MmsMessageRecord.java      |  5 +--
 .../model/NotificationMmsMessageRecord.java   |  2 +-
 .../securesms/database/model/Quote.java       |  4 +-
 .../database/model/SmsMessageRecord.java      |  2 +-
 .../securesms/database/model/Sticker.java     |  2 +-
 .../database/model/StickerPackRecord.java     |  2 +-
 .../database/model/StickerRecord.java         |  2 +-
 .../database/model/ThreadRecord.java          |  4 +-
 .../securesms/events/PartProgressEvent.java   |  2 +-
 .../securesms/events/RedPhoneEvent.java       |  4 +-
 .../securesms/events/WebRtcViewModel.java     |  4 +-
 .../securesms/giph/model/ChunkedImageUrl.java |  2 +-
 .../securesms/giph/net/GiphyGifLoader.java    |  4 +-
 .../securesms/giph/net/GiphyLoader.java       |  4 +-
 .../giph/net/GiphyStickerLoader.java          |  4 +-
 .../giph/ui/AspectRatioImageView.java         |  2 +-
 .../securesms/giph/ui/GiphyActivity.java      | 14 +++----
 .../giph/ui/GiphyActivityToolbar.java         |  6 +--
 .../securesms/giph/ui/GiphyAdapter.java       |  6 +--
 .../securesms/giph/ui/GiphyFragment.java      | 18 ++++----
 .../securesms/giph/ui/GiphyGifFragment.java   |  4 +-
 .../giph/ui/GiphyStickerFragment.java         |  4 +-
 .../giph/util/InfiniteScrollListener.java     |  4 +-
 .../giph/util/RecyclerViewPositionHelper.java |  4 +-
 .../glide/ChunkedImageUrlFetcher.java         |  2 +-
 .../glide/ChunkedImageUrlLoader.java          |  4 +-
 .../securesms/glide/ContactPhotoFetcher.java  |  2 +-
 .../securesms/glide/ContactPhotoLoader.java   |  4 +-
 .../securesms/glide/OkHttpStreamFetcher.java  |  2 +-
 .../securesms/glide/OkHttpUrlLoader.java      |  4 +-
 .../glide/PaddedHeadersInterceptor.java       |  2 +-
 .../cache/EncryptedBitmapCacheDecoder.java    |  4 +-
 .../cache/EncryptedBitmapResourceEncoder.java |  2 +-
 .../glide/cache/EncryptedCacheEncoder.java    |  2 +-
 .../securesms/glide/cache/EncryptedCoder.java |  2 +-
 .../glide/cache/EncryptedGifCacheDecoder.java |  4 +-
 .../EncryptedGifDrawableResourceEncoder.java  |  2 +-
 .../securesms/groups/GroupManager.java        |  4 +-
 .../groups/GroupMessageProcessor.java         |  4 +-
 .../securesms/imageeditor/Bounds.java         |  4 +-
 .../securesms/imageeditor/CanvasMatrix.java   |  2 +-
 .../imageeditor/ColorableRenderer.java        |  2 +-
 .../securesms/imageeditor/DrawingSession.java |  2 +-
 .../securesms/imageeditor/EditSession.java    |  2 +-
 .../imageeditor/ElementDragEditSession.java   |  2 +-
 .../imageeditor/ElementEditSession.java       |  2 +-
 .../imageeditor/ElementScaleEditSession.java  |  2 +-
 .../securesms/imageeditor/HiddenEditText.java |  4 +-
 .../imageeditor/ImageEditorView.java          |  8 ++--
 .../securesms/imageeditor/Renderer.java       |  2 +-
 .../imageeditor/RendererContext.java          |  4 +-
 .../imageeditor/ThumbDragEditSession.java     |  4 +-
 .../imageeditor/model/AlphaAnimation.java     |  2 +-
 .../imageeditor/model/AnimationMatrix.java    |  4 +-
 .../securesms/imageeditor/model/Bisect.java   |  4 +-
 .../imageeditor/model/CropThumbRenderer.java  |  2 +-
 .../imageeditor/model/EditorElement.java      |  4 +-
 .../model/EditorElementHierarchy.java         |  4 +-
 .../imageeditor/model/EditorFlags.java        |  2 +-
 .../imageeditor/model/EditorModel.java        |  6 +--
 .../imageeditor/model/ElementStack.java       |  4 +-
 .../imageeditor/model/InBoundsMemory.java     |  4 +-
 .../imageeditor/model/ParcelUtils.java        |  2 +-
 .../imageeditor/model/UndoRedoStacks.java     |  4 +-
 .../AutomaticControlPointBezierLine.java      |  4 +-
 .../renderers/BezierDrawingRenderer.java      |  4 +-
 .../renderers/CropAreaRenderer.java           |  6 +--
 .../renderers/InvalidateableRenderer.java     |  2 +-
 .../renderers/InverseFillRenderer.java        |  4 +-
 .../imageeditor/renderers/TextRenderer.java   |  6 +--
 .../jobmanager/AlarmManagerScheduler.java     |  2 +-
 .../jobmanager/CompositeScheduler.java        |  2 +-
 .../securesms/jobmanager/Constraint.java      |  4 +-
 .../jobmanager/ConstraintInstantiator.java    |  2 +-
 .../jobmanager/ConstraintObserver.java        |  2 +-
 .../securesms/jobmanager/Data.java            |  4 +-
 .../securesms/jobmanager/ExecutorFactory.java |  2 +-
 .../securesms/jobmanager/InAppScheduler.java  |  2 +-
 .../securesms/jobmanager/Job.java             |  6 +--
 .../securesms/jobmanager/JobController.java   |  6 +--
 .../securesms/jobmanager/JobInstantiator.java |  2 +-
 .../securesms/jobmanager/JobLogger.java       |  2 +-
 .../securesms/jobmanager/JobManager.java      |  2 +-
 .../securesms/jobmanager/JobRunner.java       |  2 +-
 .../jobmanager/JobSchedulerScheduler.java     |  4 +-
 .../jobmanager/KeepAliveService.java          |  2 +-
 .../securesms/jobmanager/Scheduler.java       |  2 +-
 .../impl/CellServiceConstraint.java           |  2 +-
 .../impl/CellServiceConstraintObserver.java   |  2 +-
 .../impl/DefaultExecutorFactory.java          |  2 +-
 .../jobmanager/impl/JsonDataSerializer.java   |  2 +-
 .../jobmanager/impl/NetworkConstraint.java    |  4 +-
 .../impl/NetworkConstraintObserver.java       |  2 +-
 .../impl/NetworkOrCellServiceConstraint.java  |  2 +-
 .../impl/SqlCipherMigrationConstraint.java    |  2 +-
 .../SqlCipherMigrationConstraintObserver.java |  2 +-
 .../jobmanager/migration/DataMigrator.java    |  2 +-
 .../migration/WorkManagerDatabase.java        |  4 +-
 .../migration/WorkManagerFactoryMappings.java |  4 +-
 .../migration/WorkManagerMigrator.java        |  4 +-
 .../persistence/ConstraintSpec.java           |  2 +-
 .../persistence/DependencySpec.java           |  2 +-
 .../jobmanager/persistence/FullSpec.java      |  2 +-
 .../jobmanager/persistence/JobSpec.java       |  4 +-
 .../jobmanager/persistence/JobStorage.java    |  6 +--
 .../securesms/jobs/AttachmentDownloadJob.java |  5 +--
 .../securesms/jobs/AttachmentUploadJob.java   |  2 +-
 .../securesms/jobs/AvatarDownloadJob.java     |  3 +-
 .../thoughtcrime/securesms/jobs/BaseJob.java  |  2 +-
 .../securesms/jobs/CleanPreKeysJob.java       |  2 +-
 .../securesms/jobs/CreateSignedPreKeyJob.java |  2 +-
 .../securesms/jobs/FastJobStorage.java        |  4 +-
 .../securesms/jobs/JobManagerFactories.java   |  2 +-
 .../securesms/jobs/LocalBackupJob.java        |  2 +-
 .../securesms/jobs/MmsDownloadJob.java        |  4 +-
 .../securesms/jobs/MmsReceiveJob.java         |  2 +-
 .../securesms/jobs/MmsSendJob.java            |  3 +-
 .../jobs/MultiDeviceBlockedUpdateJob.java     |  2 +-
 .../MultiDeviceConfigurationUpdateJob.java    |  2 +-
 .../jobs/MultiDeviceContactUpdateJob.java     |  4 +-
 .../jobs/MultiDeviceGroupUpdateJob.java       |  4 +-
 .../jobs/MultiDeviceProfileKeyUpdateJob.java  |  2 +-
 .../jobs/MultiDeviceReadUpdateJob.java        |  2 +-
 .../MultiDeviceStickerPackOperationJob.java   |  2 +-
 .../jobs/MultiDeviceStickerPackSyncJob.java   |  2 +-
 .../jobs/MultiDeviceVerifiedUpdateJob.java    |  2 +-
 .../securesms/jobs/PushContentReceiveJob.java |  2 +-
 .../securesms/jobs/PushDecryptJob.java        |  8 ++--
 .../securesms/jobs/PushGroupSendJob.java      |  6 +--
 .../securesms/jobs/PushGroupUpdateJob.java    |  2 +-
 .../securesms/jobs/PushMediaSendJob.java      |  4 +-
 .../jobs/PushNotificationReceiveJob.java      |  2 +-
 .../securesms/jobs/PushReceivedJob.java       |  2 +-
 .../securesms/jobs/PushSendJob.java           |  5 +--
 .../securesms/jobs/PushTextSendJob.java       |  2 +-
 .../securesms/jobs/RefreshAttributesJob.java  |  2 +-
 .../securesms/jobs/RefreshPreKeysJob.java     |  2 +-
 ...RefreshUnidentifiedDeliveryAbilityJob.java |  2 +-
 .../securesms/jobs/RequestGroupInfoJob.java   |  2 +-
 .../jobs/RetrieveProfileAvatarJob.java        |  2 +-
 .../securesms/jobs/RetrieveProfileJob.java    |  2 +-
 .../securesms/jobs/RotateCertificateJob.java  |  2 +-
 .../securesms/jobs/RotateProfileKeyJob.java   |  4 +-
 .../securesms/jobs/RotateSignedPreKeyJob.java |  2 +-
 .../jobs/SendDeliveryReceiptJob.java          |  2 +-
 .../thoughtcrime/securesms/jobs/SendJob.java  |  4 +-
 .../securesms/jobs/SendReadReceiptJob.java    |  2 +-
 .../jobs/ServiceOutageDetectionJob.java       |  2 +-
 .../securesms/jobs/SmsReceiveJob.java         |  5 +--
 .../securesms/jobs/SmsSendJob.java            |  3 +-
 .../securesms/jobs/SmsSentJob.java            |  3 +-
 .../securesms/jobs/StickerDownloadJob.java    |  2 +-
 .../jobs/StickerPackDownloadJob.java          |  2 +-
 .../securesms/jobs/TrimThreadJob.java         |  2 +-
 .../securesms/jobs/TypingSendJob.java         |  2 +-
 .../securesms/jobs/UpdateApkJob.java          |  4 +-
 .../securesms/linkpreview/LinkPreview.java    |  4 +-
 .../linkpreview/LinkPreviewRepository.java    |  2 +-
 .../linkpreview/LinkPreviewUtil.java          |  4 +-
 .../linkpreview/LinkPreviewViewModel.java     | 10 ++---
 .../lock/RegistrationLockDialog.java          |  4 +-
 .../lock/RegistrationLockReminders.java       |  2 +-
 .../thoughtcrime/securesms/logging/Log.java   |  2 +-
 .../securesms/logging/LogFile.java            |  4 +-
 .../securesms/logging/LogSecretProvider.java  |  2 +-
 .../securesms/logging/PersistentLogger.java   |  4 +-
 .../logging/UncaughtExceptionLogger.java      |  2 +-
 .../logsubmit/ShareIntentListAdapter.java     |  2 +-
 .../logsubmit/SubmitLogFragment.java          |  8 ++--
 .../activities/CreateClosedGroupActivity.kt   |  6 +--
 .../activities/CreatePrivateChatActivity.kt   |  6 +--
 .../activities/EditClosedGroupActivity.kt     |  6 +--
 .../EditClosedGroupMembersAdapter.kt          |  2 +-
 .../securesms/loki/activities/HomeActivity.kt | 10 ++---
 .../securesms/loki/activities/HomeAdapter.kt  |  2 +-
 .../loki/activities/JoinPublicChatActivity.kt |  4 +-
 .../loki/activities/LinkDeviceActivity.kt     |  4 +-
 .../loki/activities/LinkedDevicesActivity.kt  |  8 ++--
 .../loki/activities/LinkedDevicesAdapter.kt   |  2 +-
 .../loki/activities/PNModeActivity.kt         |  2 +-
 .../securesms/loki/activities/PathActivity.kt |  2 +-
 .../loki/activities/QRCodeActivity.kt         |  4 +-
 .../loki/activities/RegisterActivity.kt       |  2 +-
 .../securesms/loki/activities/SeedActivity.kt |  2 +-
 .../loki/activities/SelectContactsActivity.kt |  6 +--
 .../loki/activities/SelectContactsAdapter.kt  |  2 +-
 .../loki/activities/SettingsActivity.kt       |  2 +-
 .../loki/dialogs/ClearAllDataDialog.kt        |  4 +-
 .../ClosedGroupEditingOptionsBottomSheet.kt   |  2 +-
 .../dialogs/ConversationOptionsBottomSheet.kt |  2 +-
 .../DeviceEditingOptionsBottomSheet.kt        |  2 +-
 .../loki/dialogs/EditDeviceNameDialog.kt      |  4 +-
 .../dialogs/LinkDeviceMasterModeDialog.kt     |  4 +-
 .../loki/dialogs/LinkDeviceSlaveModeDialog.kt |  4 +-
 .../dialogs/MultiDeviceRemovalBottomSheet.kt  |  2 +-
 .../dialogs/OpenGroupSuggestionBottomSheet.kt |  2 +-
 .../securesms/loki/dialogs/SeedDialog.kt      |  6 +--
 .../fragments/ContactSelectionListAdapter.kt  |  2 +-
 .../fragments/ContactSelectionListFragment.kt | 10 ++---
 .../loki/fragments/ScanQRCodeFragment.kt      |  2 +-
 .../ScanQRCodePlaceholderFragment.kt          |  2 +-
 .../fragments/ScanQRCodeWrapperFragment.kt    |  4 +-
 .../loki/todo/JazzIdenticonContactPhoto.kt    |  2 +-
 .../loki/utilities/ActivityUtilities.kt       |  4 +-
 .../securesms/loki/utilities/Broadcaster.kt   |  2 +-
 .../loki/utilities/GeneralUtilities.kt        |  2 +-
 .../securesms/loki/utilities/IP2Country.kt    |  2 +-
 .../securesms/loki/utilities/ViewUtilities.kt |  2 +-
 .../views/NewConversationButtonSetView.kt     |  4 +-
 .../securesms/loki/views/PathStatusView.kt    |  2 +-
 .../loki/views/ProfilePictureView.kt          |  2 +-
 .../longmessage/LongMessageActivity.java      |  4 +-
 .../longmessage/LongMessageRepository.java    |  4 +-
 .../longmessage/LongMessageViewModel.java     | 10 ++---
 .../mediapreview/MediaPreviewViewModel.java   | 10 ++---
 .../mediapreview/MediaRailAdapter.java        |  7 ++--
 .../mediasend/Camera1Controller.java          |  2 +-
 .../securesms/mediasend/Camera1Fragment.java  | 10 ++---
 .../mediasend/FlipTransformation.java         |  2 +-
 .../securesms/mediasend/Media.java            |  2 +-
 .../securesms/mediasend/MediaFolder.java      |  2 +-
 .../mediasend/MediaPickerFolderAdapter.java   |  4 +-
 .../mediasend/MediaPickerFolderFragment.java  | 16 +++----
 .../mediasend/MediaPickerItemAdapter.java     |  7 +---
 .../mediasend/MediaPickerItemFragment.java    | 16 +++----
 .../securesms/mediasend/MediaRepository.java  |  7 ++--
 .../mediasend/MediaSendActivity.java          |  8 ++--
 .../mediasend/MediaSendFragment.java          | 18 ++++----
 .../MediaSendFragmentPagerAdapter.java        | 10 ++---
 .../mediasend/MediaSendGifFragment.java       |  6 +--
 .../mediasend/MediaSendPageFragment.java      |  4 +-
 .../mediasend/MediaSendVideoFragment.java     |  6 +--
 .../mediasend/MediaSendViewModel.java         | 10 ++---
 .../securesms/mediasend/OrderEnforcer.java    |  4 +-
 .../securesms/mms/AttachmentManager.java      |  4 +-
 .../mms/AttachmentStreamLocalUriFetcher.java  |  2 +-
 .../mms/AttachmentStreamUriLoader.java        |  4 +-
 .../securesms/mms/AudioSlide.java             |  6 +--
 .../securesms/mms/CompatMmsConnection.java    |  4 +-
 .../mms/DecryptableStreamUriLoader.java       |  4 +-
 .../securesms/mms/DocumentSlide.java          |  4 +-
 .../thoughtcrime/securesms/mms/GifSlide.java  |  2 +-
 .../securesms/mms/ImageSlide.java             |  6 +--
 .../mms/IncomingLegacyMmsConnection.java      |  4 +-
 .../mms/IncomingLollipopMmsConnection.java    |  4 +-
 .../securesms/mms/IncomingMmsConnection.java  |  4 +-
 .../securesms/mms/LegacyMmsConnection.java    |  4 +-
 .../securesms/mms/LocationSlide.java          |  2 +-
 .../securesms/mms/MediaConstraints.java       |  4 +-
 .../securesms/mms/MmsConfigManager.java       |  4 +-
 .../thoughtcrime/securesms/mms/MmsSlide.java  |  2 +-
 .../mms/OutgoingGroupMediaMessage.java        |  4 +-
 .../mms/OutgoingLegacyMmsConnection.java      |  4 +-
 .../mms/OutgoingLollipopMmsConnection.java    |  4 +-
 .../securesms/mms/OutgoingMediaMessage.java   |  4 +-
 .../securesms/mms/OutgoingMmsConnection.java  |  4 +-
 .../mms/OutgoingSecureMediaMessage.java       |  4 +-
 .../securesms/mms/PartAuthority.java          |  4 +-
 .../thoughtcrime/securesms/mms/QuoteId.java   |  4 +-
 .../securesms/mms/QuoteModel.java             |  2 +-
 .../securesms/mms/SignalGlideModule.java      |  2 +-
 src/org/thoughtcrime/securesms/mms/Slide.java |  6 +--
 .../thoughtcrime/securesms/mms/SlideDeck.java |  4 +-
 .../securesms/mms/StickerSlide.java           |  6 +--
 .../thoughtcrime/securesms/mms/TextSlide.java |  4 +-
 .../securesms/mms/VideoSlide.java             |  6 +--
 .../securesms/net/CallRequestController.java  |  4 +-
 .../securesms/net/ChunkedDataFetcher.java     |  2 +-
 .../net/CompositeRequestController.java       |  2 +-
 .../net/ContentProxySafetyInterceptor.java    |  4 +-
 .../AbstractNotificationBuilder.java          |  6 +--
 .../AndroidAutoHeardReceiver.java             |  2 +-
 .../AndroidAutoReplyReceiver.java             |  2 +-
 .../notifications/DefaultMessageNotifier.java |  7 ++--
 .../notifications/MarkReadReceiver.java       |  4 +-
 .../notifications/MessageNotifier.java        |  2 +-
 .../MultipleRecipientNotificationBuilder.java |  6 +--
 .../notifications/NotificationChannels.java   |  6 +--
 .../notifications/NotificationItem.java       |  6 +--
 .../notifications/NotificationState.java      |  4 +-
 .../OptimizedMessageNotifier.java             |  2 +-
 .../PendingMessageNotificationBuilder.java    |  2 +-
 .../notifications/RemoteReplyReceiver.java    |  3 +-
 .../securesms/notifications/ReplyMethod.java  |  4 +-
 .../SingleRecipientNotificationBuilder.java   | 12 +++---
 .../securesms/permissions/Permissions.java    | 10 ++---
 .../permissions/PermissionsRequest.java       |  2 +-
 .../permissions/RationaleDialog.java          |  4 +-
 .../AdvancedPreferenceFragment.java           | 10 ++---
 .../AppProtectionPreferenceFragment.java      |  8 ++--
 .../AppearancePreferenceFragment.java         |  4 +-
 .../preferences/BlockedContactListItem.java   |  2 +-
 .../preferences/ChatsPreferenceFragment.java  | 10 ++---
 .../CorrectedPreferenceFragment.java          | 18 ++++----
 .../ListSummaryPreferenceFragment.java        |  4 +-
 .../preferences/MmsPreferencesActivity.java   |  6 +--
 .../preferences/MmsPreferencesFragment.java   |  2 +-
 .../NotificationsPreferenceFragment.java      |  7 ++--
 .../preferences/SmsMmsPreferenceFragment.java | 13 +++---
 .../widgets/ColorPickerPreference.java        |  8 ++--
 ...rPickerPreferenceDialogFragmentCompat.java |  4 +-
 .../widgets/ContactPreference.java            |  4 +-
 .../widgets/LEDColorListPreference.java       |  6 +--
 .../widgets/ProfilePreference.java            |  6 +--
 .../widgets/ProgressPreference.java           |  4 +-
 .../widgets/SignalListPreference.java         | 11 ++---
 .../preferences/widgets/SignalPreference.java |  4 +-
 .../securesms/profiles/AvatarHelper.java      |  4 +-
 .../profiles/GroupShareProfileView.java       | 12 +++---
 .../securesms/profiles/SystemProfileUtil.java |  5 +--
 .../securesms/profiles/UnknownSenderView.java |  4 +-
 .../securesms/providers/BlobProvider.java     |  8 ++--
 .../DeprecatedPersistentBlobProvider.java     |  4 +-
 .../securesms/providers/MmsBodyProvider.java  |  2 +-
 .../securesms/providers/PartProvider.java     |  2 +-
 .../push/SignalServiceNetworkAccess.java      |  2 +-
 src/org/thoughtcrime/securesms/qr/QrCode.java |  2 +-
 .../securesms/qr/ScanningThread.java          |  4 +-
 .../securesms/recipients/Recipient.java       |  4 +-
 .../recipients/RecipientProvider.java         |  4 +-
 .../registration/CaptchaActivity.java         | 14 +------
 .../registration/WelcomeActivity.java         |  2 +-
 .../scribbles/ImageEditorFragment.java        |  6 +--
 .../securesms/scribbles/ImageEditorHud.java   |  8 ++--
 .../securesms/scribbles/StickerLoader.java    |  2 +-
 .../scribbles/StickerSelectActivity.java      | 14 +++----
 .../scribbles/StickerSelectFragment.java      | 14 +++----
 .../securesms/scribbles/UriGlideRenderer.java |  4 +-
 .../scribbles/widget/ColorPaletteAdapter.java |  6 +--
 .../securesms/search/SearchFragment.java      | 12 +++---
 .../securesms/search/SearchListAdapter.java   |  6 +--
 .../securesms/search/SearchRepository.java    |  2 +-
 .../securesms/search/SearchViewModel.java     | 14 ++++---
 .../securesms/search/model/MessageResult.java |  2 +-
 .../securesms/search/model/SearchResult.java  |  4 +-
 .../service/ApplicationMigrationService.java  |  2 +-
 .../securesms/service/DirectShareService.java |  4 +-
 .../service/GenericForegroundService.java     | 10 ++---
 .../service/IncomingMessageObserver.java      | 14 +++----
 .../securesms/service/KeyCachingService.java  |  7 ++--
 .../service/UpdateApkReadyListener.java       |  6 +--
 .../securesms/service/WebRtcCallService.java  | 10 ++---
 .../securesms/sms/IncomingTextMessage.java    |  4 +-
 .../securesms/sms/MessageSender.java          |  2 +-
 .../securesms/stickers/BlessedPacks.java      |  2 +-
 .../stickers/StickerKeyboardPageAdapter.java  |  8 ++--
 .../stickers/StickerKeyboardPageFragment.java | 14 +++----
 .../StickerKeyboardPageViewModel.java         | 11 +++--
 .../stickers/StickerKeyboardProvider.java     | 14 +++----
 .../stickers/StickerKeyboardRepository.java   |  2 +-
 .../stickers/StickerKeyboardViewModel.java    | 10 ++---
 .../securesms/stickers/StickerLocator.java    |  2 +-
 .../stickers/StickerManagementActivity.java   |  8 ++--
 .../stickers/StickerManagementAdapter.java    |  6 +--
 .../stickers/StickerManagementRepository.java |  2 +-
 .../stickers/StickerManagementViewModel.java  | 10 ++---
 .../securesms/stickers/StickerManifest.java   |  4 +-
 .../stickers/StickerPackInstallEvent.java     |  2 +-
 .../stickers/StickerPackPreviewActivity.java  | 10 ++---
 .../stickers/StickerPackPreviewAdapter.java   |  4 +-
 .../StickerPackPreviewRepository.java         |  4 +-
 .../stickers/StickerPackPreviewViewModel.java | 10 ++---
 .../stickers/StickerPreviewPopup.java         |  2 +-
 .../securesms/stickers/StickerRemoteUri.java  |  2 +-
 .../stickers/StickerRemoteUriFetcher.java     |  2 +-
 .../stickers/StickerRemoteUriLoader.java      |  4 +-
 .../stickers/StickerSearchRepository.java     |  2 +-
 .../securesms/stickers/StickerUrl.java        |  4 +-
 .../securesms/util/AbstractCursorLoader.java  |  2 +-
 .../securesms/util/AsyncLoader.java           |  2 +-
 .../securesms/util/AttachmentUtil.java        |  6 +--
 .../securesms/util/BackupUtil.java            |  4 +-
 .../securesms/util/BitmapUtil.java            |  8 ++--
 .../securesms/util/CharacterCalculator.java   |  2 +-
 .../securesms/util/CloseableLiveData.java     |  4 +-
 .../securesms/util/CommunicationActions.java  |  6 +--
 .../securesms/util/DateUtils.java             |  2 +-
 .../thoughtcrime/securesms/util/Dialogs.java  |  2 +-
 .../securesms/util/FileProviderUtil.java      |  4 +-
 .../securesms/util/GroupUtil.java             |  6 +--
 .../securesms/util/IdentityUtil.java          |  7 ++--
 .../securesms/util/IntentUtils.java           |  2 +-
 .../securesms/util/ListenableFutureTask.java  |  2 +-
 .../securesms/util/LongClickCopySpan.java     |  4 +-
 .../util/LongClickMovementMethod.java         |  2 +-
 .../securesms/util/MathUtils.java             |  2 +-
 .../securesms/util/MediaUtil.java             |  6 +--
 .../securesms/util/ObservingLiveData.java     |  6 +--
 .../securesms/util/PowerManagerCompat.java    |  2 +-
 .../thoughtcrime/securesms/util/ResUtil.java  | 10 ++---
 .../securesms/util/SaveAttachmentTask.java    |  6 +--
 .../securesms/util/SearchUtil.java            |  5 +--
 .../util/SelectedRecipientsAdapter.java       |  4 +-
 .../securesms/util/ServiceUtil.java           |  6 +--
 .../securesms/util/ShortCodeUtil.java         |  2 +-
 .../securesms/util/SingleLiveEvent.java       | 14 +++----
 .../securesms/util/SoftHashMap.java           |  2 +-
 .../securesms/util/StableIdGenerator.java     |  8 ++--
 .../util/StickyHeaderDecoration.java          | 10 ++---
 .../securesms/util/Stopwatch.java             |  2 +-
 .../securesms/util/StorageUtil.java           |  2 +-
 .../securesms/util/TelephonyUtil.java         |  2 +-
 .../securesms/util/TextSecurePreferences.java |  8 ++--
 .../securesms/util/ThemeUtil.java             |  8 ++--
 src/org/thoughtcrime/securesms/util/Util.java |  4 +-
 .../securesms/util/VerifySpan.java            |  2 +-
 .../securesms/util/VersionTracker.java        |  2 +-
 .../thoughtcrime/securesms/util/ViewUtil.java | 12 +++---
 .../securesms/util/WakeLockUtil.java          |  2 +-
 .../util/concurrent/SignalExecutors.java      |  2 +-
 .../securesms/util/concurrent/SimpleTask.java |  6 +--
 .../util/dualsim/SubscriptionInfoCompat.java  |  4 +-
 .../dualsim/SubscriptionManagerCompat.java    |  4 +-
 .../DynamicLanguageActivityHelper.java        |  6 +--
 .../util/dynamiclanguage/LanguageString.java  |  4 +-
 .../util/dynamiclanguage/LocaleParser.java    |  4 +-
 .../spans/CenterAlignedRelativeSizeSpan.java  |  2 +-
 .../util/task/SnackbarAsyncTask.java          |  4 +-
 .../securesms/util/views/Stub.java            |  2 +-
 .../video/EncryptedMediaDataSource.java       |  4 +-
 .../securesms/video/VideoPlayer.java          |  4 +-
 .../exo/AttachmentDataSourceFactory.java      |  4 +-
 .../securesms/video/exo/PartDataSource.java   |  4 +-
 .../webrtc/CallNotificationBuilder.java       |  8 ++--
 .../securesms/webrtc/CameraState.java         |  2 +-
 .../webrtc/PeerConnectionWrapper.java         |  4 +-
 .../webrtc/audio/BluetoothStateManager.java   |  6 +--
 .../webrtc/audio/IncomingRinger.java          |  4 +-
 .../webrtc/audio/OutgoingRinger.java          |  2 +-
 .../webrtc/audio/SignalAudioManager.java      |  6 +--
 .../CursorRecyclerViewAdapterTest.java        |  5 +--
 .../securesms/jobs/FastJobStorageTest.java    |  2 +-
 .../securesms/testutil/DirectExecutor.java    |  2 +-
 763 files changed, 1733 insertions(+), 1848 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 98df604a46..5a95de62c6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -589,7 +589,7 @@
             android:exported="false"
             android:grantUriPermissions="true" />
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="network.loki.securesms.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
diff --git a/build.gradle b/build.gradle
index 8ddf482a8e..c1b4cc7025 100644
--- a/build.gradle
+++ b/build.gradle
@@ -77,21 +77,19 @@ configurations.all {
 }
 
 dependencies {
-    def supportVersion = '28.0.0'
-
-    implementation "com.android.support:appcompat-v7:$supportVersion"
-    implementation "com.android.support:recyclerview-v7:$supportVersion"
-    implementation "com.android.support:design:$supportVersion"
-    implementation "com.android.support:support-v13:$supportVersion"
-    implementation "com.android.support:cardview-v7:$supportVersion"
-    implementation "com.android.support:preference-v7:$supportVersion"
-    implementation "com.android.support:preference-v14:$supportVersion"
-    implementation "com.android.support:gridlayout-v7:$supportVersion"
-    implementation "com.android.support:exifinterface:$supportVersion"
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
-    implementation 'com.android.support:multidex:1.0.3'
-    implementation 'android.arch.lifecycle:extensions:1.1.1'
-    implementation 'android.arch.lifecycle:common-java8:1.1.1'
+    implementation 'androidx.appcompat:appcompat:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
+    implementation 'androidx.gridlayout:gridlayout:1.0.0'
+    implementation 'androidx.exifinterface:exifinterface:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.multidex:multidex:2.0.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.0.0'
 
     implementation ("com.google.firebase:firebase-messaging:$firebase_messaging_version") {
         exclude group: 'com.google.firebase', module: 'firebase-core'
@@ -112,9 +110,9 @@ dependencies {
     implementation 'com.jpardogo.materialtabstrip:library:1.0.9'
     implementation 'org.apache.httpcomponents:httpclient-android:4.3.5'
     implementation 'com.github.chrisbanes:PhotoView:2.1.3'
-    implementation 'com.github.bumptech.glide:glide:4.5.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.5.0'
-    kapt 'com.github.bumptech.glide:compiler:4.5.0'
+    implementation 'com.github.bumptech.glide:glide:4.11.0'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
+    kapt 'com.github.bumptech.glide:compiler:4.11.0'
     implementation 'com.makeramen:roundedimageview:2.1.0'
     implementation 'com.pnikosis:materialish-progress:1.5'
     implementation 'org.greenrobot:eventbus:3.0.0'
@@ -163,8 +161,8 @@ dependencies {
     testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1'
 
     testImplementation 'androidx.test:core:1.1.1-alpha02'
-    androidTestImplementation 'com.android.support:multidex:1.0.3'
-    androidTestImplementation 'com.android.support:multidex-instrumentation:1.0.3'
+    androidTestImplementation 'androidx.multidex:multidex:2.0.0'
+    androidTestImplementation 'androidx.multidex:multidex-instrumentation:2.0.0'
     androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
     androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
     androidTestImplementation ('org.assertj:assertj-core:1.7.1') {
@@ -209,7 +207,7 @@ def abiPostFix = ['armeabi-v7a' : 1,
 
 android {
     flavorDimensions "none"
-    compileSdkVersion 28
+    compileSdkVersion 29
     buildToolsVersion '28.0.3'
     useLibrary 'org.apache.http.legacy'
 
@@ -222,7 +220,7 @@ android {
         versionName canonicalVersionName
 
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
         multiDexEnabled true
 
         vectorDrawables.useSupportLibrary = true
diff --git a/gradle.properties b/gradle.properties
index ceddf08f8e..3a9957b944 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1 +1,3 @@
+android.useAndroidX=true
+android.enableJetifier=true
 org.gradle.jvmargs=-Xmx2048m
\ No newline at end of file
diff --git a/res/layout/activity_contact_name_edit.xml b/res/layout/activity_contact_name_edit.xml
index feb354872c..42785c8e41 100644
--- a/res/layout/activity_contact_name_edit.xml
+++ b/res/layout/activity_contact_name_edit.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
diff --git a/res/layout/activity_contact_share_edit.xml b/res/layout/activity_contact_share_edit.xml
index b7f522ae2b..82b6b5dd4a 100644
--- a/res/layout/activity_contact_share_edit.xml
+++ b/res/layout/activity_contact_share_edit.xml
@@ -4,14 +4,14 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/contact_share_edit_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:paddingBottom="80dp"
         android:clipToPadding="false"/>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/contact_share_edit_send"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/res/layout/activity_create_closed_group.xml b/res/layout/activity_create_closed_group.xml
index 296128a3c7..52a3300865 100644
--- a/res/layout/activity_create_closed_group.xml
+++ b/res/layout/activity_create_closed_group.xml
@@ -27,7 +27,7 @@
             android:layout_height="1px"
             android:background="@color/separator" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
diff --git a/res/layout/activity_create_private_chat.xml b/res/layout/activity_create_private_chat.xml
index d6bf8f66d7..d0ca41225c 100644
--- a/res/layout/activity_create_private_chat.xml
+++ b/res/layout/activity_create_private_chat.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.view.ViewPager
+<androidx.viewpager.widget.ViewPager
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/viewPager"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
         style="@style/Session.DarkTabLayout"
         android:id="@+id/tabLayout"
         android:layout_width="match_parent"
         android:layout_height="@dimen/tab_bar_height" />
 
-</android.support.v4.view.ViewPager>
\ No newline at end of file
+</androidx.viewpager.widget.ViewPager>
\ No newline at end of file
diff --git a/res/layout/activity_edit_closed_group.xml b/res/layout/activity_edit_closed_group.xml
index 90105bc840..1803eae6ee 100644
--- a/res/layout/activity_edit_closed_group.xml
+++ b/res/layout/activity_edit_closed_group.xml
@@ -129,7 +129,7 @@
             android:layout_height="1px"
             android:background="@color/separator" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"/>
diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
index 42859403aa..4ca026f3cb 100644
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@@ -8,7 +8,7 @@
     android:background="@drawable/default_session_background"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
@@ -58,7 +58,7 @@
 
         </RelativeLayout>
 
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
     <org.thoughtcrime.securesms.loki.views.SeedReminderView
         android:id="@+id/seedReminderView"
@@ -69,7 +69,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/res/layout/activity_join_public_chat.xml b/res/layout/activity_join_public_chat.xml
index 3ad2c9465d..7d50533711 100644
--- a/res/layout/activity_join_public_chat.xml
+++ b/res/layout/activity_join_public_chat.xml
@@ -5,18 +5,18 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewPager"
         android:layout_width="match_parent"
         android:layout_height="match_parent" >
 
-        <android.support.design.widget.TabLayout
+        <com.google.android.material.tabs.TabLayout
             style="@style/Session.DarkTabLayout"
             android:id="@+id/tabLayout"
             android:layout_width="match_parent"
             android:layout_height="@dimen/tab_bar_height" />
 
-    </android.support.v4.view.ViewPager>
+    </androidx.viewpager.widget.ViewPager>
 
     <RelativeLayout
         android:id="@+id/loader"
diff --git a/res/layout/activity_link_device.xml b/res/layout/activity_link_device.xml
index d6bf8f66d7..d0ca41225c 100644
--- a/res/layout/activity_link_device.xml
+++ b/res/layout/activity_link_device.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.view.ViewPager
+<androidx.viewpager.widget.ViewPager
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/viewPager"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
         style="@style/Session.DarkTabLayout"
         android:id="@+id/tabLayout"
         android:layout_width="match_parent"
         android:layout_height="@dimen/tab_bar_height" />
 
-</android.support.v4.view.ViewPager>
\ No newline at end of file
+</androidx.viewpager.widget.ViewPager>
\ No newline at end of file
diff --git a/res/layout/activity_linked_devices.xml b/res/layout/activity_linked_devices.xml
index 9c451c986a..39b467c7fb 100644
--- a/res/layout/activity_linked_devices.xml
+++ b/res/layout/activity_linked_devices.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:background="@drawable/default_session_background">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/res/layout/activity_qr_code.xml b/res/layout/activity_qr_code.xml
index d6bf8f66d7..d0ca41225c 100644
--- a/res/layout/activity_qr_code.xml
+++ b/res/layout/activity_qr_code.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.view.ViewPager
+<androidx.viewpager.widget.ViewPager
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/viewPager"
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
         style="@style/Session.DarkTabLayout"
         android:id="@+id/tabLayout"
         android:layout_width="match_parent"
         android:layout_height="@dimen/tab_bar_height" />
 
-</android.support.v4.view.ViewPager>
\ No newline at end of file
+</androidx.viewpager.widget.ViewPager>
\ No newline at end of file
diff --git a/res/layout/activity_select_contacts.xml b/res/layout/activity_select_contacts.xml
index c319dfe884..df6338b16f 100644
--- a/res/layout/activity_select_contacts.xml
+++ b/res/layout/activity_select_contacts.xml
@@ -11,7 +11,7 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml
index 3f41cde6b9..9f94ec8acf 100644
--- a/res/layout/activity_settings.xml
+++ b/res/layout/activity_settings.xml
@@ -17,7 +17,7 @@
             android:orientation="vertical"
             android:gravity="center_horizontal">
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
@@ -68,7 +68,7 @@
 
                 </LinearLayout>
 
-            </android.support.v7.widget.Toolbar>
+            </androidx.appcompat.widget.Toolbar>
 
             <org.thoughtcrime.securesms.loki.views.ProfilePictureView
                 android:id="@+id/profilePictureView"
diff --git a/res/layout/activity_shared_contact_details.xml b/res/layout/activity_shared_contact_details.xml
index 3a9e5afb34..38f3afd8dc 100644
--- a/res/layout/activity_shared_contact_details.xml
+++ b/res/layout/activity_shared_contact_details.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
@@ -7,11 +7,11 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="?attr/shared_contact_details_header_background">
@@ -138,7 +138,7 @@
 
             </LinearLayout>
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
@@ -146,14 +146,14 @@
                 android:background="@color/transparent"
                 app:layout_collapseMode="pin" />
 
-        </android.support.design.widget.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/contact_details_fields"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/res/layout/captcha_activity.xml b/res/layout/captcha_activity.xml
index f5fcdb283a..f6661eb64c 100644
--- a/res/layout/captcha_activity.xml
+++ b/res/layout/captcha_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -34,4 +34,4 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/registration_captcha_title" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/res/layout/change_passphrase_activity.xml b/res/layout/change_passphrase_activity.xml
index ea299256db..4dfe1626f0 100644
--- a/res/layout/change_passphrase_activity.xml
+++ b/res/layout/change_passphrase_activity.xml
@@ -18,7 +18,7 @@
                       android:visibility="visible"
                       android:orientation="vertical">
                 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -30,9 +30,9 @@
                           android:hint="@string/change_passphrase_activity__old_passphrase"
                           android:singleLine="true"/>
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -43,9 +43,9 @@
                           android:hint="@string/change_passphrase_activity__new_passphrase"
                           android:singleLine="true"/>
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -56,7 +56,7 @@
                           android:hint="@string/change_passphrase_activity__repeat_new_passphrase"
                           android:singleLine="true" />
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <LinearLayout android:orientation="horizontal"
                           android:layout_width="fill_parent"
diff --git a/res/layout/contact_selection_list_fragment.xml b/res/layout/contact_selection_list_fragment.xml
index 2eb74847f8..6b25a16a05 100644
--- a/res/layout/contact_selection_list_fragment.xml
+++ b/res/layout/contact_selection_list_fragment.xml
@@ -25,12 +25,12 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
     
-        <android.support.v4.widget.SwipeRefreshLayout
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/swipeRefreshLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent">
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recyclerView"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -46,7 +46,7 @@
                 android:text="@string/contact_selection_group_activity__finding_contacts"
                 android:textSize="@dimen/large_font_size" />
 
-        </android.support.v4.widget.SwipeRefreshLayout>
+        </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     </LinearLayout>
 
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index 0d7c2091ce..27156bcaa0 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -7,7 +7,7 @@
     android:layout_height="match_parent"
     android:background="@drawable/default_session_background">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
@@ -74,7 +74,7 @@
 
         </LinearLayout>
 
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
     <org.thoughtcrime.securesms.components.InputAwareLayout
         android:id="@+id/layout_container"
diff --git a/res/layout/conversation_fragment.xml b/res/layout/conversation_fragment.xml
index 8ad3fc8e42..4931b36efd 100644
--- a/res/layout/conversation_fragment.xml
+++ b/res/layout/conversation_fragment.xml
@@ -5,7 +5,7 @@
              android:layout_width="fill_parent"
              android:layout_height="match_parent">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
             android:id="@android:id/list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/res/layout/conversation_input_panel.xml b/res/layout/conversation_input_panel.xml
index a6b7943ac3..ccfcdf50d1 100644
--- a/res/layout/conversation_input_panel.xml
+++ b/res/layout/conversation_input_panel.xml
@@ -17,7 +17,7 @@
     android:clipChildren="false"
     android:clipToPadding="false">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/input_panel_sticker_suggestion"
         android:layout_width="match_parent"
         android:layout_height="90dp"
diff --git a/res/layout/conversation_list_activity.xml b/res/layout/conversation_list_activity.xml
index 92818b1006..2f243eada8 100644
--- a/res/layout/conversation_list_activity.xml
+++ b/res/layout/conversation_list_activity.xml
@@ -7,7 +7,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_alignParentTop="true"
             android:layout_width="match_parent"
@@ -50,7 +50,7 @@
 
         </RelativeLayout>
 
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
     <FrameLayout android:id="@+id/fragment_container"
                  android:layout_below="@id/toolbar"
diff --git a/res/layout/conversation_list_fragment.xml b/res/layout/conversation_list_fragment.xml
index 68806f42f6..0f56c5012b 100644
--- a/res/layout/conversation_list_fragment.xml
+++ b/res/layout/conversation_list_fragment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="fill_parent"
@@ -56,7 +56,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/list"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -79,4 +79,4 @@
             android:contentDescription="@string/conversation_list_fragment__fab_content_description"/>
 
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/res/layout/conversation_search_nav.xml b/res/layout/conversation_search_nav.xml
index 5ce5b5b575..310d7cfeb8 100644
--- a/res/layout/conversation_search_nav.xml
+++ b/res/layout/conversation_search_nav.xml
@@ -9,7 +9,7 @@
     android:background="@color/compose_view_background"
     android:visibility="gone"
     tools:visibility="visible"
-    tools:parentTag="android.support.constraint.ConstraintLayout">
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
 
     <TextView
         android:id="@+id/conversation_search_position"
diff --git a/res/layout/device_link_fragment.xml b/res/layout/device_link_fragment.xml
index 57353c8fde..24c2d3d443 100644
--- a/res/layout/device_link_fragment.xml
+++ b/res/layout/device_link_fragment.xml
@@ -14,7 +14,7 @@
             android:layout_marginBottom="25dp"
             android:contentDescription="@string/device_link_fragment__link_device"/>
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="25dp"
@@ -83,6 +83,6 @@
         </LinearLayout>
 
 
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/emoji_grid_layout.xml b/res/layout/emoji_grid_layout.xml
index b164e48983..ccbd5c85df 100644
--- a/res/layout/emoji_grid_layout.xml
+++ b/res/layout/emoji_grid_layout.xml
@@ -4,7 +4,7 @@
              android:layout_width="match_parent"
              android:layout_height="match_parent">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/emoji"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/res/layout/enter_backup_passphrase_dialog.xml b/res/layout/enter_backup_passphrase_dialog.xml
index 0ace5eb070..ffb016bd28 100644
--- a/res/layout/enter_backup_passphrase_dialog.xml
+++ b/res/layout/enter_backup_passphrase_dialog.xml
@@ -4,11 +4,11 @@
              android:layout_height="wrap_content"
              android:padding="16dp">
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/restore_passphrase_input"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -16,5 +16,5 @@
                 android:imeOptions="actionDone"
                 android:inputType="number" />
 
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/res/layout/experience_upgrade_activity.xml b/res/layout/experience_upgrade_activity.xml
index 651e2aafed..73c64014dc 100644
--- a/res/layout/experience_upgrade_activity.xml
+++ b/res/layout/experience_upgrade_activity.xml
@@ -6,7 +6,7 @@
              android:layout_width="match_parent"
              android:layout_height="match_parent">
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
         android:id="@+id/pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
diff --git a/res/layout/experience_upgrade_link_previews_fragment.xml b/res/layout/experience_upgrade_link_previews_fragment.xml
index 7c1abf0cf7..61c7e466f8 100644
--- a/res/layout/experience_upgrade_link_previews_fragment.xml
+++ b/res/layout/experience_upgrade_link_previews_fragment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -83,7 +83,7 @@
 
     </LinearLayout>
 
-    <android.support.v7.widget.AppCompatButton
+    <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/experience_ok_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -98,4 +98,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/res/layout/experience_upgrade_preference_fragment.xml b/res/layout/experience_upgrade_preference_fragment.xml
index a70f0e53dc..046e5265b5 100644
--- a/res/layout/experience_upgrade_preference_fragment.xml
+++ b/res/layout/experience_upgrade_preference_fragment.xml
@@ -50,7 +50,7 @@
                   android:text="@string/experience_upgrade_preference_fragment__optionally_see_and_share_when_messages_have_been_read"
                   android:textColor="@android:color/white" />
 
-            <android.support.v7.widget.SwitchCompat
+            <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/preference"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/res/layout/experience_upgrade_typing_indicators_fragment.xml b/res/layout/experience_upgrade_typing_indicators_fragment.xml
index da2be6f5a4..9c428442e2 100644
--- a/res/layout/experience_upgrade_typing_indicators_fragment.xml
+++ b/res/layout/experience_upgrade_typing_indicators_fragment.xml
@@ -83,7 +83,7 @@
             android:textIsSelectable="false"
             android:textSize="@dimen/onboarding_subtitle_size" />
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/experience_yes_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -93,7 +93,7 @@
             android:textColor="@color/core_blue"
             app:backgroundTint="@color/core_white" />
 
-        <android.support.v7.widget.AppCompatButton
+        <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/experience_no_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
diff --git a/res/layout/fragment_search.xml b/res/layout/fragment_search.xml
index 99a167b43a..ae8401c6e8 100644
--- a/res/layout/fragment_search.xml
+++ b/res/layout/fragment_search.xml
@@ -12,7 +12,7 @@
         android:background="?attr/search_background"
         android:visibility="gone" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/search_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
diff --git a/res/layout/fragment_submit_log.xml b/res/layout/fragment_submit_log.xml
index 2ae828dfa0..e7eafcc9ee 100644
--- a/res/layout/fragment_submit_log.xml
+++ b/res/layout/fragment_submit_log.xml
@@ -43,7 +43,7 @@
         android:layout_height="0dp"
         android:layout_weight="1">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/log_preview"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/layout/giphy_activity.xml b/res/layout/giphy_activity.xml
index eed1cb4ca5..89562bc5fc 100644
--- a/res/layout/giphy_activity.xml
+++ b/res/layout/giphy_activity.xml
@@ -5,13 +5,13 @@
                 android:layout_width="match_parent"
                 android:orientation="vertical">
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_above="@+id/giphy_logo"
             android:orientation="vertical">
 
-        <android.support.design.widget.AppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?attr/colorPrimary">
@@ -24,7 +24,7 @@
                     android:theme="?attr/actionBarStyle"
                     app:layout_scrollFlags="scroll|enterAlways"/>
 
-            <android.support.design.widget.TabLayout
+            <com.google.android.material.tabs.TabLayout
                     android:id="@+id/tab_layout"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -33,15 +33,15 @@
                     app:tabIndicatorColor="@color/accent"
                     android:scrollbars="horizontal"/>
 
-        </android.support.design.widget.AppBarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
 
-        <android.support.v4.view.ViewPager
+        <androidx.viewpager.widget.ViewPager
                 android:id="@+id/giphy_pager"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     <ImageView android:id="@+id/giphy_logo"
                android:src="@drawable/poweredby_giphy"
diff --git a/res/layout/giphy_fragment.xml b/res/layout/giphy_fragment.xml
index b2b435fcf5..8b977f0d66 100644
--- a/res/layout/giphy_fragment.xml
+++ b/res/layout/giphy_fragment.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/giphy_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/res/layout/image_editor_hud.xml b/res/layout/image_editor_hud.xml
index e584140481..d78afa6686 100644
--- a/res/layout/image_editor_hud.xml
+++ b/res/layout/image_editor_hud.xml
@@ -9,7 +9,7 @@
     tools:parentTag="android.widget.LinearLayout"
     tools:background="@color/core_grey_60">
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
@@ -105,7 +105,7 @@
             app:pickerBorderWidth="3dp"
             app:pickerColors="@array/scribble_colors" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/scribble_color_palette"
             android:layout_width="wrap_content"
             android:layout_height="0dp"
@@ -148,6 +148,6 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent" />
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </merge>
\ No newline at end of file
diff --git a/res/layout/item_editable_contact.xml b/res/layout/item_editable_contact.xml
index 2acb3def16..4745327acb 100644
--- a/res/layout/item_editable_contact.xml
+++ b/res/layout/item_editable_contact.xml
@@ -39,7 +39,7 @@
         android:layout_height="1dp"
         android:src="@color/grey_400"/>
     
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/editable_contact_fields"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
diff --git a/res/layout/link_preview.xml b/res/layout/link_preview.xml
index 56502655bd..09d371485a 100644
--- a/res/layout/link_preview.xml
+++ b/res/layout/link_preview.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/linkpreview_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -99,6 +99,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </merge>
\ No newline at end of file
diff --git a/res/layout/media_keyboard.xml b/res/layout/media_keyboard.xml
index 35320d4f46..8203d8f6c7 100644
--- a/res/layout/media_keyboard.xml
+++ b/res/layout/media_keyboard.xml
@@ -6,7 +6,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="org.thoughtcrime.securesms.components.emoji.MediaKeyboard">
 
-    <android.support.constraint.ConstraintLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="?emoji_drawer_background">
@@ -66,7 +66,7 @@
             app:layout_constraintBottom_toBottomOf="@id/media_keyboard_tabs"
             app:layout_constraintTop_toTopOf="@+id/media_keyboard_tabs" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/media_keyboard_tabs"
             android:layout_width="0dp"
             android:layout_height="40dp"
@@ -104,6 +104,6 @@
             app:layout_constraintEnd_toStartOf="@id/media_keyboard_backspace_backup"
             tools:visibility="visible"/>
 
-    </android.support.constraint.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 </merge>
\ No newline at end of file
diff --git a/res/layout/media_overview_activity.xml b/res/layout/media_overview_activity.xml
index 39b69512ab..ab36f3303d 100644
--- a/res/layout/media_overview_activity.xml
+++ b/res/layout/media_overview_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_height="match_parent"
         android:layout_width="match_parent"
@@ -7,11 +7,11 @@
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-        <android.support.v7.widget.Toolbar
+        <androidx.appcompat.widget.Toolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?android:attr/actionBarSize"
@@ -29,7 +29,7 @@
                 app:tabIndicatorColor="@color/textsecure_primary"
                 app:tabSelectedTextColor="@color/textsecure_primary"/>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
     <org.thoughtcrime.securesms.components.ControllableViewPager
             android:id="@+id/pager"
@@ -37,4 +37,4 @@
             android:layout_height="match_parent"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/res/layout/media_overview_documents_fragment.xml b/res/layout/media_overview_documents_fragment.xml
index 529b3d9fe8..d8f5791bd0 100644
--- a/res/layout/media_overview_documents_fragment.xml
+++ b/res/layout/media_overview_documents_fragment.xml
@@ -5,7 +5,7 @@
                 android:layout_height="match_parent"
                 android:background="@drawable/default_session_background">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/res/layout/media_overview_gallery_fragment.xml b/res/layout/media_overview_gallery_fragment.xml
index ed63f7f224..caa33fa594 100644
--- a/res/layout/media_overview_gallery_fragment.xml
+++ b/res/layout/media_overview_gallery_fragment.xml
@@ -5,7 +5,7 @@
                 android:layout_height="match_parent"
                 android:background="@drawable/default_session_background">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/media_grid"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/res/layout/media_preview_activity.xml b/res/layout/media_preview_activity.xml
index 63b5f01369..231e386e57 100644
--- a/res/layout/media_preview_activity.xml
+++ b/res/layout/media_preview_activity.xml
@@ -47,7 +47,7 @@
 
         </org.thoughtcrime.securesms.components.MaxHeightScrollView>
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/media_preview_album_rail"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/res/layout/mediapicker_folder_fragment.xml b/res/layout/mediapicker_folder_fragment.xml
index a430b4604a..ccd49b0177 100644
--- a/res/layout/mediapicker_folder_fragment.xml
+++ b/res/layout/mediapicker_folder_fragment.xml
@@ -6,7 +6,7 @@
     android:orientation="vertical"
     android:background="@drawable/default_session_background">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/mediapicker_toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
@@ -14,7 +14,7 @@
         android:background="@color/action_bar_background"
         android:theme="?attr/actionBarStyle" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/mediapicker_folder_list"
         android:background="@drawable/default_session_background"
         android:layout_width="match_parent"
diff --git a/res/layout/mediapicker_item_fragment.xml b/res/layout/mediapicker_item_fragment.xml
index faf41c15b6..9fd2422c93 100644
--- a/res/layout/mediapicker_item_fragment.xml
+++ b/res/layout/mediapicker_item_fragment.xml
@@ -6,7 +6,7 @@
     android:orientation="vertical"
     android:background="@drawable/default_session_background">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/mediapicker_toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
@@ -14,7 +14,7 @@
         android:background="@color/action_bar_background"
         android:theme="?attr/actionBarStyle" />
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/mediapicker_item_list"
         android:background="@drawable/default_session_background"
         android:layout_width="match_parent"
diff --git a/res/layout/mediasend_fragment.xml b/res/layout/mediasend_fragment.xml
index 12da7d9fef..de1978593b 100644
--- a/res/layout/mediasend_fragment.xml
+++ b/res/layout/mediasend_fragment.xml
@@ -49,7 +49,7 @@
                 android:inputType="textAutoCorrect|textCapSentences|textMultiLine"
                 android:background="@null"/>
 
-            <android.support.v7.widget.RecyclerView
+            <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/mediasend_media_rail"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/res/layout/profile_create_activity.xml b/res/layout/profile_create_activity.xml
index 02347896d3..7c5178d5a3 100644
--- a/res/layout/profile_create_activity.xml
+++ b/res/layout/profile_create_activity.xml
@@ -17,7 +17,7 @@
             android:layout_height="0dp"
             android:layout_weight="1">
 
-            <android.support.constraint.ConstraintLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
 
@@ -135,7 +135,7 @@
                     app:layout_constraintTop_toBottomOf="@+id/name"
                     app:layout_constraintVertical_bias="1.0" />
 
-            </android.support.constraint.ConstraintLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
         </ScrollView>
 
diff --git a/res/layout/prompt_passphrase_activity.xml b/res/layout/prompt_passphrase_activity.xml
index 7cec2f521c..fbd937e11f 100644
--- a/res/layout/prompt_passphrase_activity.xml
+++ b/res/layout/prompt_passphrase_activity.xml
@@ -22,7 +22,7 @@
 
     </FrameLayout>
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
@@ -34,7 +34,7 @@
             android:src="@drawable/ic_launcher_foreground"
             android:layout_gravity="center" />
 
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
     <LinearLayout
             android:layout_width="match_parent"
diff --git a/res/layout/recent_photo_view.xml b/res/layout/recent_photo_view.xml
index c06cb67630..5d6db9fa30 100644
--- a/res/layout/recent_photo_view.xml
+++ b/res/layout/recent_photo_view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-<android.support.v7.widget.RecyclerView
+<androidx.recyclerview.widget.RecyclerView
         android:id="@+id/photo_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/res/layout/recipient_preference_activity.xml b/res/layout/recipient_preference_activity.xml
index d345a3ba31..97715b5773 100644
--- a/res/layout/recipient_preference_activity.xml
+++ b/res/layout/recipient_preference_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
+<androidx.coordinatorlayout.widget.CoordinatorLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
@@ -9,13 +9,13 @@
         android:background="@color/transparent"
         xmlns:tools="http://schemas.android.com/tools">
 
-    <android.support.design.widget.AppBarLayout
+    <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/app_bar_layout"
             android:layout_width="match_parent"
             android:layout_height="300dp"
             android:background="@color/transparent">
 
-        <android.support.design.widget.CollapsingToolbarLayout
+        <com.google.android.material.appbar.CollapsingToolbarLayout
                 android:id="@+id/collapsing_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -42,7 +42,7 @@
                     android:layout_alignBottom="@+id/image"
                     android:background="@drawable/recipient_preference_scrim_bottom"/>
 
-            <android.support.v7.widget.Toolbar
+            <androidx.appcompat.widget.Toolbar
                     android:id="@+id/toolbar"
                     android:layout_width="match_parent"
                     android:layout_height="?attr/actionBarSize"
@@ -51,13 +51,13 @@
                     android:layout_marginTop="24dp"
                     app:layout_collapseMode="pin" >
 
-            </android.support.v7.widget.Toolbar>
+            </androidx.appcompat.widget.Toolbar>
 
-        </android.support.design.widget.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
 
-    </android.support.design.widget.AppBarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
 
-    <android.support.v4.widget.NestedScrollView
+    <androidx.core.widget.NestedScrollView
             android:id="@+id/scroll_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -94,6 +94,6 @@
 
         </LinearLayout>
 
-    </android.support.v4.widget.NestedScrollView>
+    </androidx.core.widget.NestedScrollView>
 
-</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/res/layout/recipient_preference_photo_rail.xml b/res/layout/recipient_preference_photo_rail.xml
index e9a45a77c5..afca69033c 100644
--- a/res/layout/recipient_preference_photo_rail.xml
+++ b/res/layout/recipient_preference_photo_rail.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/photo_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/res/layout/recording_layout.xml b/res/layout/recording_layout.xml
index 79731c0e67..569a8e8066 100644
--- a/res/layout/recording_layout.xml
+++ b/res/layout/recording_layout.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/recording_container"
@@ -101,4 +101,4 @@
 
     </FrameLayout>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/res/layout/registration_activity.xml b/res/layout/registration_activity.xml
index 044870c405..d630ecb569 100644
--- a/res/layout/registration_activity.xml
+++ b/res/layout/registration_activity.xml
@@ -187,7 +187,7 @@
 
         </LinearLayout>
 
-        <android.support.constraint.ConstraintLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/verification_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -239,7 +239,7 @@
                 android:layout_alignParentBottom="true"
                 app:layout_constraintBottom_toBottomOf="parent" />
 
-        </android.support.constraint.ConstraintLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
 
         <LinearLayout
@@ -281,14 +281,14 @@
             </LinearLayout>
 
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="15dp"
                 android:paddingStart="100dp"
                 android:paddingEnd="100dp">
 
-                <android.support.design.widget.TextInputEditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/pin"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -296,7 +296,7 @@
                     android:imeOptions="actionDone"
                     android:inputType="numberPassword" />
 
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <com.dd.CircularProgressButton
                 android:id="@+id/pinButton"
diff --git a/res/layout/registration_lock_dialog_view.xml b/res/layout/registration_lock_dialog_view.xml
index 14e1917ced..ade892d4c7 100644
--- a/res/layout/registration_lock_dialog_view.xml
+++ b/res/layout/registration_lock_dialog_view.xml
@@ -15,12 +15,12 @@
             android:layout_marginTop="10dp"
             android:text="@string/registration_lock_dialog_view__the_pin_can_consist_of_four_or_more_digits_if_you_forget_your_pin_you_could_be_locked_out_of_your_account_for_up_to_seven_days"/>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
             android:layout_marginTop="15dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/pin"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -28,15 +28,15 @@
                 android:imeOptions="actionNext"
                 android:hint="@string/registration_lock_dialog_view__enter_pin"/>
 
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
             android:layout_marginTop="15dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/repeat"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -44,7 +44,7 @@
                 android:imeOptions="actionDone"
                 android:hint="@string/registration_lock_dialog_view__confirm_pin"/>
 
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
 
     <ProgressBar android:id="@+id/progress"
diff --git a/res/layout/registration_lock_reminder_view.xml b/res/layout/registration_lock_reminder_view.xml
index fe85b7b3b5..918527ab40 100644
--- a/res/layout/registration_lock_reminder_view.xml
+++ b/res/layout/registration_lock_reminder_view.xml
@@ -23,21 +23,21 @@
 
     </LinearLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingTop="40dp"
             android:paddingStart="80dp"
             android:paddingEnd="80dp">
 
-        <android.support.design.widget.TextInputEditText
+        <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/pin"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:inputType="numberPassword"
                 android:hint="@string/registration_lock_reminder_view__enter_pin"/>
 
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
     <TextView android:id="@+id/reminder"
               android:layout_width="match_parent"
diff --git a/res/layout/registration_welcome_activity.xml b/res/layout/registration_welcome_activity.xml
index d08003387a..31e356f797 100644
--- a/res/layout/registration_welcome_activity.xml
+++ b/res/layout/registration_welcome_activity.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="@color/loki_darkest_gray"
@@ -85,4 +85,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/res/layout/scribble_select_sticker_activity.xml b/res/layout/scribble_select_sticker_activity.xml
index b2e9764504..ceea06cd10 100644
--- a/res/layout/scribble_select_sticker_activity.xml
+++ b/res/layout/scribble_select_sticker_activity.xml
@@ -5,14 +5,14 @@
               android:layout_height="match_parent"
               android:orientation="vertical">
 
-    <android.support.design.widget.TabLayout
+    <com.google.android.material.tabs.TabLayout
             android:id="@+id/camera_sticker_tabs"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:tabBackground="@color/core_grey_90"
             app:tabMode="fixed"/>
 
-    <android.support.v4.view.ViewPager
+    <androidx.viewpager.widget.ViewPager
             android:id="@+id/camera_sticker_pager"
             android:layout_width="match_parent"
             android:layout_height="0px"
diff --git a/res/layout/scribble_select_sticker_fragment.xml b/res/layout/scribble_select_sticker_fragment.xml
index d8ffa275ac..fbf8aefd6e 100644
--- a/res/layout/scribble_select_sticker_fragment.xml
+++ b/res/layout/scribble_select_sticker_fragment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView
+<androidx.recyclerview.widget.RecyclerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/stickers_recycler_view"
     android:layout_width="match_parent"
diff --git a/res/layout/search_toolbar.xml b/res/layout/search_toolbar.xml
index 20ba8e76e7..3b104e2537 100644
--- a/res/layout/search_toolbar.xml
+++ b/res/layout/search_toolbar.xml
@@ -6,7 +6,7 @@
        tools:parentTag="android.widget.LinearLayout"
        tools:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
diff --git a/res/layout/share_activity.xml b/res/layout/share_activity.xml
index a88024a1f5..b85ed37af2 100644
--- a/res/layout/share_activity.xml
+++ b/res/layout/share_activity.xml
@@ -8,7 +8,7 @@
                 android:layout_height="match_parent"
                 android:background="@drawable/default_session_background">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_alignParentTop="true"
             android:layout_width="match_parent"
@@ -42,7 +42,7 @@
 
         </RelativeLayout>
 
-    </android.support.v7.widget.Toolbar>
+    </androidx.appcompat.widget.Toolbar>
 
 
     <fragment android:id="@+id/contact_selection_list_fragment"
diff --git a/res/layout/sticker_keyboard_page.xml b/res/layout/sticker_keyboard_page.xml
index e64252d4d0..ddfee4d855 100644
--- a/res/layout/sticker_keyboard_page.xml
+++ b/res/layout/sticker_keyboard_page.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView
+<androidx.recyclerview.widget.RecyclerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/sticker_keyboard_list"
     android:layout_width="match_parent"
diff --git a/res/layout/sticker_management_activity.xml b/res/layout/sticker_management_activity.xml
index 72c5068f36..76fed513ed 100644
--- a/res/layout/sticker_management_activity.xml
+++ b/res/layout/sticker_management_activity.xml
@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/sticker_management_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/res/layout/sticker_management_sticker_item.xml b/res/layout/sticker_management_sticker_item.xml
index b766dfef42..0770de7783 100644
--- a/res/layout/sticker_management_sticker_item.xml
+++ b/res/layout/sticker_management_sticker_item.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout
+<androidx.constraintlayout.widget.ConstraintLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -124,4 +124,4 @@
         app:layout_constraintTop_toBottomOf="@id/sticker_management_cover"
         app:layout_constraintEnd_toEndOf="parent"/>
 
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/res/layout/sticker_preview_activity.xml b/res/layout/sticker_preview_activity.xml
index cbf165c120..256eac34ee 100644
--- a/res/layout/sticker_preview_activity.xml
+++ b/res/layout/sticker_preview_activity.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/sticker_install_toolbar"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -78,7 +78,7 @@
         app:layout_constraintEnd_toEndOf="@id/sticker_install_share_button"
         tools:visibility="visible"/>
 
-    <android.support.v7.widget.RecyclerView
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/sticker_install_list"
         android:layout_width="0dp"
         android:layout_height="0dp"
@@ -125,11 +125,11 @@
         app:layout_constraintEnd_toEndOf="@id/sticker_install_list"
         app:layout_constraintStart_toStartOf="@id/sticker_install_list" />
 
-    <android.support.constraint.Barrier
+    <androidx.constraintlayout.widget.Barrier
         android:id="@+id/sticker_install_bottom_barrier"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         app:barrierDirection="top"
         app:constraint_referenced_ids="sticker_install_remove_button,sticker_install_button"/>
 
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/res/layout/switch_compat_preference.xml b/res/layout/switch_compat_preference.xml
index 739a3c23b2..db24334651 100644
--- a/res/layout/switch_compat_preference.xml
+++ b/res/layout/switch_compat_preference.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.appcompat.widget.SwitchCompat xmlns:android="http://schemas.android.com/apk/res/android"
                                         android:id="@android:id/checkbox"
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
diff --git a/res/layout/verify_display_fragment.xml b/res/layout/verify_display_fragment.xml
index 72c7b78e40..b6c867d465 100644
--- a/res/layout/verify_display_fragment.xml
+++ b/res/layout/verify_display_fragment.xml
@@ -161,7 +161,7 @@
                       android:layout_marginTop="10dp"
                       android:paddingStart="20dp">
 
-            <android.support.v7.widget.SwitchCompat
+            <androidx.appcompat.widget.SwitchCompat
                     android:id="@+id/verified_switch"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"/>
diff --git a/res/layout/webrtc_call_screen.xml b/res/layout/webrtc_call_screen.xml
index 6df042731d..816f04e76d 100644
--- a/res/layout/webrtc_call_screen.xml
+++ b/res/layout/webrtc_call_screen.xml
@@ -14,7 +14,7 @@
      limitations under the License.
 -->
 
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
              xmlns:tools="http://schemas.android.com/tools"
              xmlns:app="http://schemas.android.com/apk/res-auto"
              android:id="@+id/incall_screen"
@@ -212,7 +212,7 @@
             android:layout_height="match_parent"
             tools:visibility="invisible"/>
 
-    <android.support.design.widget.FloatingActionButton
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
             android:id="@+id/hangup_fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -233,4 +233,4 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"/>
 
-</android.support.design.widget.CoordinatorLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/res/menu/conversation.xml b/res/menu/conversation.xml
index 4a7bb30912..256ac59716 100644
--- a/res/menu/conversation.xml
+++ b/res/menu/conversation.xml
@@ -10,7 +10,7 @@
 
     <item android:title="@string/SearchToolbar_search"
           android:id="@+id/menu_search"
-          app:actionViewClass="android.support.v7.widget.SearchView"
+          app:actionViewClass="androidx.appcompat.widget.SearchView"
           app:showAsAction="collapseActionView"/>
 
     <item android:title="@string/conversation__menu_add_shortcut"
diff --git a/res/menu/conversation_list_search.xml b/res/menu/conversation_list_search.xml
index 79f229416c..8eadb1c17a 100644
--- a/res/menu/conversation_list_search.xml
+++ b/res/menu/conversation_list_search.xml
@@ -5,7 +5,7 @@
     <item
             android:id="@+id/action_filter_search"
             android:title=" "
-            app:actionViewClass="android.support.v7.widget.SearchView"
+            app:actionViewClass="androidx.appcompat.widget.SearchView"
             app:showAsAction="collapseActionView|always" />
 
 </menu>
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/ApplicationContext.java b/src/org/thoughtcrime/securesms/ApplicationContext.java
index 5090774f31..3e4ea39fcb 100644
--- a/src/org/thoughtcrime/securesms/ApplicationContext.java
+++ b/src/org/thoughtcrime/securesms/ApplicationContext.java
@@ -16,17 +16,17 @@
  */
 package org.thoughtcrime.securesms;
 
-import android.arch.lifecycle.DefaultLifecycleObserver;
-import android.arch.lifecycle.LifecycleOwner;
-import android.arch.lifecycle.ProcessLifecycleOwner;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.ProcessLifecycleOwner;
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.multidex.MultiDexApplication;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.multidex.MultiDexApplication;
 
 import com.google.firebase.iid.FirebaseInstanceId;
 
diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index fdf751a0f2..4400f061a8 100644
--- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -29,14 +29,14 @@ import android.graphics.drawable.Drawable;
 import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.graphics.drawable.DrawableCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.Preference;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.core.content.ContextCompat;
+import androidx.core.graphics.drawable.DrawableCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.Preference;
 import android.util.Log;
 import android.widget.Toast;
 
diff --git a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java b/src/org/thoughtcrime/securesms/BaseActionBarActivity.java
index b0af5f1144..fc6f64b409 100644
--- a/src/org/thoughtcrime/securesms/BaseActionBarActivity.java
+++ b/src/org/thoughtcrime/securesms/BaseActionBarActivity.java
@@ -11,11 +11,11 @@ import android.graphics.BitmapFactory;
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.appcompat.app.AppCompatActivity;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
diff --git a/src/org/thoughtcrime/securesms/BaseActivity.java b/src/org/thoughtcrime/securesms/BaseActivity.java
index 56d7547ff2..b5800efc9d 100644
--- a/src/org/thoughtcrime/securesms/BaseActivity.java
+++ b/src/org/thoughtcrime/securesms/BaseActivity.java
@@ -7,8 +7,8 @@ import android.graphics.BitmapFactory;
 import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.NonNull;
-import android.support.v4.app.FragmentActivity;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.FragmentActivity;
 import android.view.KeyEvent;
 
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
diff --git a/src/org/thoughtcrime/securesms/BasicIntroFragment.java b/src/org/thoughtcrime/securesms/BasicIntroFragment.java
index 74db43d4a3..25e7a901df 100644
--- a/src/org/thoughtcrime/securesms/BasicIntroFragment.java
+++ b/src/org/thoughtcrime/securesms/BasicIntroFragment.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms;
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/BindableConversationItem.java b/src/org/thoughtcrime/securesms/BindableConversationItem.java
index 459a99be2f..ae11885fd7 100644
--- a/src/org/thoughtcrime/securesms/BindableConversationItem.java
+++ b/src/org/thoughtcrime/securesms/BindableConversationItem.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 
 import org.thoughtcrime.securesms.contactshare.Contact;
diff --git a/src/org/thoughtcrime/securesms/BindableConversationListItem.java b/src/org/thoughtcrime/securesms/BindableConversationListItem.java
index 124ec7b00c..ec3a45cc78 100644
--- a/src/org/thoughtcrime/securesms/BindableConversationListItem.java
+++ b/src/org/thoughtcrime/securesms/BindableConversationListItem.java
@@ -1,8 +1,7 @@
 package org.thoughtcrime.securesms;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 
diff --git a/src/org/thoughtcrime/securesms/BlockedContactsActivity.java b/src/org/thoughtcrime/securesms/BlockedContactsActivity.java
index bd6dc38dfb..5d954f8264 100644
--- a/src/org/thoughtcrime/securesms/BlockedContactsActivity.java
+++ b/src/org/thoughtcrime/securesms/BlockedContactsActivity.java
@@ -4,12 +4,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ListFragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v4.widget.CursorAdapter;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.ListFragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.cursoradapter.widget.CursorAdapter;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java b/src/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java
index 764f7d3336..74bfe7ae71 100644
--- a/src/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java
+++ b/src/org/thoughtcrime/securesms/ClearProfileAvatarActivity.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 
 import network.loki.messenger.R;
 
diff --git a/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java b/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java
index 70a04ee4d3..206cd8aa57 100644
--- a/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java
+++ b/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java
@@ -5,7 +5,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.database.Cursor;
 import android.os.AsyncTask;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.method.LinkMovementMethod;
diff --git a/src/org/thoughtcrime/securesms/ContactSelectionActivity.java b/src/org/thoughtcrime/securesms/ContactSelectionActivity.java
index ccf0c98df7..31f079b72a 100644
--- a/src/org/thoughtcrime/securesms/ContactSelectionActivity.java
+++ b/src/org/thoughtcrime/securesms/ContactSelectionActivity.java
@@ -17,7 +17,7 @@
 package org.thoughtcrime.securesms;
 
 import android.os.Bundle;
-import android.support.v4.widget.SwipeRefreshLayout;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 
 import org.thoughtcrime.securesms.components.ContactFilterToolbar;
 import org.thoughtcrime.securesms.loki.fragments.ContactSelectionListFragment;
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index 2d9828705d..ad1683004c 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -25,9 +25,9 @@ import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.Toolbar;
-import android.support.v7.widget.TooltipCompat;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
+import androidx.appcompat.widget.TooltipCompat;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -53,7 +53,6 @@ import org.thoughtcrime.securesms.loki.utilities.ProfilePictureModifiedEvent;
 import org.thoughtcrime.securesms.loki.activities.JoinPublicChatActivity;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.notifications.MarkReadReceiver;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.search.SearchFragment;
 import org.thoughtcrime.securesms.service.KeyCachingService;
diff --git a/src/org/thoughtcrime/securesms/ConversationListAdapter.java b/src/org/thoughtcrime/securesms/ConversationListAdapter.java
index 154dd48056..ab86efd223 100644
--- a/src/org/thoughtcrime/securesms/ConversationListAdapter.java
+++ b/src/org/thoughtcrime/securesms/ConversationListAdapter.java
@@ -18,9 +18,9 @@ package org.thoughtcrime.securesms;
 
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index 27fb781e5a..e5a72655d4 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -30,18 +30,18 @@ import android.graphics.Paint;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.view.ActionMode;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.helper.ItemTouchHelper;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.fragment.app.Fragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.view.ActionMode;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.ItemTouchHelper;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -77,7 +77,6 @@ import org.thoughtcrime.securesms.jobs.ServiceOutageDetectionJob;
 import org.thoughtcrime.securesms.loki.activities.CreatePrivateChatActivity;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.notifications.MarkReadReceiver;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
diff --git a/src/org/thoughtcrime/securesms/ConversationListItem.java b/src/org/thoughtcrime/securesms/ConversationListItem.java
index 28b2e11254..70423ab6a4 100644
--- a/src/org/thoughtcrime/securesms/ConversationListItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationListItem.java
@@ -22,8 +22,8 @@ import android.graphics.Typeface;
 import android.graphics.drawable.RippleDrawable;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.style.StyleSpan;
 import android.util.AttributeSet;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/ConversationListItemAction.java b/src/org/thoughtcrime/securesms/ConversationListItemAction.java
index dd26b708da..b5553e8529 100644
--- a/src/org/thoughtcrime/securesms/ConversationListItemAction.java
+++ b/src/org/thoughtcrime/securesms/ConversationListItemAction.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.widget.LinearLayout;
 import android.widget.TextView;
diff --git a/src/org/thoughtcrime/securesms/ConversationListItemInboxZero.java b/src/org/thoughtcrime/securesms/ConversationListItemInboxZero.java
index 1aace90b79..c24063b0e5 100644
--- a/src/org/thoughtcrime/securesms/ConversationListItemInboxZero.java
+++ b/src/org/thoughtcrime/securesms/ConversationListItemInboxZero.java
@@ -3,9 +3,9 @@ package org.thoughtcrime.securesms;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.widget.LinearLayout;
 
diff --git a/src/org/thoughtcrime/securesms/CountrySelectionFragment.java b/src/org/thoughtcrime/securesms/CountrySelectionFragment.java
index 4b4d7ba239..ac266afd8b 100644
--- a/src/org/thoughtcrime/securesms/CountrySelectionFragment.java
+++ b/src/org/thoughtcrime/securesms/CountrySelectionFragment.java
@@ -2,10 +2,10 @@ package org.thoughtcrime.securesms;
 
 import android.app.Activity;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ListFragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.ListFragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
diff --git a/src/org/thoughtcrime/securesms/CreateProfileActivity.java b/src/org/thoughtcrime/securesms/CreateProfileActivity.java
index e41694bae8..92d631f576 100644
--- a/src/org/thoughtcrime/securesms/CreateProfileActivity.java
+++ b/src/org/thoughtcrime/securesms/CreateProfileActivity.java
@@ -12,8 +12,8 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
diff --git a/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java b/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
index 1e6f34a855..176ca5b84a 100644
--- a/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
+++ b/src/org/thoughtcrime/securesms/DatabaseUpgradeActivity.java
@@ -23,7 +23,7 @@ import android.content.Intent;
 import android.database.Cursor;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v7.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
 import android.view.View;
 import android.widget.ProgressBar;
 
@@ -44,7 +44,6 @@ import org.thoughtcrime.securesms.jobs.PushDecryptJob;
 import org.thoughtcrime.securesms.jobs.RefreshAttributesJob;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.GlideApp;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.service.KeyCachingService;
 import org.thoughtcrime.securesms.util.FileUtils;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
diff --git a/src/org/thoughtcrime/securesms/DeviceActivity.java b/src/org/thoughtcrime/securesms/DeviceActivity.java
index a93f1c8ddb..5b68a6b478 100644
--- a/src/org/thoughtcrime/securesms/DeviceActivity.java
+++ b/src/org/thoughtcrime/securesms/DeviceActivity.java
@@ -8,7 +8,7 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Vibrator;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.transition.TransitionInflater;
 import android.view.MenuItem;
diff --git a/src/org/thoughtcrime/securesms/DeviceAddFragment.java b/src/org/thoughtcrime/securesms/DeviceAddFragment.java
index af18022e91..afd05aecf9 100644
--- a/src/org/thoughtcrime/securesms/DeviceAddFragment.java
+++ b/src/org/thoughtcrime/securesms/DeviceAddFragment.java
@@ -5,8 +5,8 @@ import android.annotation.TargetApi;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewAnimationUtils;
diff --git a/src/org/thoughtcrime/securesms/DeviceLinkFragment.java b/src/org/thoughtcrime/securesms/DeviceLinkFragment.java
index f118c92e12..4c7e3eb4fc 100644
--- a/src/org/thoughtcrime/securesms/DeviceLinkFragment.java
+++ b/src/org/thoughtcrime/securesms/DeviceLinkFragment.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms;
 import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/DeviceListFragment.java b/src/org/thoughtcrime/securesms/DeviceListFragment.java
index b3895b93ae..ea400e0481 100644
--- a/src/org/thoughtcrime/securesms/DeviceListFragment.java
+++ b/src/org/thoughtcrime/securesms/DeviceListFragment.java
@@ -4,11 +4,11 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ListFragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.ListFragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java b/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java
index f5fab2f793..2a1f18c8db 100644
--- a/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java
+++ b/src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.view.Window;
 
 import network.loki.messenger.R;
diff --git a/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java b/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java
index 648fcf38c8..3001cb23a6 100644
--- a/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java
+++ b/src/org/thoughtcrime/securesms/ExperienceUpgradeActivity.java
@@ -7,11 +7,11 @@ import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.core.app.NotificationCompat;
+import androidx.viewpager.widget.ViewPager;
 import android.view.View;
 
 import com.melnykov.fab.FloatingActionButton;
diff --git a/src/org/thoughtcrime/securesms/ExpirationDialog.java b/src/org/thoughtcrime/securesms/ExpirationDialog.java
index ed6186d634..7493e5ddc8 100644
--- a/src/org/thoughtcrime/securesms/ExpirationDialog.java
+++ b/src/org/thoughtcrime/securesms/ExpirationDialog.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TextView;
diff --git a/src/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
index 7760a07cf1..3aeb4111d7 100644
--- a/src/org/thoughtcrime/securesms/GroupCreateActivity.java
+++ b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
@@ -23,8 +23,8 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuInflater;
diff --git a/src/org/thoughtcrime/securesms/GroupMembersDialog.java b/src/org/thoughtcrime/securesms/GroupMembersDialog.java
index 4f43c727ae..20948a6196 100644
--- a/src/org/thoughtcrime/securesms/GroupMembersDialog.java
+++ b/src/org/thoughtcrime/securesms/GroupMembersDialog.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import android.text.TextUtils;
 
 import org.thoughtcrime.securesms.database.DatabaseFactory;
diff --git a/src/org/thoughtcrime/securesms/IntroPagerAdapter.java b/src/org/thoughtcrime/securesms/IntroPagerAdapter.java
index e10cc8fb40..a176c28bbc 100644
--- a/src/org/thoughtcrime/securesms/IntroPagerAdapter.java
+++ b/src/org/thoughtcrime/securesms/IntroPagerAdapter.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms;
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
 
 import java.util.List;
 
diff --git a/src/org/thoughtcrime/securesms/InviteActivity.java b/src/org/thoughtcrime/securesms/InviteActivity.java
index cf4bd2fdd8..6d8a4c9b16 100644
--- a/src/org/thoughtcrime/securesms/InviteActivity.java
+++ b/src/org/thoughtcrime/securesms/InviteActivity.java
@@ -9,9 +9,9 @@ import android.os.AsyncTask;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
-import android.support.annotation.AnimRes;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.AnimRes;
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
+import androidx.appcompat.app.AlertDialog;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewAnimationUtils;
diff --git a/src/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java b/src/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java
index 972b43edb0..2b813c41e9 100644
--- a/src/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java
+++ b/src/org/thoughtcrime/securesms/LinkPreviewsIntroFragment.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/LogSubmitActivity.java b/src/org/thoughtcrime/securesms/LogSubmitActivity.java
index bb4e1b78a9..a6391f59ed 100644
--- a/src/org/thoughtcrime/securesms/LogSubmitActivity.java
+++ b/src/org/thoughtcrime/securesms/LogSubmitActivity.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.FragmentTransaction;
 import android.view.MenuItem;
 import android.widget.Toast;
 
diff --git a/src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java b/src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java
index 95ccc52db5..3af3f8bc49 100644
--- a/src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java
+++ b/src/org/thoughtcrime/securesms/MediaDocumentsAdapter.java
@@ -5,8 +5,8 @@ import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java b/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java
index b1dea5d419..e9cfee3372 100644
--- a/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java
+++ b/src/org/thoughtcrime/securesms/MediaGalleryAdapter.java
@@ -17,7 +17,7 @@
 package org.thoughtcrime.securesms;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/MediaOverviewActivity.java b/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
index 5c54fd58cf..7a82d64a42 100644
--- a/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
+++ b/src/org/thoughtcrime/securesms/MediaOverviewActivity.java
@@ -25,21 +25,21 @@ import android.content.res.Resources;
 import android.database.Cursor;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.view.ActionMode;
-import android.support.v7.widget.DividerItemDecoration;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.view.ActionMode;
+import androidx.recyclerview.widget.DividerItemDecoration;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
diff --git a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
index 79f697d26f..4e01e84d7a 100644
--- a/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/src/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -19,7 +19,7 @@ package org.thoughtcrime.securesms;
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
@@ -28,16 +28,16 @@ import android.os.AsyncTask;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v4.util.Pair;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.core.util.Pair;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AlertDialog;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.GestureDetector;
 import android.view.LayoutInflater;
 import android.view.Menu;
diff --git a/src/org/thoughtcrime/securesms/MessageDetailsActivity.java b/src/org/thoughtcrime/securesms/MessageDetailsActivity.java
index 818a3d6669..3803398f93 100644
--- a/src/org/thoughtcrime/securesms/MessageDetailsActivity.java
+++ b/src/org/thoughtcrime/securesms/MessageDetailsActivity.java
@@ -24,10 +24,10 @@ import android.database.Cursor;
 import android.graphics.drawable.ColorDrawable;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.LoaderManager.LoaderCallbacks;
-import android.support.v4.content.Loader;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.loader.app.LoaderManager.LoaderCallbacks;
+import androidx.loader.content.Loader;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -50,7 +50,6 @@ import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.loki.database.LokiMessageDatabase;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.mms.GlideRequests;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientModifiedListener;
 import org.thoughtcrime.securesms.sms.MessageSender;
diff --git a/src/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java b/src/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java
index b4df7f5c49..0313011026 100644
--- a/src/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java
+++ b/src/org/thoughtcrime/securesms/MessageDetailsRecipientAdapter.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/MuteDialog.java b/src/org/thoughtcrime/securesms/MuteDialog.java
index ee916986da..33aace5123 100644
--- a/src/org/thoughtcrime/securesms/MuteDialog.java
+++ b/src/org/thoughtcrime/securesms/MuteDialog.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms;
 
 import android.content.Context;
 import android.content.DialogInterface;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
index 16046287d9..f4e881c057 100644
--- a/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphrasePromptActivity.java
@@ -23,9 +23,9 @@ import android.content.Intent;
 import android.graphics.PorterDuff;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.v4.hardware.fingerprint.FingerprintManagerCompat;
-import android.support.v4.os.CancellationSignal;
-import android.support.v7.widget.Toolbar;
+import androidx.core.hardware.fingerprint.FingerprintManagerCompat;
+import androidx.core.os.CancellationSignal;
+import androidx.appcompat.widget.Toolbar;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.SpannableString;
diff --git a/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java b/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
index b3e4691e78..9d18cdd15a 100644
--- a/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
+++ b/src/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java
@@ -5,10 +5,10 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.jobs.PushNotificationReceiveJob;
diff --git a/src/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java b/src/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java
index 135c0c6d96..32ef878be3 100644
--- a/src/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java
+++ b/src/org/thoughtcrime/securesms/ReadReceiptsIntroFragment.java
@@ -2,9 +2,9 @@ package org.thoughtcrime.securesms;
 
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.SwitchCompat;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.widget.SwitchCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
index 9303347f14..3604d40651 100644
--- a/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
+++ b/src/org/thoughtcrime/securesms/RecipientPreferenceActivity.java
@@ -13,19 +13,19 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.CollapsingToolbarLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.appbar.CollapsingToolbarLayout;
+import androidx.fragment.app.Fragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.core.view.ViewCompat;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.appcompat.widget.Toolbar;
 import android.telephony.PhoneNumberUtils;
 import android.util.Pair;
 import android.view.MenuItem;
diff --git a/src/org/thoughtcrime/securesms/RegistrationActivity.java b/src/org/thoughtcrime/securesms/RegistrationActivity.java
index 26395e4fcd..29ca7d34d9 100644
--- a/src/org/thoughtcrime/securesms/RegistrationActivity.java
+++ b/src/org/thoughtcrime/securesms/RegistrationActivity.java
@@ -7,9 +7,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
diff --git a/src/org/thoughtcrime/securesms/ShareActivity.java b/src/org/thoughtcrime/securesms/ShareActivity.java
index 6ec7a63992..d242ec42f0 100644
--- a/src/org/thoughtcrime/securesms/ShareActivity.java
+++ b/src/org/thoughtcrime/securesms/ShareActivity.java
@@ -27,9 +27,9 @@ import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Process;
 import android.provider.OpenableColumns;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.ImageView;
diff --git a/src/org/thoughtcrime/securesms/ShortcutLauncherActivity.java b/src/org/thoughtcrime/securesms/ShortcutLauncherActivity.java
index 554327f2de..3777ce4f78 100644
--- a/src/org/thoughtcrime/securesms/ShortcutLauncherActivity.java
+++ b/src/org/thoughtcrime/securesms/ShortcutLauncherActivity.java
@@ -4,10 +4,10 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.TaskStackBuilder;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.TaskStackBuilder;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
 
 import org.thoughtcrime.securesms.database.Address;
diff --git a/src/org/thoughtcrime/securesms/SmsSendtoActivity.java b/src/org/thoughtcrime/securesms/SmsSendtoActivity.java
index 70f99a663e..de4876cbaa 100644
--- a/src/org/thoughtcrime/securesms/SmsSendtoActivity.java
+++ b/src/org/thoughtcrime/securesms/SmsSendtoActivity.java
@@ -5,7 +5,7 @@ import android.content.Intent;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.provider.ContactsContract;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.widget.Toast;
 
diff --git a/src/org/thoughtcrime/securesms/TransportOption.java b/src/org/thoughtcrime/securesms/TransportOption.java
index 8edd4af97c..c361a42168 100644
--- a/src/org/thoughtcrime/securesms/TransportOption.java
+++ b/src/org/thoughtcrime/securesms/TransportOption.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import org.thoughtcrime.securesms.util.CharacterCalculator;
diff --git a/src/org/thoughtcrime/securesms/TransportOptions.java b/src/org/thoughtcrime/securesms/TransportOptions.java
index 00ed7f42d3..52b37ff25c 100644
--- a/src/org/thoughtcrime/securesms/TransportOptions.java
+++ b/src/org/thoughtcrime/securesms/TransportOptions.java
@@ -2,14 +2,12 @@ package org.thoughtcrime.securesms;
 
 import android.Manifest;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.util.CharacterCalculator;
-import org.thoughtcrime.securesms.util.MmsCharacterCalculator;
 import org.thoughtcrime.securesms.util.PushCharacterCalculator;
-import org.thoughtcrime.securesms.util.SmsCharacterCalculator;
 import org.thoughtcrime.securesms.util.dualsim.SubscriptionInfoCompat;
 import org.thoughtcrime.securesms.util.dualsim.SubscriptionManagerCompat;
 import org.whispersystems.libsignal.util.guava.Optional;
diff --git a/src/org/thoughtcrime/securesms/TransportOptionsAdapter.java b/src/org/thoughtcrime/securesms/TransportOptionsAdapter.java
index c62154285c..703b379915 100644
--- a/src/org/thoughtcrime/securesms/TransportOptionsAdapter.java
+++ b/src/org/thoughtcrime/securesms/TransportOptionsAdapter.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms;
 
 import android.content.Context;
 import android.graphics.PorterDuff.Mode;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/TransportOptionsPopup.java b/src/org/thoughtcrime/securesms/TransportOptionsPopup.java
index 6addad53b1..411fe7b0e7 100644
--- a/src/org/thoughtcrime/securesms/TransportOptionsPopup.java
+++ b/src/org/thoughtcrime/securesms/TransportOptionsPopup.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.ListPopupWindow;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.ListPopupWindow;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ListView;
diff --git a/src/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java b/src/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java
index 2ee5027ee4..3ce7a99ff4 100644
--- a/src/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java
+++ b/src/org/thoughtcrime/securesms/TypingIndicatorIntroFragment.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
index 22162a9179..f78de0ac53 100644
--- a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
+++ b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
@@ -34,12 +34,12 @@ import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.Vibrator;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.widget.SwitchCompat;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.appcompat.widget.SwitchCompat;
 import android.text.Html;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
diff --git a/src/org/thoughtcrime/securesms/WebRtcCallActivity.java b/src/org/thoughtcrime/securesms/WebRtcCallActivity.java
index a689d327b8..311698578c 100644
--- a/src/org/thoughtcrime/securesms/WebRtcCallActivity.java
+++ b/src/org/thoughtcrime/securesms/WebRtcCallActivity.java
@@ -25,8 +25,8 @@ import android.content.Intent;
 import android.content.res.Configuration;
 import android.media.AudioManager;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
diff --git a/src/org/thoughtcrime/securesms/attachments/Attachment.java b/src/org/thoughtcrime/securesms/attachments/Attachment.java
index e4b056af29..6671f917b8 100644
--- a/src/org/thoughtcrime/securesms/attachments/Attachment.java
+++ b/src/org/thoughtcrime/securesms/attachments/Attachment.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.attachments;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
diff --git a/src/org/thoughtcrime/securesms/attachments/AttachmentId.java b/src/org/thoughtcrime/securesms/attachments/AttachmentId.java
index 89389bb8df..3d43c84195 100644
--- a/src/org/thoughtcrime/securesms/attachments/AttachmentId.java
+++ b/src/org/thoughtcrime/securesms/attachments/AttachmentId.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.attachments;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/org/thoughtcrime/securesms/attachments/AttachmentServer.java b/src/org/thoughtcrime/securesms/attachments/AttachmentServer.java
index bc68557175..e12ba08c54 100644
--- a/src/org/thoughtcrime/securesms/attachments/AttachmentServer.java
+++ b/src/org/thoughtcrime/securesms/attachments/AttachmentServer.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.attachments;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.PartAuthority;
diff --git a/src/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java b/src/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java
index 498bcaf490..afa4d615d0 100644
--- a/src/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java
+++ b/src/org/thoughtcrime/securesms/attachments/DatabaseAttachment.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.attachments;
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
diff --git a/src/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java b/src/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java
index 8885849a8f..9eac9138a9 100644
--- a/src/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java
+++ b/src/org/thoughtcrime/securesms/attachments/MmsNotificationAttachment.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.attachments;
 
 
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.MmsDatabase;
diff --git a/src/org/thoughtcrime/securesms/attachments/PointerAttachment.java b/src/org/thoughtcrime/securesms/attachments/PointerAttachment.java
index 43b201767c..0144063fda 100644
--- a/src/org/thoughtcrime/securesms/attachments/PointerAttachment.java
+++ b/src/org/thoughtcrime/securesms/attachments/PointerAttachment.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.attachments;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
diff --git a/src/org/thoughtcrime/securesms/attachments/UriAttachment.java b/src/org/thoughtcrime/securesms/attachments/UriAttachment.java
index c238630bff..2d4a47f207 100644
--- a/src/org/thoughtcrime/securesms/attachments/UriAttachment.java
+++ b/src/org/thoughtcrime/securesms/attachments/UriAttachment.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.attachments;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.stickers.StickerLocator;
 
diff --git a/src/org/thoughtcrime/securesms/audio/AudioRecorder.java b/src/org/thoughtcrime/securesms/audio/AudioRecorder.java
index 48dc54808a..00fc6da3c7 100644
--- a/src/org/thoughtcrime/securesms/audio/AudioRecorder.java
+++ b/src/org/thoughtcrime/securesms/audio/AudioRecorder.java
@@ -5,7 +5,7 @@ import android.content.Context;
 import android.net.Uri;
 import android.os.Build;
 import android.os.ParcelFileDescriptor;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import org.thoughtcrime.securesms.logging.Log;
 import android.util.Pair;
 
diff --git a/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java b/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java
index 866cc4a49a..fa65d129e4 100644
--- a/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java
+++ b/src/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java
@@ -12,8 +12,8 @@ import android.os.Handler;
 import android.os.Message;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.Pair;
 import android.widget.Toast;
 
diff --git a/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java b/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java
index 328cd20c8b..b54c9e6cc4 100644
--- a/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java
+++ b/src/org/thoughtcrime/securesms/avatar/AvatarSelection.java
@@ -7,9 +7,9 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.MediaStore;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
 
 import com.theartofdev.edmodo.cropper.CropImage;
 import com.theartofdev.edmodo.cropper.CropImageView;
diff --git a/src/org/thoughtcrime/securesms/backup/BackupDialog.java b/src/org/thoughtcrime/securesms/backup/BackupDialog.java
index 1a3e961719..11ca52a688 100644
--- a/src/org/thoughtcrime/securesms/backup/BackupDialog.java
+++ b/src/org/thoughtcrime/securesms/backup/BackupDialog.java
@@ -4,8 +4,8 @@ package org.thoughtcrime.securesms.backup;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.TextView;
diff --git a/src/org/thoughtcrime/securesms/backup/BackupPassphrase.java b/src/org/thoughtcrime/securesms/backup/BackupPassphrase.java
index 2a96e3a190..0f24f378a0 100644
--- a/src/org/thoughtcrime/securesms/backup/BackupPassphrase.java
+++ b/src/org/thoughtcrime/securesms/backup/BackupPassphrase.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.backup;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.crypto.KeyStoreHelper;
 import org.thoughtcrime.securesms.logging.Log;
diff --git a/src/org/thoughtcrime/securesms/backup/FullBackupBase.java b/src/org/thoughtcrime/securesms/backup/FullBackupBase.java
index 431f60bd9b..c88c4fec21 100644
--- a/src/org/thoughtcrime/securesms/backup/FullBackupBase.java
+++ b/src/org/thoughtcrime/securesms/backup/FullBackupBase.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.backup;
 
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.greenrobot.eventbus.EventBus;
 import org.whispersystems.libsignal.util.ByteUtil;
diff --git a/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java b/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java
index a706a8fc2c..bd0864f065 100644
--- a/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java
+++ b/src/org/thoughtcrime/securesms/backup/FullBackupExporter.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.backup;
 
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.annimon.stream.function.Consumer;
diff --git a/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java b/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java
index a391638558..96ee5b9f8c 100644
--- a/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java
+++ b/src/org/thoughtcrime/securesms/backup/FullBackupImporter.java
@@ -6,7 +6,7 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Pair;
 
 import net.sqlcipher.database.SQLiteDatabase;
diff --git a/src/org/thoughtcrime/securesms/color/MaterialColor.java b/src/org/thoughtcrime/securesms/color/MaterialColor.java
index 68c4f54502..1832584e9e 100644
--- a/src/org/thoughtcrime/securesms/color/MaterialColor.java
+++ b/src/org/thoughtcrime/securesms/color/MaterialColor.java
@@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.color;
 
 import android.content.Context;
 import android.graphics.Color;
-import android.support.annotation.ColorInt;
-import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
+import androidx.annotation.NonNull;
 
 import network.loki.messenger.R;
 
diff --git a/src/org/thoughtcrime/securesms/color/MaterialColors.java b/src/org/thoughtcrime/securesms/color/MaterialColors.java
index 5a0d5bf771..3ebec24104 100644
--- a/src/org/thoughtcrime/securesms/color/MaterialColors.java
+++ b/src/org/thoughtcrime/securesms/color/MaterialColors.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.color;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/org/thoughtcrime/securesms/components/AccessibleToggleButton.java b/src/org/thoughtcrime/securesms/components/AccessibleToggleButton.java
index 1acc918e96..70c0f73259 100644
--- a/src/org/thoughtcrime/securesms/components/AccessibleToggleButton.java
+++ b/src/org/thoughtcrime/securesms/components/AccessibleToggleButton.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.widget.ToggleButton;
 
diff --git a/src/org/thoughtcrime/securesms/components/AlbumThumbnailView.java b/src/org/thoughtcrime/securesms/components/AlbumThumbnailView.java
index 3b79a19dc0..a1b5b71441 100644
--- a/src/org/thoughtcrime/securesms/components/AlbumThumbnailView.java
+++ b/src/org/thoughtcrime/securesms/components/AlbumThumbnailView.java
@@ -1,10 +1,10 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import android.support.annotation.ColorInt;
-import android.support.annotation.IdRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.ColorInt;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
diff --git a/src/org/thoughtcrime/securesms/components/AlertView.java b/src/org/thoughtcrime/securesms/components/AlertView.java
index a0ff0a2fb0..5c0942bd8a 100644
--- a/src/org/thoughtcrime/securesms/components/AlertView.java
+++ b/src/org/thoughtcrime/securesms/components/AlertView.java
@@ -4,7 +4,7 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Build.VERSION_CODES;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
diff --git a/src/org/thoughtcrime/securesms/components/AnimatingToggle.java b/src/org/thoughtcrime/securesms/components/AnimatingToggle.java
index 37dc384f18..d079eba62f 100644
--- a/src/org/thoughtcrime/securesms/components/AnimatingToggle.java
+++ b/src/org/thoughtcrime/securesms/components/AnimatingToggle.java
@@ -1,9 +1,9 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java b/src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java
index bdd60ab56a..86dfa8b6ec 100644
--- a/src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java
+++ b/src/org/thoughtcrime/securesms/components/AttachmentTypeSelector.java
@@ -8,9 +8,9 @@ import android.content.Context;
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.LoaderManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.loader.app.LoaderManager;
 import android.util.Pair;
 import android.view.Gravity;
 import android.view.LayoutInflater;
diff --git a/src/org/thoughtcrime/securesms/components/AudioView.java b/src/org/thoughtcrime/securesms/components/AudioView.java
index cb5ec9513b..9e4c7c3e9a 100644
--- a/src/org/thoughtcrime/securesms/components/AudioView.java
+++ b/src/org/thoughtcrime/securesms/components/AudioView.java
@@ -8,8 +8,8 @@ import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.AnimatedVectorDrawable;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/components/AvatarImageView.java b/src/org/thoughtcrime/securesms/components/AvatarImageView.java
index 2fba777f0a..375f61a1dc 100644
--- a/src/org/thoughtcrime/securesms/components/AvatarImageView.java
+++ b/src/org/thoughtcrime/securesms/components/AvatarImageView.java
@@ -8,9 +8,9 @@ import android.graphics.Outline;
 import android.graphics.Paint;
 import android.graphics.drawable.Drawable;
 import android.provider.ContactsContract;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewOutlineProvider;
diff --git a/src/org/thoughtcrime/securesms/components/CircleColorImageView.java b/src/org/thoughtcrime/securesms/components/CircleColorImageView.java
index a8a0991152..c9ed937b78 100644
--- a/src/org/thoughtcrime/securesms/components/CircleColorImageView.java
+++ b/src/org/thoughtcrime/securesms/components/CircleColorImageView.java
@@ -5,7 +5,7 @@ import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 
 import network.loki.messenger.R;
diff --git a/src/org/thoughtcrime/securesms/components/ComposeText.java b/src/org/thoughtcrime/securesms/components/ComposeText.java
index daaec06406..14353c605c 100644
--- a/src/org/thoughtcrime/securesms/components/ComposeText.java
+++ b/src/org/thoughtcrime/securesms/components/ComposeText.java
@@ -4,13 +4,13 @@ import android.content.Context;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.v13.view.inputmethod.EditorInfoCompat;
-import android.support.v13.view.inputmethod.InputConnectionCompat;
-import android.support.v13.view.inputmethod.InputContentInfoCompat;
-import android.support.v4.os.BuildCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.core.view.inputmethod.EditorInfoCompat;
+import androidx.core.view.inputmethod.InputConnectionCompat;
+import androidx.core.view.inputmethod.InputContentInfoCompat;
+import androidx.core.os.BuildCompat;
 import android.text.InputType;
 import android.text.Spannable;
 import android.text.SpannableString;
diff --git a/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java b/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
index 03c9cf24c6..8ae8e555f7 100644
--- a/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
+++ b/src/org/thoughtcrime/securesms/components/ContactFilterToolbar.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
 import android.graphics.Rect;
-import android.support.v7.widget.Toolbar;
+import androidx.appcompat.widget.Toolbar;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
diff --git a/src/org/thoughtcrime/securesms/components/ControllableTabLayout.java b/src/org/thoughtcrime/securesms/components/ControllableTabLayout.java
index b15530eb36..969945621f 100644
--- a/src/org/thoughtcrime/securesms/components/ControllableTabLayout.java
+++ b/src/org/thoughtcrime/securesms/components/ControllableTabLayout.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import android.support.design.widget.TabLayout;
+import com.google.android.material.tabs.TabLayout;
 import android.util.AttributeSet;
 import android.view.View;
 
diff --git a/src/org/thoughtcrime/securesms/components/ControllableViewPager.java b/src/org/thoughtcrime/securesms/components/ControllableViewPager.java
index 9012216f15..9b917fa135 100644
--- a/src/org/thoughtcrime/securesms/components/ControllableViewPager.java
+++ b/src/org/thoughtcrime/securesms/components/ControllableViewPager.java
@@ -1,9 +1,9 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 
diff --git a/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java b/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java
index cf30ea76b9..2715d9b773 100644
--- a/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java
+++ b/src/org/thoughtcrime/securesms/components/ConversationItemFooter.java
@@ -4,8 +4,8 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
diff --git a/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java b/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
index 15c24b1241..4b4e791ab2 100644
--- a/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
+++ b/src/org/thoughtcrime/securesms/components/ConversationItemThumbnail.java
@@ -3,10 +3,10 @@ package org.thoughtcrime.securesms.components;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.UiThread;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.UiThread;
 import android.util.AttributeSet;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
diff --git a/src/org/thoughtcrime/securesms/components/ConversationSearchBottomBar.java b/src/org/thoughtcrime/securesms/components/ConversationSearchBottomBar.java
index b2177ed1d6..603c4869a1 100644
--- a/src/org/thoughtcrime/securesms/components/ConversationSearchBottomBar.java
+++ b/src/org/thoughtcrime/securesms/components/ConversationSearchBottomBar.java
@@ -1,9 +1,9 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.constraint.ConstraintLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.TextView;
diff --git a/src/org/thoughtcrime/securesms/components/ConversationTypingView.java b/src/org/thoughtcrime/securesms/components/ConversationTypingView.java
index 8c737e51fc..bfa560435f 100644
--- a/src/org/thoughtcrime/securesms/components/ConversationTypingView.java
+++ b/src/org/thoughtcrime/securesms/components/ConversationTypingView.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
diff --git a/src/org/thoughtcrime/securesms/components/CornerMask.java b/src/org/thoughtcrime/securesms/components/CornerMask.java
index ce12259ec9..1abb16ac26 100644
--- a/src/org/thoughtcrime/securesms/components/CornerMask.java
+++ b/src/org/thoughtcrime/securesms/components/CornerMask.java
@@ -7,8 +7,8 @@ import android.graphics.Path;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.RectF;
-import android.os.Build;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 import android.view.View;
 
 public class CornerMask {
diff --git a/src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java b/src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java
index e40b05fde3..fe9877829b 100644
--- a/src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java
+++ b/src/org/thoughtcrime/securesms/components/CustomDefaultPreference.java
@@ -4,10 +4,10 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.DialogPreference;
-import android.support.v7.preference.PreferenceDialogFragmentCompat;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.DialogPreference;
+import androidx.preference.PreferenceDialogFragmentCompat;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
diff --git a/src/org/thoughtcrime/securesms/components/DocumentView.java b/src/org/thoughtcrime/securesms/components/DocumentView.java
index 2121a757aa..e991d83a2e 100644
--- a/src/org/thoughtcrime/securesms/components/DocumentView.java
+++ b/src/org/thoughtcrime/securesms/components/DocumentView.java
@@ -5,9 +5,9 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
-import android.support.annotation.AttrRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java b/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java
index 8045227a8c..71ba11fba5 100644
--- a/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java
+++ b/src/org/thoughtcrime/securesms/components/ExpirationTimerView.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 
 import network.loki.messenger.R;
@@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.util.Util;
 import java.lang.ref.WeakReference;
 import java.util.concurrent.TimeUnit;
 
-public class ExpirationTimerView extends android.support.v7.widget.AppCompatImageView {
+public class ExpirationTimerView extends androidx.appcompat.widget.AppCompatImageView {
 
   private long startedAt;
   private long expiresIn;
diff --git a/src/org/thoughtcrime/securesms/components/FromTextView.java b/src/org/thoughtcrime/securesms/components/FromTextView.java
index fbeb943956..d35ee5fa74 100644
--- a/src/org/thoughtcrime/securesms/components/FromTextView.java
+++ b/src/org/thoughtcrime/securesms/components/FromTextView.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
 import android.graphics.Typeface;
-import android.support.v4.view.ViewCompat;
+import androidx.core.view.ViewCompat;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
@@ -17,7 +17,6 @@ import network.loki.messenger.R;
 import org.thoughtcrime.securesms.components.emoji.EmojiTextView;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.ResUtil;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.spans.CenterAlignedRelativeSizeSpan;
 
 public class FromTextView extends EmojiTextView {
diff --git a/src/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java b/src/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java
index 620671dcde..26d70112b6 100644
--- a/src/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java
+++ b/src/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.components;
 
 import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.widget.ImageView;
 
 import com.bumptech.glide.request.target.BitmapImageViewTarget;
diff --git a/src/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java b/src/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java
index e333067940..f6ede07f7e 100644
--- a/src/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java
+++ b/src/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.components;
 
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.widget.ImageView;
 
 import com.bumptech.glide.request.target.DrawableImageViewTarget;
diff --git a/src/org/thoughtcrime/securesms/components/HidingLinearLayout.java b/src/org/thoughtcrime/securesms/components/HidingLinearLayout.java
index ded45bb89d..980735aa48 100644
--- a/src/org/thoughtcrime/securesms/components/HidingLinearLayout.java
+++ b/src/org/thoughtcrime/securesms/components/HidingLinearLayout.java
@@ -3,19 +3,14 @@ package org.thoughtcrime.securesms.components;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import android.util.AttributeSet;
-import android.view.ViewGroup;
 import android.view.animation.AlphaAnimation;
 import android.view.animation.Animation;
 import android.view.animation.AnimationSet;
-import android.view.animation.AnimationUtils;
 import android.view.animation.ScaleAnimation;
-import android.view.animation.TranslateAnimation;
 import android.widget.LinearLayout;
 
-import network.loki.messenger.R;
-
 public class HidingLinearLayout extends LinearLayout {
 
   public HidingLinearLayout(Context context) {
diff --git a/src/org/thoughtcrime/securesms/components/ImageDivet.java b/src/org/thoughtcrime/securesms/components/ImageDivet.java
index dad179a3e0..0aa1ae2beb 100644
--- a/src/org/thoughtcrime/securesms/components/ImageDivet.java
+++ b/src/org/thoughtcrime/securesms/components/ImageDivet.java
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.drawable.Drawable;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 
 import network.loki.messenger.R;
diff --git a/src/org/thoughtcrime/securesms/components/InputAwareLayout.java b/src/org/thoughtcrime/securesms/components/InputAwareLayout.java
index 339a18ae9f..126fb5f03c 100644
--- a/src/org/thoughtcrime/securesms/components/InputAwareLayout.java
+++ b/src/org/thoughtcrime/securesms/components/InputAwareLayout.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.widget.EditText;
 
diff --git a/src/org/thoughtcrime/securesms/components/InputPanel.java b/src/org/thoughtcrime/securesms/components/InputPanel.java
index 4fb3640dea..6394c8feab 100644
--- a/src/org/thoughtcrime/securesms/components/InputPanel.java
+++ b/src/org/thoughtcrime/securesms/components/InputPanel.java
@@ -4,13 +4,13 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.DimenRes;
-import android.support.annotation.MainThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.DimenRes;
+import androidx.annotation.MainThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.format.DateUtils;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
diff --git a/src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java b/src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java
index a1ffd48121..52618891c9 100644
--- a/src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java
+++ b/src/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java
@@ -22,7 +22,7 @@ import android.graphics.Rect;
 import android.os.Build;
 import android.os.Build.VERSION_CODES;
 import android.preference.PreferenceManager;
-import android.support.v7.widget.LinearLayoutCompat;
+import androidx.appcompat.widget.LinearLayoutCompat;
 import android.util.AttributeSet;
 import org.thoughtcrime.securesms.logging.Log;
 import android.view.Surface;
diff --git a/src/org/thoughtcrime/securesms/components/LabeledEditText.java b/src/org/thoughtcrime/securesms/components/LabeledEditText.java
index fd7d767e74..11c9fcaf1c 100644
--- a/src/org/thoughtcrime/securesms/components/LabeledEditText.java
+++ b/src/org/thoughtcrime/securesms/components/LabeledEditText.java
@@ -3,15 +3,13 @@ package org.thoughtcrime.securesms.components;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.Editable;
-import android.text.InputFilter;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.TextView;
diff --git a/src/org/thoughtcrime/securesms/components/LinkPreviewView.java b/src/org/thoughtcrime/securesms/components/LinkPreviewView.java
index 52c5cc28f4..6453b0cbf9 100644
--- a/src/org/thoughtcrime/securesms/components/LinkPreviewView.java
+++ b/src/org/thoughtcrime/securesms/components/LinkPreviewView.java
@@ -4,8 +4,8 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Color;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/components/MaxHeightScrollView.java b/src/org/thoughtcrime/securesms/components/MaxHeightScrollView.java
index b6b029d91a..744e1a35e5 100644
--- a/src/org/thoughtcrime/securesms/components/MaxHeightScrollView.java
+++ b/src/org/thoughtcrime/securesms/components/MaxHeightScrollView.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.widget.ScrollView;
 
diff --git a/src/org/thoughtcrime/securesms/components/MediaView.java b/src/org/thoughtcrime/securesms/components/MediaView.java
index 426e511388..d1ab0a2627 100644
--- a/src/org/thoughtcrime/securesms/components/MediaView.java
+++ b/src/org/thoughtcrime/securesms/components/MediaView.java
@@ -4,14 +4,13 @@ package org.thoughtcrime.securesms.components;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.Window;
 import android.widget.FrameLayout;
-import android.widget.TextView;
 
 import network.loki.messenger.R;
 import org.thoughtcrime.securesms.mms.GlideRequests;
diff --git a/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java b/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
index 7469cc5254..2eff948224 100644
--- a/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
+++ b/src/org/thoughtcrime/securesms/components/MicrophoneRecorderView.java
@@ -3,9 +3,9 @@ package org.thoughtcrime.securesms.components;
 import android.Manifest;
 import android.content.Context;
 import android.graphics.PorterDuff;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/components/Outliner.java b/src/org/thoughtcrime/securesms/components/Outliner.java
index e2c8e71d26..cb6cfc7abf 100644
--- a/src/org/thoughtcrime/securesms/components/Outliner.java
+++ b/src/org/thoughtcrime/securesms/components/Outliner.java
@@ -1,16 +1,11 @@
 package org.thoughtcrime.securesms.components;
 
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Path;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
 import android.graphics.RectF;
-import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.view.View;
+
+import androidx.annotation.ColorInt;
 
 public class Outliner {
 
diff --git a/src/org/thoughtcrime/securesms/components/PushRecipientsPanel.java b/src/org/thoughtcrime/securesms/components/PushRecipientsPanel.java
index 372a5e6f1b..655fa59083 100644
--- a/src/org/thoughtcrime/securesms/components/PushRecipientsPanel.java
+++ b/src/org/thoughtcrime/securesms/components/PushRecipientsPanel.java
@@ -17,8 +17,8 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import android.os.Build;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
diff --git a/src/org/thoughtcrime/securesms/components/QuoteView.java b/src/org/thoughtcrime/securesms/components/QuoteView.java
index 43c9e8bf7c..2ec6a4579d 100644
--- a/src/org/thoughtcrime/securesms/components/QuoteView.java
+++ b/src/org/thoughtcrime/securesms/components/QuoteView.java
@@ -6,9 +6,9 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/components/RatingManager.java b/src/org/thoughtcrime/securesms/components/RatingManager.java
index 2e34cee25e..7114f240da 100644
--- a/src/org/thoughtcrime/securesms/components/RatingManager.java
+++ b/src/org/thoughtcrime/securesms/components/RatingManager.java
@@ -6,7 +6,7 @@ import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 import org.thoughtcrime.securesms.logging.Log;
 import android.widget.Toast;
 
diff --git a/src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java b/src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java
index d1ce480886..4572d01965 100644
--- a/src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java
+++ b/src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java
@@ -5,16 +5,15 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java b/src/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java
index 05c32624b9..50d9d4d3db 100644
--- a/src/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java
+++ b/src/org/thoughtcrime/securesms/components/RecyclerViewFastScroller.java
@@ -24,10 +24,10 @@ import android.animation.ObjectAnimator;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build.VERSION;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java b/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java
index d90c18d8e1..aac02118a8 100644
--- a/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java
+++ b/src/org/thoughtcrime/securesms/components/RemovableEditableMediaView.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/components/RepeatableImageKey.java b/src/org/thoughtcrime/securesms/components/RepeatableImageKey.java
index 5cf63cfe73..39ddf092cb 100644
--- a/src/org/thoughtcrime/securesms/components/RepeatableImageKey.java
+++ b/src/org/thoughtcrime/securesms/components/RepeatableImageKey.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatImageButton;
+import androidx.appcompat.widget.AppCompatImageButton;
 import android.util.AttributeSet;
 import android.view.HapticFeedbackConstants;
 import android.view.MotionEvent;
diff --git a/src/org/thoughtcrime/securesms/components/SearchToolbar.java b/src/org/thoughtcrime/securesms/components/SearchToolbar.java
index dfd7229257..e4f9ad41b7 100644
--- a/src/org/thoughtcrime/securesms/components/SearchToolbar.java
+++ b/src/org/thoughtcrime/securesms/components/SearchToolbar.java
@@ -6,10 +6,6 @@ import android.content.Context;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.MainThread;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.SearchView;
-import android.support.v7.widget.Toolbar;
 import android.util.AttributeSet;
 import android.view.MenuItem;
 import android.view.View;
@@ -17,9 +13,15 @@ import android.view.ViewAnimationUtils;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 
-import network.loki.messenger.R;
+import androidx.annotation.MainThread;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
+
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
 
+import network.loki.messenger.R;
+
 public class SearchToolbar extends LinearLayout {
 
   private float x, y;
@@ -56,7 +58,7 @@ public class SearchToolbar extends LinearLayout {
 
     this.searchItem = toolbar.getMenu().findItem(R.id.action_filter_search);
     SearchView searchView = (SearchView) searchItem.getActionView();
-    EditText   searchText = searchView.findViewById(android.support.v7.appcompat.R.id.search_src_text);
+    EditText   searchText = searchView.findViewById(androidx.appcompat.R.id.search_src_text);
 
     searchView.setSubmitButtonEnabled(false);
 
diff --git a/src/org/thoughtcrime/securesms/components/SendButton.java b/src/org/thoughtcrime/securesms/components/SendButton.java
index aa37bd7905..ce4488ffd0 100644
--- a/src/org/thoughtcrime/securesms/components/SendButton.java
+++ b/src/org/thoughtcrime/securesms/components/SendButton.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.AppCompatImageButton;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatImageButton;
 import android.util.AttributeSet;
 import android.view.View;
 
diff --git a/src/org/thoughtcrime/securesms/components/SharedContactView.java b/src/org/thoughtcrime/securesms/components/SharedContactView.java
index b70603838a..5fea44e4f5 100644
--- a/src/org/thoughtcrime/securesms/components/SharedContactView.java
+++ b/src/org/thoughtcrime/securesms/components/SharedContactView.java
@@ -6,9 +6,9 @@ import android.graphics.Canvas;
 import android.graphics.Color;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
diff --git a/src/org/thoughtcrime/securesms/components/SquareImageView.java b/src/org/thoughtcrime/securesms/components/SquareImageView.java
index 997349d699..bebf1d88bf 100644
--- a/src/org/thoughtcrime/securesms/components/SquareImageView.java
+++ b/src/org/thoughtcrime/securesms/components/SquareImageView.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 
 public class SquareImageView extends AppCompatImageView {
diff --git a/src/org/thoughtcrime/securesms/components/StickerView.java b/src/org/thoughtcrime/securesms/components/StickerView.java
index ae4813917b..dd3700f494 100644
--- a/src/org/thoughtcrime/securesms/components/StickerView.java
+++ b/src/org/thoughtcrime/securesms/components/StickerView.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
diff --git a/src/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java b/src/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java
index d31a8ed19f..bdfad8c63a 100644
--- a/src/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java
+++ b/src/org/thoughtcrime/securesms/components/SwitchPreferenceCompat.java
@@ -3,10 +3,9 @@ package org.thoughtcrime.securesms.components;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.os.Build;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.Preference;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.Preference;
 import android.util.AttributeSet;
-import android.view.View;
 
 import network.loki.messenger.R;
 
diff --git a/src/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java b/src/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java
index 1be37ab924..f270fca733 100644
--- a/src/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java
+++ b/src/org/thoughtcrime/securesms/components/ThreadPhotoRailView.java
@@ -3,11 +3,11 @@ package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/components/ThumbnailView.java b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
index f0be76c992..e648fcb0c8 100644
--- a/src/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.components;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.UiThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.UiThread;
 import android.util.AttributeSet;
 import org.thoughtcrime.securesms.logging.Log;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/components/TooltipPopup.java b/src/org/thoughtcrime/securesms/components/TooltipPopup.java
index a24cb7ca91..d1bca2077c 100644
--- a/src/org/thoughtcrime/securesms/components/TooltipPopup.java
+++ b/src/org/thoughtcrime/securesms/components/TooltipPopup.java
@@ -3,10 +3,10 @@ package org.thoughtcrime.securesms.components;
 import android.content.Context;
 import android.graphics.PorterDuff;
 import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/components/TransferControlView.java b/src/org/thoughtcrime/securesms/components/TransferControlView.java
index 9d18035308..843ebc9ee7 100644
--- a/src/org/thoughtcrime/securesms/components/TransferControlView.java
+++ b/src/org/thoughtcrime/securesms/components/TransferControlView.java
@@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.components;
 
 import android.animation.LayoutTransition;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
diff --git a/src/org/thoughtcrime/securesms/components/TypingIndicatorView.java b/src/org/thoughtcrime/securesms/components/TypingIndicatorView.java
index 2df2f8d3a3..477776a9dd 100644
--- a/src/org/thoughtcrime/securesms/components/TypingIndicatorView.java
+++ b/src/org/thoughtcrime/securesms/components/TypingIndicatorView.java
@@ -5,13 +5,12 @@ import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.LinearLayout;
 
 import network.loki.messenger.R;
-import org.thoughtcrime.securesms.logging.Log;
 
 public class TypingIndicatorView extends LinearLayout {
 
diff --git a/src/org/thoughtcrime/securesms/components/TypingStatusRepository.java b/src/org/thoughtcrime/securesms/components/TypingStatusRepository.java
index de34b3511c..96671d7906 100644
--- a/src/org/thoughtcrime/securesms/components/TypingStatusRepository.java
+++ b/src/org/thoughtcrime/securesms/components/TypingStatusRepository.java
@@ -1,10 +1,10 @@
 package org.thoughtcrime.securesms.components;
 
 import android.annotation.SuppressLint;
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
diff --git a/src/org/thoughtcrime/securesms/components/TypingStatusSender.java b/src/org/thoughtcrime/securesms/components/TypingStatusSender.java
index 0804d598a5..55fdd513f7 100644
--- a/src/org/thoughtcrime/securesms/components/TypingStatusSender.java
+++ b/src/org/thoughtcrime/securesms/components/TypingStatusSender.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.database.Address;
diff --git a/src/org/thoughtcrime/securesms/components/ZoomingImageView.java b/src/org/thoughtcrime/securesms/components/ZoomingImageView.java
index d1613d3502..da84135a10 100644
--- a/src/org/thoughtcrime/securesms/components/ZoomingImageView.java
+++ b/src/org/thoughtcrime/securesms/components/ZoomingImageView.java
@@ -4,8 +4,8 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import org.thoughtcrime.securesms.logging.Log;
 import android.util.Pair;
diff --git a/src/org/thoughtcrime/securesms/components/camera/CameraUtils.java b/src/org/thoughtcrime/securesms/components/camera/CameraUtils.java
index 31c24c52a6..8feaa8fb13 100644
--- a/src/org/thoughtcrime/securesms/components/camera/CameraUtils.java
+++ b/src/org/thoughtcrime/securesms/components/camera/CameraUtils.java
@@ -5,8 +5,8 @@ import android.hardware.Camera;
 import android.hardware.Camera.CameraInfo;
 import android.hardware.Camera.Parameters;
 import android.hardware.Camera.Size;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.DisplayMetrics;
 import org.thoughtcrime.securesms.logging.Log;
 import android.view.Surface;
diff --git a/src/org/thoughtcrime/securesms/components/camera/CameraView.java b/src/org/thoughtcrime/securesms/components/camera/CameraView.java
index bc2fec49c0..8e99474195 100644
--- a/src/org/thoughtcrime/securesms/components/camera/CameraView.java
+++ b/src/org/thoughtcrime/securesms/components/camera/CameraView.java
@@ -29,8 +29,8 @@ import android.hardware.Camera.Size;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Build.VERSION;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import org.thoughtcrime.securesms.logging.Log;
 import android.view.OrientationEventListener;
diff --git a/src/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java b/src/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java
index a7dec006fc..73c209b14d 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/AsciiEmojiView.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.components.emoji;
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Paint;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.java b/src/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.java
index cc4c7156e5..28c4e9f385 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/CompositeEmojiPageModel.java
@@ -1,13 +1,9 @@
 package org.thoughtcrime.securesms.components.emoji;
 
-import android.support.annotation.AttrRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
-import com.annimon.stream.Stream;
-
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
 
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
index e3c4ba9fe5..34dfc06bfc 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiEditText.java
@@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.components.emoji;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.AppCompatEditText;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatEditText;
 import android.text.InputFilter;
 import android.util.AttributeSet;
 
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java
index c0f1f90485..67fd6591e0 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiKeyboardProvider.java
@@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.components.emoji;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.PagerAdapter;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.PagerAdapter;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java
index 607bdf6084..bbcffb2e13 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java
@@ -1,9 +1,9 @@
 package org.thoughtcrime.securesms.components.emoji;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java
index 8b599e378e..b679054f3f 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiPageViewGridAdapter.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.components.emoji;
 
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
index f7c8aef716..c7da539376 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
@@ -11,8 +11,8 @@ import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.widget.TextView;
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java
index 998e2b9991..90e828cdbd 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiSpan.java
@@ -4,7 +4,7 @@ import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.graphics.Paint.FontMetricsInt;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.widget.TextView;
 
 import network.loki.messenger.R;
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
index c786a369a5..ad99f1d065 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
@@ -3,10 +3,10 @@ package org.thoughtcrime.securesms.components.emoji;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.TextViewCompat;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.widget.TextViewCompat;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.util.AttributeSet;
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
index 35d7e7baa9..ad9aead5a7 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiToggle.java
@@ -4,8 +4,8 @@ import android.content.Context;
 import android.content.res.ColorStateList;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.AppCompatImageButton;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.AppCompatImageButton;
 import android.util.AttributeSet;
 
 import org.thoughtcrime.securesms.stickers.StickerKeyboardProvider;
diff --git a/src/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java b/src/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java
index 06a617d5b8..75dbe2afa3 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components.emoji;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.widget.ImageView;
diff --git a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java b/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java
index ae86d7a79d..7574236349 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java
@@ -1,12 +1,12 @@
 package org.thoughtcrime.securesms.components.emoji;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.PagerAdapter;
-import android.support.v4.view.ViewPager;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.PagerAdapter;
+import androidx.viewpager.widget.ViewPager;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java b/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java
index 66236978aa..2a1b377157 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardBottomTabAdapter.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.components.emoji;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java b/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java
index f324e0cd40..f1537cd202 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/MediaKeyboardProvider.java
@@ -1,9 +1,9 @@
 package org.thoughtcrime.securesms.components.emoji;
 
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.PagerAdapter;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.viewpager.widget.PagerAdapter;
 import android.widget.ImageView;
 
 import org.thoughtcrime.securesms.mms.GlideRequests;
diff --git a/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java b/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java
index 74a080e4e7..9188fc6622 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 import com.fasterxml.jackson.databind.type.CollectionType;
diff --git a/src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java b/src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java
index 1843b33c94..e1b248b5cc 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/StaticEmojiPageModel.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.components.emoji;
 
-import android.support.annotation.AttrRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java
index 28aed06238..387af40a08 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiDrawInfo.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.components.emoji.parsing;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public class EmojiDrawInfo {
 
diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java
index a5487f7872..d6848321b5 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java
@@ -6,13 +6,10 @@ import android.content.res.AssetManager;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import org.thoughtcrime.securesms.logging.Log;
 
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-
 import org.thoughtcrime.securesms.components.emoji.EmojiPageModel;
-import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.util.ListenableFutureTask;
 import org.thoughtcrime.securesms.util.Stopwatch;
 import org.thoughtcrime.securesms.util.Util;
@@ -21,7 +18,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.lang.ref.SoftReference;
 import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
 
 public class EmojiPageBitmap {
 
diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java
index 7a9bc32a78..b582d7afe1 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java
@@ -21,8 +21,8 @@
 package org.thoughtcrime.securesms.components.emoji.parsing;
 
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.Iterator;
 import java.util.LinkedList;
diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiTree.java b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiTree.java
index cde20d76f8..af8caa568d 100644
--- a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiTree.java
+++ b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiTree.java
@@ -20,7 +20,7 @@
 
 package org.thoughtcrime.securesms.components.emoji.parsing;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java b/src/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java
index 6cdc6f8a60..ca661915b4 100644
--- a/src/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java
+++ b/src/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java
@@ -4,8 +4,8 @@ package org.thoughtcrime.securesms.components.identity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 
 import network.loki.messenger.R;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
diff --git a/src/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java b/src/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java
index 1981b573af..f06cd2c6bd 100644
--- a/src/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java
+++ b/src/org/thoughtcrime/securesms/components/identity/UnverifiedBannerView.java
@@ -3,9 +3,9 @@ package org.thoughtcrime.securesms.components.identity;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import org.thoughtcrime.securesms.logging.Log;
 import android.view.LayoutInflater;
diff --git a/src/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java b/src/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java
index c42b7e737e..0ab6982f2e 100644
--- a/src/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java
+++ b/src/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.components.identity;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 
 import network.loki.messenger.R;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
diff --git a/src/org/thoughtcrime/securesms/components/location/SignalPlace.java b/src/org/thoughtcrime/securesms/components/location/SignalPlace.java
index 0519e8d2c2..1b836a6bf5 100644
--- a/src/org/thoughtcrime/securesms/components/location/SignalPlace.java
+++ b/src/org/thoughtcrime/securesms/components/location/SignalPlace.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.components.location;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/src/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java b/src/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java
index dbf18be384..4fc116565f 100644
--- a/src/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java
+++ b/src/org/thoughtcrime/securesms/components/recyclerview/DeleteItemAnimator.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.components.recyclerview;
 
 
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.RecyclerView;
 
 public class DeleteItemAnimator extends DefaultItemAnimator {
 
diff --git a/src/org/thoughtcrime/securesms/components/recyclerview/SmoothScrollingLinearLayoutManager.java b/src/org/thoughtcrime/securesms/components/recyclerview/SmoothScrollingLinearLayoutManager.java
index 01bebbf9d8..a1b45ac2ae 100644
--- a/src/org/thoughtcrime/securesms/components/recyclerview/SmoothScrollingLinearLayoutManager.java
+++ b/src/org/thoughtcrime/securesms/components/recyclerview/SmoothScrollingLinearLayoutManager.java
@@ -1,9 +1,9 @@
 package org.thoughtcrime.securesms.components.recyclerview;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.LinearSmoothScroller;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.LinearSmoothScroller;
 import android.util.DisplayMetrics;
 
 public class SmoothScrollingLinearLayoutManager extends LinearLayoutManager {
diff --git a/src/org/thoughtcrime/securesms/components/registration/CallMeCountDownView.java b/src/org/thoughtcrime/securesms/components/registration/CallMeCountDownView.java
index b46cdf0fca..ab574e9670 100644
--- a/src/org/thoughtcrime/securesms/components/registration/CallMeCountDownView.java
+++ b/src/org/thoughtcrime/securesms/components/registration/CallMeCountDownView.java
@@ -2,21 +2,11 @@ package org.thoughtcrime.securesms.components.registration;
 
 
 import android.content.Context;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
-import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
 import android.util.AttributeSet;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
 
 import network.loki.messenger.R;
 
-public class CallMeCountDownView extends android.support.v7.widget.AppCompatButton {
+public class CallMeCountDownView extends androidx.appcompat.widget.AppCompatButton {
 
   private int countDown;
 
diff --git a/src/org/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton.java b/src/org/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton.java
index 9277f1eb87..df117acd88 100644
--- a/src/org/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton.java
+++ b/src/org/thoughtcrime/securesms/components/registration/PulsingFloatingActionButton.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.components.registration;
 
 import android.animation.Animator;
 import android.content.Context;
-import android.support.design.widget.FloatingActionButton;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import android.util.AttributeSet;
 
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
diff --git a/src/org/thoughtcrime/securesms/components/registration/VerificationCodeView.java b/src/org/thoughtcrime/securesms/components/registration/VerificationCodeView.java
index b9a8a7da50..793c152ba4 100644
--- a/src/org/thoughtcrime/securesms/components/registration/VerificationCodeView.java
+++ b/src/org/thoughtcrime/securesms/components/registration/VerificationCodeView.java
@@ -5,10 +5,10 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.MainThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.MainThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java b/src/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java
index 1f9297ce14..79e419f03a 100644
--- a/src/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java
+++ b/src/org/thoughtcrime/securesms/components/registration/VerificationPinKeyboard.java
@@ -6,9 +6,9 @@ import android.graphics.PorterDuff;
 import android.inputmethodservice.Keyboard;
 import android.inputmethodservice.KeyboardView;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.animation.Animation;
diff --git a/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java b/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java
index dc60556b44..bba6b4552f 100644
--- a/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java
+++ b/src/org/thoughtcrime/securesms/components/reminder/DozeReminder.java
@@ -8,8 +8,8 @@ import android.net.Uri;
 import android.os.Build;
 import android.os.PowerManager;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import android.view.View;
 
 import network.loki.messenger.R;
diff --git a/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java b/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java
index b00df027f7..d059e6a2f9 100644
--- a/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java
+++ b/src/org/thoughtcrime/securesms/components/reminder/InviteReminder.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components.reminder;
 
 import android.content.Context;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;
 import android.view.View.OnClickListener;
 
diff --git a/src/org/thoughtcrime/securesms/components/reminder/Reminder.java b/src/org/thoughtcrime/securesms/components/reminder/Reminder.java
index 9674197f9e..be0c867173 100644
--- a/src/org/thoughtcrime/securesms/components/reminder/Reminder.java
+++ b/src/org/thoughtcrime/securesms/components/reminder/Reminder.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.components.reminder;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View.OnClickListener;
 
 public abstract class Reminder {
diff --git a/src/org/thoughtcrime/securesms/components/reminder/ServiceOutageReminder.java b/src/org/thoughtcrime/securesms/components/reminder/ServiceOutageReminder.java
index 8a2e5f5eb1..5559caf6f6 100644
--- a/src/org/thoughtcrime/securesms/components/reminder/ServiceOutageReminder.java
+++ b/src/org/thoughtcrime/securesms/components/reminder/ServiceOutageReminder.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.components.reminder;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import network.loki.messenger.R;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
diff --git a/src/org/thoughtcrime/securesms/components/reminder/ShareReminder.java b/src/org/thoughtcrime/securesms/components/reminder/ShareReminder.java
index 17ccf64fa9..6439e5bb68 100644
--- a/src/org/thoughtcrime/securesms/components/reminder/ShareReminder.java
+++ b/src/org/thoughtcrime/securesms/components/reminder/ShareReminder.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.components.reminder;
 import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.View;
 import android.view.View.OnClickListener;
 
diff --git a/src/org/thoughtcrime/securesms/components/viewpager/ExtendedOnPageChangedListener.java b/src/org/thoughtcrime/securesms/components/viewpager/ExtendedOnPageChangedListener.java
index 62d0390102..ae679ddcea 100644
--- a/src/org/thoughtcrime/securesms/components/viewpager/ExtendedOnPageChangedListener.java
+++ b/src/org/thoughtcrime/securesms/components/viewpager/ExtendedOnPageChangedListener.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.components.viewpager;
 
 
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 
 public abstract class ExtendedOnPageChangedListener implements ViewPager.OnPageChangeListener {
 
diff --git a/src/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java b/src/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java
index 5619a57394..7f139f1ba4 100644
--- a/src/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java
+++ b/src/org/thoughtcrime/securesms/components/viewpager/HackyViewPager.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.components.viewpager;
 
 
 import android.content.Context;
-import android.support.v4.view.ViewPager;
+import androidx.viewpager.widget.ViewPager;
 import android.util.AttributeSet;
 import org.thoughtcrime.securesms.logging.Log;
 import android.view.MotionEvent;
diff --git a/src/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java b/src/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java
index 9011d07b6a..2a4cca8589 100644
--- a/src/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java
+++ b/src/org/thoughtcrime/securesms/components/webrtc/PercentFrameLayout.java
@@ -11,21 +11,10 @@
 package org.thoughtcrime.securesms.components.webrtc;
 
 import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffXfermode;
-import android.graphics.Xfermode;
-import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
 
-import java.util.LinkedList;
-import java.util.List;
-
 /**
  * Simple container that confines the children to a subrectangle specified as percentage values of
  * the container size. The children are centered horizontally and vertically inside the confined
diff --git a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java
index 7f18b58e92..de2d4ba53b 100644
--- a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java
+++ b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcAnswerDeclineButton.java
@@ -8,8 +8,8 @@ import android.animation.ObjectAnimator;
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.util.AttributeSet;
 import android.view.MotionEvent;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java
index de7abaff1b..31194a6556 100644
--- a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java
+++ b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallControls.java
@@ -5,7 +5,7 @@ import android.annotation.TargetApi;
 import android.content.Context;
 import android.media.AudioManager;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -20,7 +20,6 @@ import network.loki.messenger.R;
 import org.thoughtcrime.securesms.components.AccessibleToggleButton;
 import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
-import org.thoughtcrime.securesms.webrtc.CameraState;
 
 public class WebRtcCallControls extends LinearLayout {
 
diff --git a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
index 7e321efd8f..76006bbd2f 100644
--- a/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
+++ b/src/org/thoughtcrime/securesms/components/webrtc/WebRtcCallScreen.java
@@ -18,10 +18,10 @@
 package org.thoughtcrime.securesms.components.webrtc;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.view.ViewCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.core.view.ViewCompat;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -42,7 +42,6 @@ import network.loki.messenger.R;
 import org.thoughtcrime.securesms.mms.GlideApp;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientModifiedListener;
-import org.thoughtcrime.securesms.service.WebRtcCallService;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.VerifySpan;
 import org.thoughtcrime.securesms.util.ViewUtil;
diff --git a/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java b/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java
index a95cc0330a..a229ca838f 100644
--- a/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java
+++ b/src/org/thoughtcrime/securesms/contacts/ContactsCursorLoader.java
@@ -16,14 +16,13 @@
  */
 package org.thoughtcrime.securesms.contacts;
 
-import android.Manifest;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.MatrixCursor;
 import android.database.MergeCursor;
 import android.provider.ContactsContract;
-import android.support.annotation.NonNull;
-import android.support.v4.content.CursorLoader;
+import androidx.annotation.NonNull;
+import androidx.loader.content.CursorLoader;
 import android.text.TextUtils;
 
 import network.loki.messenger.R;
@@ -34,7 +33,6 @@ import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.NumberUtil;
 
diff --git a/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java b/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java
index aaa50658d9..97812c3325 100644
--- a/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java
+++ b/src/org/thoughtcrime/securesms/contacts/ContactsDatabase.java
@@ -32,8 +32,8 @@ import android.os.RemoteException;
 import android.provider.BaseColumns;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.RawContacts;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Pair;
 
diff --git a/src/org/thoughtcrime/securesms/contacts/RecipientsEditor.java b/src/org/thoughtcrime/securesms/contacts/RecipientsEditor.java
index 7c77dd8948..2f46eff3dc 100644
--- a/src/org/thoughtcrime/securesms/contacts/RecipientsEditor.java
+++ b/src/org/thoughtcrime/securesms/contacts/RecipientsEditor.java
@@ -18,7 +18,7 @@
 package org.thoughtcrime.securesms.contacts;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatMultiAutoCompleteTextView;
+import androidx.appcompat.widget.AppCompatMultiAutoCompleteTextView;
 import android.telephony.PhoneNumberUtils;
 import android.text.Annotation;
 import android.text.Editable;
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ContactColors.java b/src/org/thoughtcrime/securesms/contacts/avatars/ContactColors.java
index 2a115c58ae..63816f62bb 100644
--- a/src/org/thoughtcrime/securesms/contacts/avatars/ContactColors.java
+++ b/src/org/thoughtcrime/securesms/contacts/avatars/ContactColors.java
@@ -1,9 +1,8 @@
 package org.thoughtcrime.securesms.contacts.avatars;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.color.MaterialColor;
-import org.thoughtcrime.securesms.color.MaterialColors;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ContactColorsLegacy.java b/src/org/thoughtcrime/securesms/contacts/avatars/ContactColorsLegacy.java
index ec99f4d36d..3adb6848f5 100644
--- a/src/org/thoughtcrime/securesms/contacts/avatars/ContactColorsLegacy.java
+++ b/src/org/thoughtcrime/securesms/contacts/avatars/ContactColorsLegacy.java
@@ -1,9 +1,8 @@
 package org.thoughtcrime.securesms.contacts.avatars;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.color.MaterialColor;
-import org.thoughtcrime.securesms.color.MaterialColors;
 
 /**
  * Used for migrating legacy colors to modern colors. For normal color generation, use
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/ContactPhoto.java
index 3199ae2cc4..fbe53dba88 100644
--- a/src/org/thoughtcrime/securesms/contacts/avatars/ContactPhoto.java
+++ b/src/org/thoughtcrime/securesms/contacts/avatars/ContactPhoto.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.contacts.avatars;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 
 import com.bumptech.glide.load.Key;
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java
index 53f7135576..969a0d8c79 100644
--- a/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java
+++ b/src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java
@@ -5,10 +5,10 @@ import android.graphics.Color;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
-import android.support.annotation.NonNull;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.Nullable;
-import android.support.v7.content.res.AppCompatResources;
+import androidx.annotation.NonNull;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
 import android.text.TextUtils;
 
 import com.amulyakhare.textdrawable.TextDrawable;
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java
index 249841afa9..7d0baf8a66 100644
--- a/src/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java
+++ b/src/org/thoughtcrime/securesms/contacts/avatars/GroupRecordContactPhoto.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.contacts.avatars;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java
index 22c3ea398a..02b8731217 100644
--- a/src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java
+++ b/src/org/thoughtcrime/securesms/contacts/avatars/ProfileContactPhoto.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.contacts.avatars;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.profiles.AvatarHelper;
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java
index c1f5cdfb2f..0f2fff167e 100644
--- a/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java
+++ b/src/org/thoughtcrime/securesms/contacts/avatars/ResourceContactPhoto.java
@@ -5,8 +5,8 @@ import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
-import android.support.annotation.DrawableRes;
-import android.support.v7.content.res.AppCompatResources;
+import androidx.annotation.DrawableRes;
+import androidx.appcompat.content.res.AppCompatResources;
 import android.widget.ImageView;
 
 import com.amulyakhare.textdrawable.TextDrawable;
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java
index 817df232c0..863598a5e9 100644
--- a/src/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java
+++ b/src/org/thoughtcrime/securesms/contacts/avatars/SystemContactPhoto.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.contacts.avatars;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.util.Conversions;
diff --git a/src/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java b/src/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java
index 25108a1dea..f341d04597 100644
--- a/src/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java
+++ b/src/org/thoughtcrime/securesms/contacts/avatars/TransparentContactPhoto.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.contacts.avatars;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 
 import com.makeramen.roundedimageview.RoundedDrawable;
 
diff --git a/src/org/thoughtcrime/securesms/contactshare/Contact.java b/src/org/thoughtcrime/securesms/contactshare/Contact.java
index 509ddca64c..aad4ade1ce 100644
--- a/src/org/thoughtcrime/securesms/contactshare/Contact.java
+++ b/src/org/thoughtcrime/securesms/contactshare/Contact.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.contactshare;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java b/src/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java
index bf3632a787..2d439405dc 100644
--- a/src/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java
+++ b/src/org/thoughtcrime/securesms/contactshare/ContactFieldAdapter.java
@@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.contactshare;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java b/src/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java
index 6d0d1ae5d3..3da1d742a4 100644
--- a/src/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java
+++ b/src/org/thoughtcrime/securesms/contactshare/ContactModelMapper.java
@@ -1,10 +1,8 @@
 package org.thoughtcrime.securesms.contactshare;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
-import org.thoughtcrime.securesms.attachments.AttachmentId;
 import org.thoughtcrime.securesms.attachments.PointerAttachment;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.api.messages.shared.SharedContact;
diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java b/src/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java
index ac721ffa1e..29309c096d 100644
--- a/src/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java
+++ b/src/org/thoughtcrime/securesms/contactshare/ContactNameEditActivity.java
@@ -1,11 +1,11 @@
 package org.thoughtcrime.securesms.contactshare;
 
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
 import android.widget.TextView;
 
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactNameEditViewModel.java b/src/org/thoughtcrime/securesms/contactshare/ContactNameEditViewModel.java
index d902a1b23a..860d287157 100644
--- a/src/org/thoughtcrime/securesms/contactshare/ContactNameEditViewModel.java
+++ b/src/org/thoughtcrime/securesms/contactshare/ContactNameEditViewModel.java
@@ -1,11 +1,10 @@
 package org.thoughtcrime.securesms.contactshare;
 
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.ViewModel;
-import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import static org.thoughtcrime.securesms.contactshare.Contact.*;
diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactRepository.java b/src/org/thoughtcrime/securesms/contactshare/ContactRepository.java
index 01b688e004..f606d3444a 100644
--- a/src/org/thoughtcrime/securesms/contactshare/ContactRepository.java
+++ b/src/org/thoughtcrime/securesms/contactshare/ContactRepository.java
@@ -4,9 +4,9 @@ import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.ContactsContract;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 import android.text.TextUtils;
 
 import org.thoughtcrime.securesms.contacts.ContactsDatabase;
diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactShareEditActivity.java b/src/org/thoughtcrime/securesms/contactshare/ContactShareEditActivity.java
index 5e0e001c1a..32b9dc80b4 100644
--- a/src/org/thoughtcrime/securesms/contactshare/ContactShareEditActivity.java
+++ b/src/org/thoughtcrime/securesms/contactshare/ContactShareEditActivity.java
@@ -1,21 +1,19 @@
 package org.thoughtcrime.securesms.contactshare;
 
 import android.app.Activity;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.Toast;
 
-import com.annimon.stream.Stream;
-
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
 import network.loki.messenger.R;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java b/src/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java
index 1f946220a7..699f4b9bad 100644
--- a/src/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java
+++ b/src/org/thoughtcrime/securesms/contactshare/ContactShareEditAdapter.java
@@ -1,19 +1,17 @@
 package org.thoughtcrime.securesms.contactshare;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
-
 import network.loki.messenger.R;
-import org.thoughtcrime.securesms.components.AvatarImageView;
+
 import org.thoughtcrime.securesms.mms.GlideRequests;
 
 import java.util.ArrayList;
diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactShareEditViewModel.java b/src/org/thoughtcrime/securesms/contactshare/ContactShareEditViewModel.java
index 2e76612e94..860729cd45 100644
--- a/src/org/thoughtcrime/securesms/contactshare/ContactShareEditViewModel.java
+++ b/src/org/thoughtcrime/securesms/contactshare/ContactShareEditViewModel.java
@@ -1,11 +1,11 @@
 package org.thoughtcrime.securesms.contactshare;
 
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.ViewModel;
-import android.arch.lifecycle.ViewModelProvider;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 
diff --git a/src/org/thoughtcrime/securesms/contactshare/ContactUtil.java b/src/org/thoughtcrime/securesms/contactshare/ContactUtil.java
index fbb7ddd641..b1db9417f6 100644
--- a/src/org/thoughtcrime/securesms/contactshare/ContactUtil.java
+++ b/src/org/thoughtcrime/securesms/contactshare/ContactUtil.java
@@ -5,11 +5,11 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.provider.ContactsContract;
-import android.support.annotation.MainThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.MainThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+import androidx.appcompat.app.AlertDialog;
 import android.text.TextUtils;
 
 import com.annimon.stream.Stream;
diff --git a/src/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java b/src/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java
index a41e9d9538..e16699e790 100644
--- a/src/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java
+++ b/src/org/thoughtcrime/securesms/contactshare/SharedContactDetailsActivity.java
@@ -8,11 +8,11 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index 2cdbe5334f..ed9620997d 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -19,7 +19,7 @@ package org.thoughtcrime.securesms.conversation;
 import android.Manifest;
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -42,17 +42,17 @@ import android.os.Handler;
 import android.os.Vibrator;
 import android.provider.Browser;
 import android.provider.Telephony;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.content.LocalBroadcastManager;
-import android.support.v4.content.pm.ShortcutInfoCompat;
-import android.support.v4.content.pm.ShortcutManagerCompat;
-import android.support.v4.graphics.drawable.IconCompat;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.widget.SearchView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+import androidx.core.content.pm.ShortcutInfoCompat;
+import androidx.core.content.pm.ShortcutManagerCompat;
+import androidx.core.graphics.drawable.IconCompat;
+import androidx.core.view.MenuItemCompat;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationAdapter.java b/src/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
index a26197a8b0..0182fde11e 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationAdapter.java
@@ -18,11 +18,11 @@ package org.thoughtcrime.securesms.conversation;
 
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index abc28fd82c..97a7364366 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -26,19 +26,19 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.ActivityOptionsCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.view.ActionMode;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.OnScrollListener;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.core.app.ActivityOptionsCompat;
+import androidx.fragment.app.Fragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.view.ActionMode;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.OnScrollListener;
 import android.text.ClipboardManager;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
index 74dc63dd15..ff0dc8509a 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -25,10 +25,10 @@ import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.Typeface;
 import android.net.Uri;
-import android.support.annotation.DimenRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.DimenRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java
index b332171e8a..44611d5f44 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java
@@ -4,7 +4,7 @@ import android.content.Intent;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
-import android.support.v4.app.ActivityOptionsCompat;
+import androidx.core.app.ActivityOptionsCompat;
 import android.view.Display;
 import android.view.Gravity;
 import android.view.Menu;
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java b/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java
index 0680a156f4..d83055071f 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java
@@ -1,10 +1,10 @@
 package org.thoughtcrime.securesms.conversation;
 
 import android.app.Application;
-import android.arch.lifecycle.AndroidViewModel;
-import android.arch.lifecycle.LiveData;
+import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.LiveData;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.contacts.ContactAccessor;
 import org.thoughtcrime.securesms.database.CursorList;
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter.java b/src/org/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter.java
index d4b0912e4b..c033141197 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationStickerSuggestionAdapter.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.conversation;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java b/src/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java
index d55bb17536..8f8ff2a693 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java
@@ -1,13 +1,13 @@
 package org.thoughtcrime.securesms.conversation;
 
 import android.app.Application;
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.ViewModel;
-import android.arch.lifecycle.ViewModelProvider;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
 import android.database.ContentObserver;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import org.thoughtcrime.securesms.database.CursorList;
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java b/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
index 1c29f96f7b..dd13940587 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.conversation;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
index 42b10d38ba..008d4e79f7 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationUpdateItem.java
@@ -5,8 +5,8 @@ import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
diff --git a/src/org/thoughtcrime/securesms/crypto/AttachmentSecret.java b/src/org/thoughtcrime/securesms/crypto/AttachmentSecret.java
index f3e09b98b5..b4425a7766 100644
--- a/src/org/thoughtcrime/securesms/crypto/AttachmentSecret.java
+++ b/src/org/thoughtcrime/securesms/crypto/AttachmentSecret.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.crypto;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Base64;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/src/org/thoughtcrime/securesms/crypto/AttachmentSecretProvider.java b/src/org/thoughtcrime/securesms/crypto/AttachmentSecretProvider.java
index 1c0ee3626c..2068e855d3 100644
--- a/src/org/thoughtcrime/securesms/crypto/AttachmentSecretProvider.java
+++ b/src/org/thoughtcrime/securesms/crypto/AttachmentSecretProvider.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.crypto;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
diff --git a/src/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java b/src/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java
index 585bf9952f..90a7285068 100644
--- a/src/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java
+++ b/src/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java
@@ -16,7 +16,7 @@
  */
 package org.thoughtcrime.securesms.crypto;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.util.LimitedInputStream;
diff --git a/src/org/thoughtcrime/securesms/crypto/DatabaseSecret.java b/src/org/thoughtcrime/securesms/crypto/DatabaseSecret.java
index ce58d94d55..bdd425e0c8 100644
--- a/src/org/thoughtcrime/securesms/crypto/DatabaseSecret.java
+++ b/src/org/thoughtcrime/securesms/crypto/DatabaseSecret.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.crypto;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.util.Hex;
 
diff --git a/src/org/thoughtcrime/securesms/crypto/DatabaseSecretProvider.java b/src/org/thoughtcrime/securesms/crypto/DatabaseSecretProvider.java
index 86393e191a..152cf17b24 100644
--- a/src/org/thoughtcrime/securesms/crypto/DatabaseSecretProvider.java
+++ b/src/org/thoughtcrime/securesms/crypto/DatabaseSecretProvider.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.crypto;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
diff --git a/src/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java b/src/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java
index f18fde6ac2..f2fc74b687 100644
--- a/src/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java
+++ b/src/org/thoughtcrime/securesms/crypto/IdentityKeyUtil.java
@@ -20,7 +20,7 @@ package org.thoughtcrime.securesms.crypto;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.backup.BackupProtos;
 import org.thoughtcrime.securesms.util.Base64;
diff --git a/src/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java b/src/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java
index 6c29dcfa07..994c139434 100644
--- a/src/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java
+++ b/src/org/thoughtcrime/securesms/crypto/KeyStoreHelper.java
@@ -4,8 +4,8 @@ package org.thoughtcrime.securesms.crypto;
 import android.os.Build;
 import android.security.keystore.KeyGenParameterSpec;
 import android.security.keystore.KeyProperties;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import android.util.Base64;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/org/thoughtcrime/securesms/crypto/MasterCipher.java b/src/org/thoughtcrime/securesms/crypto/MasterCipher.java
index c3549c1c7c..95fffc9903 100644
--- a/src/org/thoughtcrime/securesms/crypto/MasterCipher.java
+++ b/src/org/thoughtcrime/securesms/crypto/MasterCipher.java
@@ -17,7 +17,7 @@
  */
 package org.thoughtcrime.securesms.crypto;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import org.thoughtcrime.securesms.logging.Log;
 
 import org.thoughtcrime.securesms.util.Base64;
diff --git a/src/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java b/src/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java
index 4d964d0291..6ca098650f 100644
--- a/src/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java
+++ b/src/org/thoughtcrime/securesms/crypto/MasterSecretUtil.java
@@ -19,8 +19,8 @@ package org.thoughtcrime.securesms.crypto;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import org.thoughtcrime.securesms.logging.Log;
 
diff --git a/src/org/thoughtcrime/securesms/crypto/ModernDecryptingPartInputStream.java b/src/org/thoughtcrime/securesms/crypto/ModernDecryptingPartInputStream.java
index bfe0672e73..e96da29dcf 100644
--- a/src/org/thoughtcrime/securesms/crypto/ModernDecryptingPartInputStream.java
+++ b/src/org/thoughtcrime/securesms/crypto/ModernDecryptingPartInputStream.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.crypto;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.util.Conversions;
 
diff --git a/src/org/thoughtcrime/securesms/crypto/ModernEncryptingPartOutputStream.java b/src/org/thoughtcrime/securesms/crypto/ModernEncryptingPartOutputStream.java
index a62947e973..ab4efe84a9 100644
--- a/src/org/thoughtcrime/securesms/crypto/ModernEncryptingPartOutputStream.java
+++ b/src/org/thoughtcrime/securesms/crypto/ModernEncryptingPartOutputStream.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.crypto;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Pair;
 
 import java.io.File;
diff --git a/src/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java b/src/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java
index ae88a2141a..e94edeb87b 100644
--- a/src/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java
+++ b/src/org/thoughtcrime/securesms/crypto/ProfileKeyUtil.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.crypto;
 
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
diff --git a/src/org/thoughtcrime/securesms/crypto/SessionUtil.java b/src/org/thoughtcrime/securesms/crypto/SessionUtil.java
index 36f19b15ec..e16b666dd2 100644
--- a/src/org/thoughtcrime/securesms/crypto/SessionUtil.java
+++ b/src/org/thoughtcrime/securesms/crypto/SessionUtil.java
@@ -1,17 +1,14 @@
 package org.thoughtcrime.securesms.crypto;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.crypto.storage.TextSecureSessionStore;
 import org.thoughtcrime.securesms.database.Address;
 import org.whispersystems.libsignal.SignalProtocolAddress;
-import org.whispersystems.libsignal.state.SessionRecord;
 import org.whispersystems.libsignal.state.SessionStore;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
 
-import java.util.List;
-
 public class SessionUtil {
 
   public static boolean hasSession(Context context, @NonNull Address address) {
diff --git a/src/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java b/src/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java
index 02b9c1f316..d3e7005c51 100644
--- a/src/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java
+++ b/src/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java
@@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.crypto;
 
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 
 import org.signal.libsignal.metadata.SignalProtos;
 import org.signal.libsignal.metadata.certificate.CertificateValidator;
diff --git a/src/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java b/src/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java
index 0376fd495c..f88545bd4d 100644
--- a/src/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java
+++ b/src/org/thoughtcrime/securesms/crypto/storage/TextSecurePreKeyStore.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.crypto.storage;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.whispersystems.libsignal.InvalidKeyIdException;
diff --git a/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java b/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
index 0e67b89b42..0b089b6411 100644
--- a/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
+++ b/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.crypto.storage;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
diff --git a/src/org/thoughtcrime/securesms/database/Address.java b/src/org/thoughtcrime/securesms/database/Address.java
index bf7457cdc3..ce13c5a9d8 100644
--- a/src/org/thoughtcrime/securesms/database/Address.java
+++ b/src/org/thoughtcrime/securesms/database/Address.java
@@ -4,9 +4,9 @@ package org.thoughtcrime.securesms.database;
 import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.util.Pair;
 
diff --git a/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java b/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java
index 918ffbd9d1..9342c63c71 100644
--- a/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/AttachmentDatabase.java
@@ -24,9 +24,9 @@ import android.graphics.Bitmap;
 import android.media.MediaMetadataRetriever;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import android.text.TextUtils;
 import android.util.Pair;
 
diff --git a/src/org/thoughtcrime/securesms/database/CursorList.java b/src/org/thoughtcrime/securesms/database/CursorList.java
index 12bc39cb98..804e00f018 100644
--- a/src/org/thoughtcrime/securesms/database/CursorList.java
+++ b/src/org/thoughtcrime/securesms/database/CursorList.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.database;
 import android.database.ContentObserver;
 import android.database.Cursor;
 import android.database.MatrixCursor;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.Collection;
 import java.util.Iterator;
diff --git a/src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java b/src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java
index a7cbec1c76..c8adb01166 100644
--- a/src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java
+++ b/src/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapter.java
@@ -19,11 +19,11 @@ package org.thoughtcrime.securesms.database;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.DataSetObserver;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.VisibleForTesting;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.ViewHolder;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import android.view.View;
 import android.view.ViewGroup;
 
diff --git a/src/org/thoughtcrime/securesms/database/Database.java b/src/org/thoughtcrime/securesms/database/Database.java
index bffb0678f9..b1fd5eadb2 100644
--- a/src/org/thoughtcrime/securesms/database/Database.java
+++ b/src/org/thoughtcrime/securesms/database/Database.java
@@ -19,7 +19,7 @@ package org.thoughtcrime.securesms.database;
 import android.content.Context;
 import android.database.ContentObserver;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
 
diff --git a/src/org/thoughtcrime/securesms/database/DatabaseContentProviders.java b/src/org/thoughtcrime/securesms/database/DatabaseContentProviders.java
index 44d4607cdf..a8a718b3b0 100644
--- a/src/org/thoughtcrime/securesms/database/DatabaseContentProviders.java
+++ b/src/org/thoughtcrime/securesms/database/DatabaseContentProviders.java
@@ -4,8 +4,8 @@ import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * Starting in API 26, a {@link ContentProvider} needs to be defined for each authority you wish to
diff --git a/src/org/thoughtcrime/securesms/database/DatabaseFactory.java b/src/org/thoughtcrime/securesms/database/DatabaseFactory.java
index d945967507..164f60762f 100644
--- a/src/org/thoughtcrime/securesms/database/DatabaseFactory.java
+++ b/src/org/thoughtcrime/securesms/database/DatabaseFactory.java
@@ -17,7 +17,7 @@
 package org.thoughtcrime.securesms.database;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import net.sqlcipher.database.SQLiteDatabase;
 
diff --git a/src/org/thoughtcrime/securesms/database/DraftDatabase.java b/src/org/thoughtcrime/securesms/database/DraftDatabase.java
index 32cbce2f01..27435bfc1e 100644
--- a/src/org/thoughtcrime/securesms/database/DraftDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/DraftDatabase.java
@@ -4,7 +4,7 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import net.sqlcipher.database.SQLiteDatabase;
 
diff --git a/src/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java b/src/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java
index 8b07bdbee5..4dfe6a20b5 100644
--- a/src/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java
+++ b/src/org/thoughtcrime/securesms/database/FastCursorRecyclerViewAdapter.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.database;
 
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.Iterator;
 import java.util.LinkedList;
diff --git a/src/org/thoughtcrime/securesms/database/GroupDatabase.java b/src/org/thoughtcrime/securesms/database/GroupDatabase.java
index f873bfa97d..c14aff87d5 100644
--- a/src/org/thoughtcrime/securesms/database/GroupDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/GroupDatabase.java
@@ -6,8 +6,8 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.annimon.stream.Stream;
diff --git a/src/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java b/src/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java
index 58a6fdad9a..4d83184a57 100644
--- a/src/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/GroupReceiptDatabase.java
@@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.database;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import net.sqlcipher.database.SQLiteDatabase;
 
diff --git a/src/org/thoughtcrime/securesms/database/IdentityDatabase.java b/src/org/thoughtcrime/securesms/database/IdentityDatabase.java
index f768736062..c3d88e8674 100644
--- a/src/org/thoughtcrime/securesms/database/IdentityDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/IdentityDatabase.java
@@ -19,8 +19,8 @@ package org.thoughtcrime.securesms.database;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import net.sqlcipher.database.SQLiteDatabase;
 
diff --git a/src/org/thoughtcrime/securesms/database/JobDatabase.java b/src/org/thoughtcrime/securesms/database/JobDatabase.java
index d9a05e29cc..1a64eed210 100644
--- a/src/org/thoughtcrime/securesms/database/JobDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/JobDatabase.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.database;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import net.sqlcipher.database.SQLiteDatabase;
 
diff --git a/src/org/thoughtcrime/securesms/database/MediaDatabase.java b/src/org/thoughtcrime/securesms/database/MediaDatabase.java
index e6811ba229..523a168c57 100644
--- a/src/org/thoughtcrime/securesms/database/MediaDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/MediaDatabase.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.database;
 import android.content.Context;
 import android.database.ContentObserver;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import net.sqlcipher.database.SQLiteDatabase;
 
diff --git a/src/org/thoughtcrime/securesms/database/MmsDatabase.java b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
index 3bdb6feae9..5e9ff400aa 100644
--- a/src/org/thoughtcrime/securesms/database/MmsDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/MmsDatabase.java
@@ -20,8 +20,8 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Pair;
 
diff --git a/src/org/thoughtcrime/securesms/database/MmsSmsDatabase.java b/src/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
index bfe549eb29..1d6fe88903 100644
--- a/src/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/MmsSmsDatabase.java
@@ -18,8 +18,8 @@ package org.thoughtcrime.securesms.database;
 
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import net.sqlcipher.database.SQLiteDatabase;
 import net.sqlcipher.database.SQLiteQueryBuilder;
diff --git a/src/org/thoughtcrime/securesms/database/ObservableContent.java b/src/org/thoughtcrime/securesms/database/ObservableContent.java
index 874fb36129..ff74f3a759 100644
--- a/src/org/thoughtcrime/securesms/database/ObservableContent.java
+++ b/src/org/thoughtcrime/securesms/database/ObservableContent.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.database;
 
 import android.database.ContentObserver;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.io.Closeable;
 
diff --git a/src/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java b/src/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java
index 327a15ef4a..1f59110f8d 100644
--- a/src/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/OneTimePreKeyDatabase.java
@@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.database;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import org.thoughtcrime.securesms.logging.Log;
 
 import net.sqlcipher.database.SQLiteDatabase;
diff --git a/src/org/thoughtcrime/securesms/database/PushDatabase.java b/src/org/thoughtcrime/securesms/database/PushDatabase.java
index 3219db08d8..55472f3117 100644
--- a/src/org/thoughtcrime/securesms/database/PushDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/PushDatabase.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.database;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import org.thoughtcrime.securesms.logging.Log;
 
 import net.sqlcipher.database.SQLiteDatabase;
diff --git a/src/org/thoughtcrime/securesms/database/RecipientDatabase.java b/src/org/thoughtcrime/securesms/database/RecipientDatabase.java
index 8553b2b73c..62e4458602 100644
--- a/src/org/thoughtcrime/securesms/database/RecipientDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/RecipientDatabase.java
@@ -4,8 +4,8 @@ import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.annimon.stream.Stream;
 
diff --git a/src/org/thoughtcrime/securesms/database/SearchDatabase.java b/src/org/thoughtcrime/securesms/database/SearchDatabase.java
index a90460aa7c..0c3cc4ce23 100644
--- a/src/org/thoughtcrime/securesms/database/SearchDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/SearchDatabase.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.database;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 
diff --git a/src/org/thoughtcrime/securesms/database/SessionDatabase.java b/src/org/thoughtcrime/securesms/database/SessionDatabase.java
index 27cbb85c33..1730249988 100644
--- a/src/org/thoughtcrime/securesms/database/SessionDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/SessionDatabase.java
@@ -4,8 +4,8 @@ package org.thoughtcrime.securesms.database;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import net.sqlcipher.database.SQLiteDatabase;
 
diff --git a/src/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java b/src/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java
index c2529d8a7d..810cb54c78 100644
--- a/src/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/SignedPreKeyDatabase.java
@@ -4,8 +4,8 @@ package org.thoughtcrime.securesms.database;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import net.sqlcipher.database.SQLiteDatabase;
 
diff --git a/src/org/thoughtcrime/securesms/database/SmsDatabase.java b/src/org/thoughtcrime/securesms/database/SmsDatabase.java
index 5b99737b18..308b948ed9 100644
--- a/src/org/thoughtcrime/securesms/database/SmsDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/SmsDatabase.java
@@ -20,7 +20,7 @@ package org.thoughtcrime.securesms.database;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.Pair;
 
diff --git a/src/org/thoughtcrime/securesms/database/SmsMigrator.java b/src/org/thoughtcrime/securesms/database/SmsMigrator.java
index f73acd496f..5eaae3d178 100644
--- a/src/org/thoughtcrime/securesms/database/SmsMigrator.java
+++ b/src/org/thoughtcrime/securesms/database/SmsMigrator.java
@@ -20,7 +20,7 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteException;
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import net.sqlcipher.database.SQLiteDatabase;
 import net.sqlcipher.database.SQLiteStatement;
diff --git a/src/org/thoughtcrime/securesms/database/StickerDatabase.java b/src/org/thoughtcrime/securesms/database/StickerDatabase.java
index d850aa8aa6..561ffd93cd 100644
--- a/src/org/thoughtcrime/securesms/database/StickerDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/StickerDatabase.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.database;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Pair;
 
diff --git a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
index d11e3c9573..1de021e206 100644
--- a/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/ThreadDatabase.java
@@ -22,8 +22,8 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.MergeCursor;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.annimon.stream.Stream;
 
diff --git a/src/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java b/src/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java
index 7c9fe9974e..64123f535f 100644
--- a/src/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java
+++ b/src/org/thoughtcrime/securesms/database/helpers/ClassicOpenHelper.java
@@ -7,7 +7,7 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteConstraintException;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -30,7 +30,6 @@ import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.DelimiterUtil;
 import org.thoughtcrime.securesms.util.Hex;
diff --git a/src/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java b/src/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java
index c392bc8345..8b05f26d6b 100644
--- a/src/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java
+++ b/src/org/thoughtcrime/securesms/database/helpers/PreKeyMigrationHelper.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.database.helpers;
 
 import android.content.ContentValues;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java
index bab82dc181..42d2c7a687 100644
--- a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java
+++ b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherMigrationHelper.java
@@ -4,8 +4,8 @@ package org.thoughtcrime.securesms.database.helpers;
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import org.thoughtcrime.securesms.logging.Log;
 import android.util.Pair;
diff --git a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
index 58afc5520d..4d0da39a3c 100644
--- a/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
+++ b/src/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java
@@ -6,7 +6,7 @@ import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import net.sqlcipher.database.SQLiteDatabase;
diff --git a/src/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java b/src/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java
index 27534f1646..6f50bd1616 100644
--- a/src/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java
+++ b/src/org/thoughtcrime/securesms/database/loaders/BucketedThreadMediaLoader.java
@@ -4,14 +4,13 @@ package org.thoughtcrime.securesms.database.loaders;
 import android.content.Context;
 import android.database.ContentObserver;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
-import android.support.v4.content.AsyncTaskLoader;
+import androidx.annotation.NonNull;
+import androidx.loader.content.AsyncTaskLoader;
 
 import com.annimon.stream.Stream;
 
 import network.loki.messenger.R;
 import org.thoughtcrime.securesms.database.Address;
-import org.thoughtcrime.securesms.database.Database;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MediaDatabase;
 import org.thoughtcrime.securesms.recipients.Recipient;
diff --git a/src/org/thoughtcrime/securesms/database/loaders/CountryListLoader.java b/src/org/thoughtcrime/securesms/database/loaders/CountryListLoader.java
index 2c36df2a59..1ad5d71e48 100644
--- a/src/org/thoughtcrime/securesms/database/loaders/CountryListLoader.java
+++ b/src/org/thoughtcrime/securesms/database/loaders/CountryListLoader.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.database.loaders;
 
 
 import android.content.Context;
-import android.support.v4.content.AsyncTaskLoader;
+import androidx.loader.content.AsyncTaskLoader;
 
 import java.util.ArrayList;
 import java.util.Comparator;
diff --git a/src/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java b/src/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java
index 24bf81d97a..711d557ce9 100644
--- a/src/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java
+++ b/src/org/thoughtcrime/securesms/database/loaders/DeviceListLoader.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.database.loaders;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 
diff --git a/src/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java b/src/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java
index 49d8f1028e..8ada82ce1d 100644
--- a/src/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java
+++ b/src/org/thoughtcrime/securesms/database/loaders/PagingMediaLoader.java
@@ -4,9 +4,9 @@ package org.thoughtcrime.securesms.database.loaders;
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.util.Pair;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.util.Pair;
 
 import org.thoughtcrime.securesms.attachments.AttachmentId;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
diff --git a/src/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java b/src/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java
index e571beb016..7ed0184e8e 100644
--- a/src/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java
+++ b/src/org/thoughtcrime/securesms/database/loaders/RecentPhotosLoader.java
@@ -6,7 +6,7 @@ import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.MediaStore;
-import android.support.v4.content.CursorLoader;
+import androidx.loader.content.CursorLoader;
 
 import org.thoughtcrime.securesms.permissions.Permissions;
 
diff --git a/src/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java b/src/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java
index 5bfe4e12db..0e8fc9a0b5 100644
--- a/src/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java
+++ b/src/org/thoughtcrime/securesms/database/loaders/ThreadMediaLoader.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.database.loaders;
 
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
diff --git a/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java b/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java
index 314e2c1d9d..12be5f89a5 100644
--- a/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/DisplayRecord.java
@@ -17,7 +17,7 @@
 package org.thoughtcrime.securesms.database.model;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.SpannableString;
 
 import org.thoughtcrime.securesms.database.MmsSmsColumns;
diff --git a/src/org/thoughtcrime/securesms/database/model/IncomingSticker.java b/src/org/thoughtcrime/securesms/database/model/IncomingSticker.java
index 5e982e0daa..4614bf57cc 100644
--- a/src/org/thoughtcrime/securesms/database/model/IncomingSticker.java
+++ b/src/org/thoughtcrime/securesms/database/model/IncomingSticker.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.database.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public class IncomingSticker {
 
diff --git a/src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java b/src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java
index f6ff433123..f03ce5ffce 100644
--- a/src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java
@@ -17,8 +17,8 @@
 package org.thoughtcrime.securesms.database.model;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.SpannableString;
 
 import network.loki.messenger.R;
diff --git a/src/org/thoughtcrime/securesms/database/model/MessageRecord.java b/src/org/thoughtcrime/securesms/database/model/MessageRecord.java
index 0531562b73..1718d14451 100644
--- a/src/org/thoughtcrime/securesms/database/model/MessageRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/MessageRecord.java
@@ -17,7 +17,7 @@
 package org.thoughtcrime.securesms.database.model;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.style.RelativeSizeSpan;
diff --git a/src/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java b/src/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java
index 9657f3151b..679c8f15f5 100644
--- a/src/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/MmsMessageRecord.java
@@ -1,9 +1,8 @@
 package org.thoughtcrime.securesms.database.model;
 
 
-import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.contactshare.Contact;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
diff --git a/src/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java b/src/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java
index 1c4317bf5d..e58ba7543f 100644
--- a/src/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java
@@ -17,7 +17,7 @@
 package org.thoughtcrime.securesms.database.model;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.SpannableString;
 
 import network.loki.messenger.R;
diff --git a/src/org/thoughtcrime/securesms/database/model/Quote.java b/src/org/thoughtcrime/securesms/database/model/Quote.java
index 2c99d8f7f6..638ca9d71a 100644
--- a/src/org/thoughtcrime/securesms/database/model/Quote.java
+++ b/src/org/thoughtcrime/securesms/database/model/Quote.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.database.model;
 
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.mms.SlideDeck;
diff --git a/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java b/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java
index 056dbacb45..231696af07 100644
--- a/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java
@@ -18,7 +18,7 @@
 package org.thoughtcrime.securesms.database.model;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.SpannableString;
 
 import org.thoughtcrime.securesms.database.MmsSmsColumns;
diff --git a/src/org/thoughtcrime/securesms/database/model/Sticker.java b/src/org/thoughtcrime/securesms/database/model/Sticker.java
index b3d775ea3a..9ee97c131a 100644
--- a/src/org/thoughtcrime/securesms/database/model/Sticker.java
+++ b/src/org/thoughtcrime/securesms/database/model/Sticker.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.database.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
 
diff --git a/src/org/thoughtcrime/securesms/database/model/StickerPackRecord.java b/src/org/thoughtcrime/securesms/database/model/StickerPackRecord.java
index 246a57157e..1ce61317ad 100644
--- a/src/org/thoughtcrime/securesms/database/model/StickerPackRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/StickerPackRecord.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.database.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import org.whispersystems.libsignal.util.guava.Optional;
diff --git a/src/org/thoughtcrime/securesms/database/model/StickerRecord.java b/src/org/thoughtcrime/securesms/database/model/StickerRecord.java
index bb7ae00a9c..76ad74fbdf 100644
--- a/src/org/thoughtcrime/securesms/database/model/StickerRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/StickerRecord.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.database.model;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.mms.PartAuthority;
 
diff --git a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java b/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java
index 6aba9e9165..1cf2c6d328 100644
--- a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java
+++ b/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java
@@ -19,8 +19,8 @@ package org.thoughtcrime.securesms.database.model;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.TextUtils;
diff --git a/src/org/thoughtcrime/securesms/events/PartProgressEvent.java b/src/org/thoughtcrime/securesms/events/PartProgressEvent.java
index 30817fd7de..b824ec16cf 100644
--- a/src/org/thoughtcrime/securesms/events/PartProgressEvent.java
+++ b/src/org/thoughtcrime/securesms/events/PartProgressEvent.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.events;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
 
diff --git a/src/org/thoughtcrime/securesms/events/RedPhoneEvent.java b/src/org/thoughtcrime/securesms/events/RedPhoneEvent.java
index 0fcd3f97f6..92f949aa31 100644
--- a/src/org/thoughtcrime/securesms/events/RedPhoneEvent.java
+++ b/src/org/thoughtcrime/securesms/events/RedPhoneEvent.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.events;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.recipients.Recipient;
 
diff --git a/src/org/thoughtcrime/securesms/events/WebRtcViewModel.java b/src/org/thoughtcrime/securesms/events/WebRtcViewModel.java
index 442186e6f7..a376b888e9 100644
--- a/src/org/thoughtcrime/securesms/events/WebRtcViewModel.java
+++ b/src/org/thoughtcrime/securesms/events/WebRtcViewModel.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.events;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.webrtc.CameraState;
diff --git a/src/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java b/src/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java
index bf5ee63659..170b9dbe78 100644
--- a/src/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java
+++ b/src/org/thoughtcrime/securesms/giph/model/ChunkedImageUrl.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.giph.model;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bumptech.glide.load.Key;
 
diff --git a/src/org/thoughtcrime/securesms/giph/net/GiphyGifLoader.java b/src/org/thoughtcrime/securesms/giph/net/GiphyGifLoader.java
index e832d23bf4..7be6a88197 100644
--- a/src/org/thoughtcrime/securesms/giph/net/GiphyGifLoader.java
+++ b/src/org/thoughtcrime/securesms/giph/net/GiphyGifLoader.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.giph.net;
 
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 public class GiphyGifLoader extends GiphyLoader {
 
diff --git a/src/org/thoughtcrime/securesms/giph/net/GiphyLoader.java b/src/org/thoughtcrime/securesms/giph/net/GiphyLoader.java
index d1169990c3..fa29aaf660 100644
--- a/src/org/thoughtcrime/securesms/giph/net/GiphyLoader.java
+++ b/src/org/thoughtcrime/securesms/giph/net/GiphyLoader.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.giph.net;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import org.thoughtcrime.securesms.logging.Log;
 
diff --git a/src/org/thoughtcrime/securesms/giph/net/GiphyStickerLoader.java b/src/org/thoughtcrime/securesms/giph/net/GiphyStickerLoader.java
index 9290fc2dab..7ce5fe2532 100644
--- a/src/org/thoughtcrime/securesms/giph/net/GiphyStickerLoader.java
+++ b/src/org/thoughtcrime/securesms/giph/net/GiphyStickerLoader.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.giph.net;
 
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 public class GiphyStickerLoader extends GiphyLoader {
 
diff --git a/src/org/thoughtcrime/securesms/giph/ui/AspectRatioImageView.java b/src/org/thoughtcrime/securesms/giph/ui/AspectRatioImageView.java
index 3a7c746821..3d1e62dd98 100644
--- a/src/org/thoughtcrime/securesms/giph/ui/AspectRatioImageView.java
+++ b/src/org/thoughtcrime/securesms/giph/ui/AspectRatioImageView.java
@@ -18,7 +18,7 @@
 package org.thoughtcrime.securesms.giph.ui;
 
 import android.content.Context;
-import android.support.v7.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatImageView;
 import android.util.AttributeSet;
 
 /**
diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java
index e9213807fc..40bcd152ea 100644
--- a/src/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java
+++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java
@@ -7,13 +7,13 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import org.thoughtcrime.securesms.logging.Log;
 import android.view.View;
 import android.widget.Toast;
diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java
index dd2efc9687..93293bcff0 100644
--- a/src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java
+++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java
@@ -3,9 +3,9 @@ package org.thoughtcrime.securesms.giph.ui;
 
 import android.content.Context;
 import android.graphics.Rect;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java
index 0e924411a6..fe5f2eaff1 100644
--- a/src/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java
+++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java
@@ -4,9 +4,9 @@ package org.thoughtcrime.securesms.giph.ui;
 import android.content.Context;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import org.thoughtcrime.securesms.logging.Log;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java
index 793a06c498..4c1ff9be8d 100644
--- a/src/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java
+++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyFragment.java
@@ -2,15 +2,15 @@ package org.thoughtcrime.securesms.giph.ui;
 
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.StaggeredGridLayoutManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyGifFragment.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyGifFragment.java
index d38007b4a9..4c8ad66dcf 100644
--- a/src/org/thoughtcrime/securesms/giph/ui/GiphyGifFragment.java
+++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyGifFragment.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.giph.ui;
 
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.content.Loader;
+import androidx.annotation.NonNull;
+import androidx.loader.content.Loader;
 
 import org.thoughtcrime.securesms.giph.model.GiphyImage;
 import org.thoughtcrime.securesms.giph.net.GiphyGifLoader;
diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyStickerFragment.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyStickerFragment.java
index 1b0289155f..0b838b4718 100644
--- a/src/org/thoughtcrime/securesms/giph/ui/GiphyStickerFragment.java
+++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyStickerFragment.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.giph.ui;
 
 
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.content.Loader;
+import androidx.annotation.NonNull;
+import androidx.loader.content.Loader;
 
 import org.thoughtcrime.securesms.giph.model.GiphyImage;
 import org.thoughtcrime.securesms.giph.net.GiphyStickerLoader;
diff --git a/src/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java b/src/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java
index 872fc28a61..ef0dfbedb1 100644
--- a/src/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java
+++ b/src/org/thoughtcrime/securesms/giph/util/InfiniteScrollListener.java
@@ -2,8 +2,8 @@
 
 package org.thoughtcrime.securesms.giph.util;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 
 public abstract class InfiniteScrollListener extends RecyclerView.OnScrollListener {
 
diff --git a/src/org/thoughtcrime/securesms/giph/util/RecyclerViewPositionHelper.java b/src/org/thoughtcrime/securesms/giph/util/RecyclerViewPositionHelper.java
index e2a62ec17d..bd04b89569 100644
--- a/src/org/thoughtcrime/securesms/giph/util/RecyclerViewPositionHelper.java
+++ b/src/org/thoughtcrime/securesms/giph/util/RecyclerViewPositionHelper.java
@@ -3,8 +3,8 @@
 package org.thoughtcrime.securesms.giph.util;
 
 
-import android.support.v7.widget.OrientationHelper;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.OrientationHelper;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 public class RecyclerViewPositionHelper {
diff --git a/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java b/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java
index b0b7adc4a6..e365a371d2 100644
--- a/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java
+++ b/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.glide;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.DataSource;
diff --git a/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlLoader.java b/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlLoader.java
index af6fa8faa6..3c3ec2713d 100644
--- a/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlLoader.java
+++ b/src/org/thoughtcrime/securesms/glide/ChunkedImageUrlLoader.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.glide;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.model.ModelLoader;
diff --git a/src/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java b/src/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java
index e8d22713fc..195c5b23b8 100644
--- a/src/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java
+++ b/src/org/thoughtcrime/securesms/glide/ContactPhotoFetcher.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.glide;
 
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.DataSource;
diff --git a/src/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java b/src/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java
index fa18edb08e..2d9cd545d8 100644
--- a/src/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java
+++ b/src/org/thoughtcrime/securesms/glide/ContactPhotoLoader.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.glide;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.model.ModelLoader;
diff --git a/src/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java b/src/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java
index cf85ee1bb1..9b0bbf2056 100644
--- a/src/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java
+++ b/src/org/thoughtcrime/securesms/glide/OkHttpStreamFetcher.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.glide;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.DataSource;
diff --git a/src/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java b/src/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java
index 39637f76d8..bfe5aae7d3 100644
--- a/src/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java
+++ b/src/org/thoughtcrime/securesms/glide/OkHttpUrlLoader.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.glide;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.model.GlideUrl;
diff --git a/src/org/thoughtcrime/securesms/glide/PaddedHeadersInterceptor.java b/src/org/thoughtcrime/securesms/glide/PaddedHeadersInterceptor.java
index e602935874..5d0ab584b7 100644
--- a/src/org/thoughtcrime/securesms/glide/PaddedHeadersInterceptor.java
+++ b/src/org/thoughtcrime/securesms/glide/PaddedHeadersInterceptor.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.glide;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.io.IOException;
 import java.security.SecureRandom;
diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java b/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java
index 2f5cfdfb14..29f7da6975 100644
--- a/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java
+++ b/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.glide.cache;
 
 
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import org.thoughtcrime.securesms.logging.Log;
 
 import com.bumptech.glide.load.Options;
diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java b/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java
index 507392e69f..7541e73d9c 100644
--- a/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java
+++ b/src/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.glide.cache;
 
 
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import org.thoughtcrime.securesms.logging.Log;
 
 import com.bumptech.glide.load.EncodeStrategy;
diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java b/src/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java
index db18927ec5..361f7bba94 100644
--- a/src/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java
+++ b/src/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.glide.cache;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bumptech.glide.load.Encoder;
 import com.bumptech.glide.load.Options;
diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedCoder.java b/src/org/thoughtcrime/securesms/glide/cache/EncryptedCoder.java
index ed7f7d622f..b751507ee4 100644
--- a/src/org/thoughtcrime/securesms/glide/cache/EncryptedCoder.java
+++ b/src/org/thoughtcrime/securesms/glide/cache/EncryptedCoder.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.glide.cache;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.util.Util;
 
diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java b/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java
index a7b5e10ba2..b3bd17ec04 100644
--- a/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java
+++ b/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.glide.cache;
 
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import org.thoughtcrime.securesms.logging.Log;
 
 import com.bumptech.glide.load.Options;
diff --git a/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java b/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java
index 24d1bb76b5..0326ed15bd 100644
--- a/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java
+++ b/src/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.glide.cache;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import org.thoughtcrime.securesms.logging.Log;
 
 import com.bumptech.glide.load.EncodeStrategy;
diff --git a/src/org/thoughtcrime/securesms/groups/GroupManager.java b/src/org/thoughtcrime/securesms/groups/GroupManager.java
index ee37c5e4f6..81f6feec33 100644
--- a/src/org/thoughtcrime/securesms/groups/GroupManager.java
+++ b/src/org/thoughtcrime/securesms/groups/GroupManager.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.groups;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.google.protobuf.ByteString;
 
diff --git a/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java b/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java
index f7c9bb9de6..4b2549344d 100644
--- a/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java
+++ b/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.groups;
 
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.google.protobuf.ByteString;
 
diff --git a/src/org/thoughtcrime/securesms/imageeditor/Bounds.java b/src/org/thoughtcrime/securesms/imageeditor/Bounds.java
index f5d4e0ca5a..3b074dccea 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/Bounds.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/Bounds.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.imageeditor;
 
 import android.graphics.Matrix;
 import android.graphics.RectF;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * The local extent of a {@link org.thoughtcrime.securesms.imageeditor.model.EditorElement}.
diff --git a/src/org/thoughtcrime/securesms/imageeditor/CanvasMatrix.java b/src/org/thoughtcrime/securesms/imageeditor/CanvasMatrix.java
index b3fd5bbd9c..21546a5a6e 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/CanvasMatrix.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/CanvasMatrix.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.imageeditor;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.RectF;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Tracks the current matrix for a canvas.
diff --git a/src/org/thoughtcrime/securesms/imageeditor/ColorableRenderer.java b/src/org/thoughtcrime/securesms/imageeditor/ColorableRenderer.java
index 71a159711a..11706dfc02 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/ColorableRenderer.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/ColorableRenderer.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.imageeditor;
 
-import android.support.annotation.ColorInt;
+import androidx.annotation.ColorInt;
 
 /**
  * A renderer that can have its color changed.
diff --git a/src/org/thoughtcrime/securesms/imageeditor/DrawingSession.java b/src/org/thoughtcrime/securesms/imageeditor/DrawingSession.java
index 05ef7ad22a..350edaed0a 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/DrawingSession.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/DrawingSession.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.imageeditor;
 
 import android.graphics.Matrix;
 import android.graphics.PointF;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.imageeditor.model.EditorElement;
 import org.thoughtcrime.securesms.imageeditor.renderers.BezierDrawingRenderer;
diff --git a/src/org/thoughtcrime/securesms/imageeditor/EditSession.java b/src/org/thoughtcrime/securesms/imageeditor/EditSession.java
index cd883cf562..b57b472c70 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/EditSession.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/EditSession.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.imageeditor;
 
 import android.graphics.Matrix;
 import android.graphics.PointF;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.imageeditor.model.EditorElement;
 
diff --git a/src/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java b/src/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java
index 27cbb0cdcb..a05f1cce21 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/ElementDragEditSession.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.imageeditor;
 
 import android.graphics.Matrix;
 import android.graphics.PointF;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.imageeditor.model.EditorElement;
 
diff --git a/src/org/thoughtcrime/securesms/imageeditor/ElementEditSession.java b/src/org/thoughtcrime/securesms/imageeditor/ElementEditSession.java
index 4dd7221121..315710653c 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/ElementEditSession.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/ElementEditSession.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.imageeditor;
 
 import android.graphics.Matrix;
 import android.graphics.PointF;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.imageeditor.model.EditorElement;
 
diff --git a/src/org/thoughtcrime/securesms/imageeditor/ElementScaleEditSession.java b/src/org/thoughtcrime/securesms/imageeditor/ElementScaleEditSession.java
index 4594c964a7..046f482fc7 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/ElementScaleEditSession.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/ElementScaleEditSession.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.imageeditor;
 
 import android.graphics.Matrix;
 import android.graphics.PointF;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.imageeditor.model.EditorElement;
 
diff --git a/src/org/thoughtcrime/securesms/imageeditor/HiddenEditText.java b/src/org/thoughtcrime/securesms/imageeditor/HiddenEditText.java
index 03e252ab3d..7a25d0cf5b 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/HiddenEditText.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/HiddenEditText.java
@@ -4,7 +4,7 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.Rect;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.InputType;
 import android.util.TypedValue;
 import android.view.Gravity;
@@ -17,7 +17,7 @@ import org.thoughtcrime.securesms.imageeditor.renderers.TextRenderer;
 /**
  * Invisible {@link android.widget.EditText} that is used during in-image text editing.
  */
-final class HiddenEditText extends android.support.v7.widget.AppCompatEditText {
+final class HiddenEditText extends androidx.appcompat.widget.AppCompatEditText {
 
   @SuppressLint("InlinedApi")
   private static final int INCOGNITO_KEYBOARD_IME = EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING;
diff --git a/src/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java b/src/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java
index 2d4f189a6d..3ab56a89a5 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/ImageEditorView.java
@@ -7,10 +7,10 @@ import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.PointF;
 import android.graphics.RectF;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.GestureDetectorCompat;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.view.GestureDetectorCompat;
 import android.util.AttributeSet;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
diff --git a/src/org/thoughtcrime/securesms/imageeditor/Renderer.java b/src/org/thoughtcrime/securesms/imageeditor/Renderer.java
index 0b4ff672b3..bec1eae9ef 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/Renderer.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/Renderer.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.imageeditor;
 
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Responsible for rendering a single {@link org.thoughtcrime.securesms.imageeditor.model.EditorElement} to the canvas.
diff --git a/src/org/thoughtcrime/securesms/imageeditor/RendererContext.java b/src/org/thoughtcrime/securesms/imageeditor/RendererContext.java
index d133e8f6c1..0883d6fcd1 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/RendererContext.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/RendererContext.java
@@ -5,8 +5,8 @@ import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.Point;
 import android.graphics.RectF;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 /**
  * Contains all of the information required for a {@link Renderer} to do its job.
diff --git a/src/org/thoughtcrime/securesms/imageeditor/ThumbDragEditSession.java b/src/org/thoughtcrime/securesms/imageeditor/ThumbDragEditSession.java
index 7a1217978a..860883e568 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/ThumbDragEditSession.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/ThumbDragEditSession.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.imageeditor;
 
 import android.graphics.Matrix;
 import android.graphics.PointF;
-import android.graphics.RectF;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.imageeditor.model.EditorElement;
 import org.thoughtcrime.securesms.imageeditor.model.ThumbRenderer;
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/AlphaAnimation.java b/src/org/thoughtcrime/securesms/imageeditor/model/AlphaAnimation.java
index 0a2c24d32e..6aae9f88a1 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/model/AlphaAnimation.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/model/AlphaAnimation.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.imageeditor.model;
 
 import android.animation.ValueAnimator;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.animation.Interpolator;
 import android.view.animation.LinearInterpolator;
 
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/AnimationMatrix.java b/src/org/thoughtcrime/securesms/imageeditor/model/AnimationMatrix.java
index 712f52d110..ea499c69c5 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/model/AnimationMatrix.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/model/AnimationMatrix.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.imageeditor.model;
 
 import android.animation.ValueAnimator;
 import android.graphics.Matrix;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.animation.CycleInterpolator;
 import android.view.animation.DecelerateInterpolator;
 import android.view.animation.Interpolator;
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/Bisect.java b/src/org/thoughtcrime/securesms/imageeditor/model/Bisect.java
index 2a3add5caf..22c4559238 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/model/Bisect.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/model/Bisect.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.imageeditor.model;
 
 import android.graphics.Matrix;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 final class Bisect {
 
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/CropThumbRenderer.java b/src/org/thoughtcrime/securesms/imageeditor/model/CropThumbRenderer.java
index c6df34eabe..c752ffaeaf 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/model/CropThumbRenderer.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/model/CropThumbRenderer.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.imageeditor.model;
 
 import android.graphics.Matrix;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import network.loki.messenger.R;
 import org.thoughtcrime.securesms.imageeditor.Bounds;
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/EditorElement.java b/src/org/thoughtcrime/securesms/imageeditor/model/EditorElement.java
index 2f2312c9f6..9460907f90 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/model/EditorElement.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/model/EditorElement.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.imageeditor.model;
 import android.graphics.Matrix;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.imageeditor.Renderer;
 import org.thoughtcrime.securesms.imageeditor.RendererContext;
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/EditorElementHierarchy.java b/src/org/thoughtcrime/securesms/imageeditor/model/EditorElementHierarchy.java
index e83f3a82de..0c14768a32 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/model/EditorElementHierarchy.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/model/EditorElementHierarchy.java
@@ -4,8 +4,8 @@ import android.graphics.Matrix;
 import android.graphics.Point;
 import android.graphics.PointF;
 import android.graphics.RectF;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import network.loki.messenger.R;
 import org.thoughtcrime.securesms.imageeditor.Bounds;
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/EditorFlags.java b/src/org/thoughtcrime/securesms/imageeditor/model/EditorFlags.java
index 5887f8540b..6d5020ce87 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/model/EditorFlags.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/model/EditorFlags.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.imageeditor.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Flags for an {@link EditorElement}.
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/EditorModel.java b/src/org/thoughtcrime/securesms/imageeditor/model/EditorModel.java
index 9e56f0d32c..6ee09d63e1 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/model/EditorModel.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/model/EditorModel.java
@@ -9,9 +9,9 @@ import android.graphics.PointF;
 import android.graphics.RectF;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 
 import org.thoughtcrime.securesms.imageeditor.Bounds;
 import org.thoughtcrime.securesms.imageeditor.ColorableRenderer;
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java b/src/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java
index 4eb8aa609e..468e288f0f 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/model/ElementStack.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.imageeditor.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.Arrays;
 import java.util.Stack;
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/InBoundsMemory.java b/src/org/thoughtcrime/securesms/imageeditor/model/InBoundsMemory.java
index 26cb13611a..e048261efd 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/model/InBoundsMemory.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/model/InBoundsMemory.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.imageeditor.model;
 
 import android.graphics.Matrix;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 final class InBoundsMemory {
 
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/ParcelUtils.java b/src/org/thoughtcrime/securesms/imageeditor/model/ParcelUtils.java
index 8ef74329d0..bf491ddd06 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/model/ParcelUtils.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/model/ParcelUtils.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.imageeditor.model;
 
 import android.graphics.Matrix;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.UUID;
 
diff --git a/src/org/thoughtcrime/securesms/imageeditor/model/UndoRedoStacks.java b/src/org/thoughtcrime/securesms/imageeditor/model/UndoRedoStacks.java
index d7a1481ee4..8f680bdd0d 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/model/UndoRedoStacks.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/model/UndoRedoStacks.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.imageeditor.model;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.Arrays;
 
diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/AutomaticControlPointBezierLine.java b/src/org/thoughtcrime/securesms/imageeditor/renderers/AutomaticControlPointBezierLine.java
index 22d5a4b8c2..6b97bc3416 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/renderers/AutomaticControlPointBezierLine.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/renderers/AutomaticControlPointBezierLine.java
@@ -5,8 +5,8 @@ import android.graphics.Paint;
 import android.graphics.Path;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.Arrays;
 
diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/BezierDrawingRenderer.java b/src/org/thoughtcrime/securesms/imageeditor/renderers/BezierDrawingRenderer.java
index 6259e794b4..c69cb452e1 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/renderers/BezierDrawingRenderer.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/renderers/BezierDrawingRenderer.java
@@ -5,8 +5,8 @@ import android.graphics.Paint;
 import android.graphics.PointF;
 import android.graphics.RectF;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.imageeditor.ColorableRenderer;
 import org.thoughtcrime.securesms.imageeditor.RendererContext;
diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/CropAreaRenderer.java b/src/org/thoughtcrime/securesms/imageeditor/renderers/CropAreaRenderer.java
index a34876b724..537fcf9700 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/renderers/CropAreaRenderer.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/renderers/CropAreaRenderer.java
@@ -6,9 +6,9 @@ import android.graphics.Paint;
 import android.graphics.Path;
 import android.graphics.RectF;
 import android.os.Parcel;
-import android.support.annotation.ColorRes;
-import android.support.annotation.NonNull;
-import android.support.v4.content.res.ResourcesCompat;
+import androidx.annotation.ColorRes;
+import androidx.annotation.NonNull;
+import androidx.core.content.res.ResourcesCompat;
 
 import network.loki.messenger.R;
 import org.thoughtcrime.securesms.imageeditor.Bounds;
diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/InvalidateableRenderer.java b/src/org/thoughtcrime/securesms/imageeditor/renderers/InvalidateableRenderer.java
index 88c5549d0c..fd255e4d2c 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/renderers/InvalidateableRenderer.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/renderers/InvalidateableRenderer.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.imageeditor.renderers;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.imageeditor.Renderer;
 import org.thoughtcrime.securesms.imageeditor.RendererContext;
diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/InverseFillRenderer.java b/src/org/thoughtcrime/securesms/imageeditor/renderers/InverseFillRenderer.java
index c7bba78f4b..6c662e9d18 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/renderers/InverseFillRenderer.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/renderers/InverseFillRenderer.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.imageeditor.renderers;
 
 import android.graphics.Path;
 import android.os.Parcel;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.imageeditor.Bounds;
 import org.thoughtcrime.securesms.imageeditor.Renderer;
diff --git a/src/org/thoughtcrime/securesms/imageeditor/renderers/TextRenderer.java b/src/org/thoughtcrime/securesms/imageeditor/renderers/TextRenderer.java
index 3b79097b80..b32823f9a0 100644
--- a/src/org/thoughtcrime/securesms/imageeditor/renderers/TextRenderer.java
+++ b/src/org/thoughtcrime/securesms/imageeditor/renderers/TextRenderer.java
@@ -8,9 +8,9 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Typeface;
 import android.os.Parcel;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.animation.Interpolator;
 
 import org.thoughtcrime.securesms.imageeditor.Bounds;
diff --git a/src/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java b/src/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java
index e4e7413f7c..023be74017 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java
@@ -6,7 +6,7 @@ import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 
diff --git a/src/org/thoughtcrime/securesms/jobmanager/CompositeScheduler.java b/src/org/thoughtcrime/securesms/jobmanager/CompositeScheduler.java
index f4844651af..322366f4f4 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/CompositeScheduler.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/CompositeScheduler.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/org/thoughtcrime/securesms/jobmanager/Constraint.java b/src/org/thoughtcrime/securesms/jobmanager/Constraint.java
index 5ee9b7ece4..854804d746 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/Constraint.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/Constraint.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.jobmanager;
 
 import android.app.job.JobInfo;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 public interface Constraint {
 
diff --git a/src/org/thoughtcrime/securesms/jobmanager/ConstraintInstantiator.java b/src/org/thoughtcrime/securesms/jobmanager/ConstraintInstantiator.java
index 2b41f4051b..b0a67e3d19 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/ConstraintInstantiator.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/ConstraintInstantiator.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/org/thoughtcrime/securesms/jobmanager/ConstraintObserver.java b/src/org/thoughtcrime/securesms/jobmanager/ConstraintObserver.java
index f870496e64..fd7f4fd43c 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/ConstraintObserver.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/ConstraintObserver.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public interface ConstraintObserver {
 
diff --git a/src/org/thoughtcrime/securesms/jobmanager/Data.java b/src/org/thoughtcrime/securesms/jobmanager/Data.java
index a55069ec38..72e8508a5b 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/Data.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/Data.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobmanager;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/org/thoughtcrime/securesms/jobmanager/ExecutorFactory.java b/src/org/thoughtcrime/securesms/jobmanager/ExecutorFactory.java
index a86c99135a..b0c2b974de 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/ExecutorFactory.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/ExecutorFactory.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.concurrent.ExecutorService;
 
diff --git a/src/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java b/src/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java
index 585b262adf..1b055584ea 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobmanager;
 
 import android.os.Handler;
 import android.os.HandlerThread;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 
diff --git a/src/org/thoughtcrime/securesms/jobmanager/Job.java b/src/org/thoughtcrime/securesms/jobmanager/Job.java
index 2f5d4a19c3..dfcc087208 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/Job.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/Job.java
@@ -1,9 +1,9 @@
 package org.thoughtcrime.securesms.jobmanager;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 
 import org.thoughtcrime.securesms.logging.Log;
 
diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobController.java b/src/org/thoughtcrime/securesms/jobmanager/JobController.java
index d9f910ba91..6294e3725e 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/JobController.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/JobController.java
@@ -1,9 +1,9 @@
 package org.thoughtcrime.securesms.jobmanager;
 
 import android.app.Application;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 
 import com.annimon.stream.Stream;
 
diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java b/src/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java
index c1166de756..37cba5e422 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/JobInstantiator.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobLogger.java b/src/org/thoughtcrime/securesms/jobmanager/JobLogger.java
index dd5e612f56..c35f6dc1ac 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/JobLogger.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/JobLogger.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 public class JobLogger {
diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobManager.java b/src/org/thoughtcrime/securesms/jobmanager/JobManager.java
index 1ab2cb6b09..636faa04fb 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/JobManager.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/JobManager.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.jobmanager;
 import android.app.Application;
 import android.content.Intent;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.impl.DefaultExecutorFactory;
 import org.thoughtcrime.securesms.jobmanager.impl.JsonDataSerializer;
diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobRunner.java b/src/org/thoughtcrime/securesms/jobmanager/JobRunner.java
index 7c67dc3394..a2cf5d2079 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/JobRunner.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/JobRunner.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobmanager;
 
 import android.app.Application;
 import android.os.PowerManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 
diff --git a/src/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java b/src/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java
index 77a1f9a7bb..d3e3f4877e 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java
@@ -8,8 +8,8 @@ import android.app.job.JobService;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.logging.Log;
diff --git a/src/org/thoughtcrime/securesms/jobmanager/KeepAliveService.java b/src/org/thoughtcrime/securesms/jobmanager/KeepAliveService.java
index ccc1aa234c..121686671c 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/KeepAliveService.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/KeepAliveService.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.jobmanager;
 import android.app.Service;
 import android.content.Intent;
 import android.os.IBinder;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 /**
  * Service that keeps the application in memory while the app is closed.
diff --git a/src/org/thoughtcrime/securesms/jobmanager/Scheduler.java b/src/org/thoughtcrime/securesms/jobmanager/Scheduler.java
index fb276cfe2d..194acd39b2 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/Scheduler.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/Scheduler.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.List;
 
diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraint.java b/src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraint.java
index 5fb9997361..6d6fc0499f 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraint.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraint.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobmanager.impl;
 
 import android.app.Application;
 import android.app.job.JobInfo;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.Constraint;
 import org.thoughtcrime.securesms.sms.TelephonyServiceState;
diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java b/src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java
index dfd1b9c714..fd0971dc57 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/impl/CellServiceConstraintObserver.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobmanager.impl;
 
 import android.app.Application;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
 import android.telephony.TelephonyManager;
diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory.java b/src/org/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory.java
index 91c72474c8..a9d4591009 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/impl/DefaultExecutorFactory.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager.impl;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.ExecutorFactory;
 
diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java b/src/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java
index fbabab82fa..95ab7e19c3 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager.impl;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.logging.Log;
diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java b/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java
index 1252e4da6e..1546883b85 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraint.java
@@ -5,8 +5,8 @@ import android.app.job.JobInfo;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 import org.thoughtcrime.securesms.jobmanager.Constraint;
 
diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java b/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java
index fd99ae367d..ef4a61c7c5 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkConstraintObserver.java
@@ -6,7 +6,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.ConnectivityManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.ConstraintObserver;
 
diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkOrCellServiceConstraint.java b/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkOrCellServiceConstraint.java
index 565f69c30b..c17931f977 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkOrCellServiceConstraint.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/impl/NetworkOrCellServiceConstraint.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobmanager.impl;
 
 import android.app.Application;
 import android.app.job.JobInfo;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.Constraint;
 
diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraint.java b/src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraint.java
index d3bb5c9268..8e0c230c01 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraint.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraint.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobmanager.impl;
 
 import android.app.Application;
 import android.app.job.JobInfo;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.Constraint;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
diff --git a/src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java b/src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java
index 96b858e9da..0c9225434d 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/impl/SqlCipherMigrationConstraintObserver.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager.impl;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
diff --git a/src/org/thoughtcrime/securesms/jobmanager/migration/DataMigrator.java b/src/org/thoughtcrime/securesms/jobmanager/migration/DataMigrator.java
index d04f765d6a..6d3d270998 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/migration/DataMigrator.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/migration/DataMigrator.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager.migration;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.logging.Log;
diff --git a/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerDatabase.java b/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerDatabase.java
index 2f4696a283..81226fc976 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerDatabase.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerDatabase.java
@@ -4,8 +4,8 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.jobmanager.Job;
diff --git a/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerFactoryMappings.java b/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerFactoryMappings.java
index 04bb55eca4..ff58bd2899 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerFactoryMappings.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerFactoryMappings.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobmanager.migration;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.jobs.AttachmentDownloadJob;
 import org.thoughtcrime.securesms.jobs.AttachmentUploadJob;
diff --git a/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerMigrator.java b/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerMigrator.java
index 1bc7fcc96f..ae7df8eb9a 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerMigrator.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/migration/WorkManagerMigrator.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.jobmanager.migration;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
 
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.jobmanager.persistence.FullSpec;
diff --git a/src/org/thoughtcrime/securesms/jobmanager/persistence/ConstraintSpec.java b/src/org/thoughtcrime/securesms/jobmanager/persistence/ConstraintSpec.java
index 8bec3a7030..1dab10ae56 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/persistence/ConstraintSpec.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/persistence/ConstraintSpec.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager.persistence;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.Objects;
 
diff --git a/src/org/thoughtcrime/securesms/jobmanager/persistence/DependencySpec.java b/src/org/thoughtcrime/securesms/jobmanager/persistence/DependencySpec.java
index 644c4d1223..2faea0485b 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/persistence/DependencySpec.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/persistence/DependencySpec.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager.persistence;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.Objects;
 
diff --git a/src/org/thoughtcrime/securesms/jobmanager/persistence/FullSpec.java b/src/org/thoughtcrime/securesms/jobmanager/persistence/FullSpec.java
index 1a70a9eea4..f93c0e64bd 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/persistence/FullSpec.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/persistence/FullSpec.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobmanager.persistence;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/src/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.java b/src/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.java
index d73fa8cfb7..d5f5cd5b3e 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/persistence/JobSpec.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.jobmanager.persistence;
 
 import android.annotation.SuppressLint;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.Objects;
 
diff --git a/src/org/thoughtcrime/securesms/jobmanager/persistence/JobStorage.java b/src/org/thoughtcrime/securesms/jobmanager/persistence/JobStorage.java
index 92d6fd31f2..b7c035ac60 100644
--- a/src/org/thoughtcrime/securesms/jobmanager/persistence/JobStorage.java
+++ b/src/org/thoughtcrime/securesms/jobmanager/persistence/JobStorage.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.jobmanager.persistence;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 
 import java.util.List;
 
diff --git a/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java
index 5b34dc2f71..0a8b734d43 100644
--- a/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.VisibleForTesting;
+import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 import android.text.TextUtils;
 
 import org.greenrobot.eventbus.EventBus;
@@ -18,7 +18,6 @@ import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.MmsException;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.util.AttachmentUtil;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.Hex;
diff --git a/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java b/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java
index 99f5b1c7d5..f1c721718c 100644
--- a/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.greenrobot.eventbus.EventBus;
 import org.thoughtcrime.securesms.attachments.Attachment;
diff --git a/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java
index 77e4e1c883..0b2db43157 100644
--- a/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
@@ -14,7 +14,6 @@ import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.AttachmentStreamUriLoader.AttachmentModel;
 import org.thoughtcrime.securesms.util.BitmapDecodingException;
 import org.thoughtcrime.securesms.util.BitmapUtil;
-import org.thoughtcrime.securesms.util.GroupUtil;
 import org.thoughtcrime.securesms.util.Hex;
 import org.whispersystems.libsignal.InvalidMessageException;
 import org.whispersystems.libsignal.util.guava.Optional;
diff --git a/src/org/thoughtcrime/securesms/jobs/BaseJob.java b/src/org/thoughtcrime/securesms/jobs/BaseJob.java
index 9d4e76b032..73053b0479 100644
--- a/src/org/thoughtcrime/securesms/jobs/BaseJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/BaseJob.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.jobmanager.JobLogger;
diff --git a/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java b/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
index 987ce6e787..2d427a35aa 100644
--- a/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.jobmanager.Job;
diff --git a/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java b/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java
index 28a866611b..0b56da982d 100644
--- a/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.PreKeyUtil;
diff --git a/src/org/thoughtcrime/securesms/jobs/FastJobStorage.java b/src/org/thoughtcrime/securesms/jobs/FastJobStorage.java
index 90a3243aed..38cf051455 100644
--- a/src/org/thoughtcrime/securesms/jobs/FastJobStorage.java
+++ b/src/org/thoughtcrime/securesms/jobs/FastJobStorage.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.annimon.stream.Stream;
 
diff --git a/src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java b/src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
index 41b31fd332..798b7bb17e 100644
--- a/src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
+++ b/src/org/thoughtcrime/securesms/jobs/JobManagerFactories.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
 import android.app.Application;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.Constraint;
 import org.thoughtcrime.securesms.jobmanager.ConstraintObserver;
diff --git a/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java b/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
index 0e750d8a18..dc0d8b1f4b 100644
--- a/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/LocalBackupJob.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs;
 
 
 import android.Manifest;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.backup.BackupPassphrase;
 import org.thoughtcrime.securesms.backup.FullBackupExporter;
diff --git a/src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java
index 5b1d81abcc..b8430d0fac 100644
--- a/src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MmsDownloadJob.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.jobs;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.google.android.mms.pdu_alt.CharacterSets;
 import com.google.android.mms.pdu_alt.EncodedStringValue;
diff --git a/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java b/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java
index 5cda9e2151..1dee3ff330 100644
--- a/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MmsReceiveJob.java
@@ -4,7 +4,7 @@ import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.jobmanager.Job;
 import org.thoughtcrime.securesms.logging.Log;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Pair;
 
 import com.google.android.mms.pdu_alt.GenericPdu;
diff --git a/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java b/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java
index e3005573e3..5ca2d33dc3 100644
--- a/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MmsSendJob.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 import android.webkit.MimeTypeMap;
 
@@ -36,7 +36,6 @@ import org.thoughtcrime.securesms.mms.MmsException;
 import org.thoughtcrime.securesms.mms.MmsSendResult;
 import org.thoughtcrime.securesms.mms.OutgoingMediaMessage;
 import org.thoughtcrime.securesms.mms.PartAuthority;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.transport.InsecureFallbackApprovalException;
 import org.thoughtcrime.securesms.transport.UndeliverableMessageException;
diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java
index ce7e9c53e2..869cdce96d 100644
--- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceBlockedUpdateJob.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java
index d0da9d6bc9..d464b0612b 100644
--- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceConfigurationUpdateJob.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
index 184c515c12..367f7463c5 100644
--- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.jobs;
 import android.content.Context;
 import android.net.Uri;
 import android.provider.ContactsContract;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.contacts.ContactAccessor.ContactData;
diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java
index c35d6b8e3a..25d05daaee 100644
--- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceGroupUpdateJob.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.Address;
diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java
index dfcee1093b..8283e6236a 100644
--- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.jobmanager.Job;
diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java
index ecf18ec362..cb203e132f 100644
--- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java
index f30a353f5e..bbc76baf4c 100644
--- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackOperationJob.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.jobmanager.Data;
diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java
index f918659446..2c4a47670b 100644
--- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceStickerPackSyncJob.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.jobmanager.Data;
diff --git a/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java
index 81e6299e2c..e43a67cb1e 100644
--- a/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/MultiDeviceVerifiedUpdateJob.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.database.IdentityDatabase.VerifiedStatus;
diff --git a/src/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java b/src/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java
index 79ad58f618..3032093e49 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushContentReceiveJob.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.jobmanager.Data;
 import org.thoughtcrime.securesms.jobmanager.Job;
diff --git a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
index cc6445c532..4ce544efb2 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushDecryptJob.java
@@ -5,10 +5,10 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
 import android.text.TextUtils;
 import android.util.Pair;
 
diff --git a/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
index f240ec24a2..5b7d64dac8 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
@@ -1,9 +1,9 @@
 package org.thoughtcrime.securesms.jobs;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 
 import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
diff --git a/src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java b/src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java
index adb49eba35..38576e415b 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushGroupUpdateJob.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.Address;
diff --git a/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
index 3a70c4fc18..251e23a879 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.jobs;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
 
 import com.annimon.stream.Stream;
 
diff --git a/src/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java b/src/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java
index 3d38c1c833..e053b12cb7 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushNotificationReceiveJob.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.jobmanager.Data;
diff --git a/src/org/thoughtcrime/securesms/jobs/PushReceivedJob.java b/src/org/thoughtcrime/securesms/jobs/PushReceivedJob.java
index 34570b169d..e506d993e9 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushReceivedJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushReceivedJob.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
 import android.annotation.SuppressLint;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
diff --git a/src/org/thoughtcrime/securesms/jobs/PushSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushSendJob.java
index b3551572fe..201e3c672f 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushSendJob.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.jobs;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import com.annimon.stream.Stream;
@@ -24,7 +24,6 @@ import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader;
 import org.thoughtcrime.securesms.mms.OutgoingMediaMessage;
 import org.thoughtcrime.securesms.mms.PartAuthority;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.BitmapDecodingException;
diff --git a/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
index 6e28d4163c..97d4572a40 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import org.thoughtcrime.securesms.ApplicationContext;
diff --git a/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java b/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
index 9ed1639180..129f35d9a5 100644
--- a/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RefreshAttributesJob.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.jobmanager.Data;
diff --git a/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java b/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java
index 24518c5eb9..0ee0daf98d 100644
--- a/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.jobmanager.Data;
diff --git a/src/org/thoughtcrime/securesms/jobs/RefreshUnidentifiedDeliveryAbilityJob.java b/src/org/thoughtcrime/securesms/jobs/RefreshUnidentifiedDeliveryAbilityJob.java
index 1b6c87599a..6fd616168b 100644
--- a/src/org/thoughtcrime/securesms/jobs/RefreshUnidentifiedDeliveryAbilityJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RefreshUnidentifiedDeliveryAbilityJob.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
diff --git a/src/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java b/src/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java
index bb9cc72d91..ae6acec2cf 100644
--- a/src/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RequestGroupInfoJob.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.Address;
diff --git a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
index 9c574bd6ea..48bc091e97 100644
--- a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs;
 
 
 import android.app.Application;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import org.thoughtcrime.securesms.database.Address;
diff --git a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
index 25ed74dbb0..c3febc4fe8 100644
--- a/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RetrieveProfileJob.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs;
 
 
 import android.app.Application;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import org.thoughtcrime.securesms.ApplicationContext;
diff --git a/src/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java b/src/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java
index 3caf337f5f..087b783845 100644
--- a/src/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RotateCertificateJob.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.jobs;
 
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.jobmanager.Data;
diff --git a/src/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java b/src/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java
index 6f65e21077..56586c7a88 100644
--- a/src/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RotateProfileKeyJob.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.crypto.ProfileKeyUtil;
diff --git a/src/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java b/src/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java
index c8d0932ec5..5ab4a0d6d0 100644
--- a/src/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RotateSignedPreKeyJob.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
diff --git a/src/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java b/src/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java
index fa589cd5ac..dead5266cd 100644
--- a/src/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/SendDeliveryReceiptJob.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.Address;
diff --git a/src/org/thoughtcrime/securesms/jobs/SendJob.java b/src/org/thoughtcrime/securesms/jobs/SendJob.java
index c8a1f49939..5c0b6b480f 100644
--- a/src/org/thoughtcrime/securesms/jobs/SendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/SendJob.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import network.loki.messenger.BuildConfig;
 import org.thoughtcrime.securesms.TextSecureExpiredException;
diff --git a/src/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java b/src/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java
index da08f5aa1f..24692eb026 100644
--- a/src/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.Address;
diff --git a/src/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java b/src/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java
index 1a83a580e3..4669365a97 100644
--- a/src/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/ServiceOutageDetectionJob.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.greenrobot.eventbus.EventBus;
 import org.thoughtcrime.securesms.events.ReminderUpdateEvent;
diff --git a/src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java b/src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
index e6463eb11e..d1032e5962 100644
--- a/src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/SmsReceiveJob.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.telephony.SmsMessage;
 
 import org.thoughtcrime.securesms.ApplicationContext;
@@ -13,7 +13,6 @@ import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessagingDatabase.InsertResult;
 import org.thoughtcrime.securesms.database.SmsDatabase;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.sms.IncomingTextMessage;
 import org.thoughtcrime.securesms.util.Base64;
diff --git a/src/org/thoughtcrime/securesms/jobs/SmsSendJob.java b/src/org/thoughtcrime/securesms/jobs/SmsSendJob.java
index ed4ebcfdf4..f4cf0be170 100644
--- a/src/org/thoughtcrime/securesms/jobs/SmsSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/SmsSendJob.java
@@ -5,7 +5,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.telephony.PhoneNumberUtils;
 import android.telephony.SmsManager;
 
@@ -19,7 +19,6 @@ import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.NoSuchMessageException;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.model.SmsMessageRecord;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.service.SmsDeliveryListener;
 import org.thoughtcrime.securesms.transport.UndeliverableMessageException;
diff --git a/src/org/thoughtcrime/securesms/jobs/SmsSentJob.java b/src/org/thoughtcrime/securesms/jobs/SmsSentJob.java
index 43fc8d4170..bf2420f0c1 100644
--- a/src/org/thoughtcrime/securesms/jobs/SmsSentJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/SmsSentJob.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.jobs;
 
 import android.app.Activity;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.telephony.SmsManager;
 
 import org.thoughtcrime.securesms.jobmanager.Data;
@@ -13,7 +13,6 @@ import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.NoSuchMessageException;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.database.model.SmsMessageRecord;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.service.SmsDeliveryListener;
 
 public class SmsSentJob extends BaseJob {
diff --git a/src/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java
index b9e1bbc388..4919ae9536 100644
--- a/src/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/StickerDownloadJob.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.StickerDatabase;
diff --git a/src/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java
index 6e7b6d703c..166afbc3fc 100644
--- a/src/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/StickerPackDownloadJob.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
diff --git a/src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java b/src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java
index 95be3090b5..fa28603a7a 100644
--- a/src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/TrimThreadJob.java
@@ -16,7 +16,7 @@
  */
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.jobmanager.Data;
diff --git a/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java b/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java
index 51015297f7..fcc34e2150 100644
--- a/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/TypingSendJob.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 
diff --git a/src/org/thoughtcrime/securesms/jobs/UpdateApkJob.java b/src/org/thoughtcrime/securesms/jobs/UpdateApkJob.java
index 4a0359c967..9ac7cea4b3 100644
--- a/src/org/thoughtcrime/securesms/jobs/UpdateApkJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/UpdateApkJob.java
@@ -8,8 +8,8 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
diff --git a/src/org/thoughtcrime/securesms/linkpreview/LinkPreview.java b/src/org/thoughtcrime/securesms/linkpreview/LinkPreview.java
index 35b3634c78..9daa346ea6 100644
--- a/src/org/thoughtcrime/securesms/linkpreview/LinkPreview.java
+++ b/src/org/thoughtcrime/securesms/linkpreview/LinkPreview.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.linkpreview;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
index c213963d75..fc931c0545 100644
--- a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
+++ b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.linkpreview;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.Html;
 import android.text.TextUtils;
 
diff --git a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java
index 9eab5a1e03..9139f67ca0 100644
--- a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java
+++ b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewUtil.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.linkpreview;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.URLSpan;
diff --git a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java
index a7231a44b1..163d5e73be 100644
--- a/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java
+++ b/src/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java
@@ -1,11 +1,11 @@
 package org.thoughtcrime.securesms.linkpreview;
 
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.ViewModel;
-import android.arch.lifecycle.ViewModelProvider;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import org.thoughtcrime.securesms.net.RequestController;
diff --git a/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java b/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java
index ae8408e247..7dc4f2c296 100644
--- a/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java
+++ b/src/org/thoughtcrime/securesms/lock/RegistrationLockDialog.java
@@ -6,8 +6,8 @@ import android.content.Context;
 import android.graphics.Typeface;
 import android.os.AsyncTask;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import android.text.Editable;
 import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
diff --git a/src/org/thoughtcrime/securesms/lock/RegistrationLockReminders.java b/src/org/thoughtcrime/securesms/lock/RegistrationLockReminders.java
index 8df9fa0d6f..d000870cdb 100644
--- a/src/org/thoughtcrime/securesms/lock/RegistrationLockReminders.java
+++ b/src/org/thoughtcrime/securesms/lock/RegistrationLockReminders.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.lock;
 
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
diff --git a/src/org/thoughtcrime/securesms/logging/Log.java b/src/org/thoughtcrime/securesms/logging/Log.java
index 31dc299227..ea4e106861 100644
--- a/src/org/thoughtcrime/securesms/logging/Log.java
+++ b/src/org/thoughtcrime/securesms/logging/Log.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.logging;
 
-import android.support.annotation.MainThread;
+import androidx.annotation.MainThread;
 
 public class Log {
 
diff --git a/src/org/thoughtcrime/securesms/logging/LogFile.java b/src/org/thoughtcrime/securesms/logging/LogFile.java
index 2f2bd43910..8fbf8c3a78 100644
--- a/src/org/thoughtcrime/securesms/logging/LogFile.java
+++ b/src/org/thoughtcrime/securesms/logging/LogFile.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.logging;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.util.Conversions;
 import org.thoughtcrime.securesms.util.Util;
@@ -12,8 +12,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.PushbackInputStream;
-import java.io.RandomAccessFile;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
diff --git a/src/org/thoughtcrime/securesms/logging/LogSecretProvider.java b/src/org/thoughtcrime/securesms/logging/LogSecretProvider.java
index e180a08842..e3b13dfaac 100644
--- a/src/org/thoughtcrime/securesms/logging/LogSecretProvider.java
+++ b/src/org/thoughtcrime/securesms/logging/LogSecretProvider.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.logging;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.crypto.KeyStoreHelper;
 import org.thoughtcrime.securesms.util.Base64;
diff --git a/src/org/thoughtcrime/securesms/logging/PersistentLogger.java b/src/org/thoughtcrime/securesms/logging/PersistentLogger.java
index 334df55762..17b541a990 100644
--- a/src/org/thoughtcrime/securesms/logging/PersistentLogger.java
+++ b/src/org/thoughtcrime/securesms/logging/PersistentLogger.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.logging;
 
 import android.content.Context;
-import android.support.annotation.AnyThread;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.AnyThread;
+import androidx.annotation.WorkerThread;
 
 import org.thoughtcrime.securesms.database.NoExternalStorageException;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
diff --git a/src/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java b/src/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java
index 642703695a..0196132108 100644
--- a/src/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java
+++ b/src/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.logging;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public class UncaughtExceptionLogger implements Thread.UncaughtExceptionHandler {
 
diff --git a/src/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java b/src/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java
index ef008c3dbb..67ea859b71 100644
--- a/src/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java
+++ b/src/org/thoughtcrime/securesms/logsubmit/ShareIntentListAdapter.java
@@ -23,7 +23,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.ResolveInfo;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java b/src/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java
index 2b591de790..4900e3fb8b 100644
--- a/src/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java
+++ b/src/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java
@@ -31,10 +31,10 @@ import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.ClipboardManager;
 import android.text.TextUtils;
 import android.text.method.LinkMovementMethod;
diff --git a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
index 35855ccad7..b39c9cf93c 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
@@ -5,9 +5,9 @@ import android.content.Intent
 import android.graphics.Bitmap
 import android.os.AsyncTask
 import android.os.Bundle
-import android.support.v4.app.LoaderManager
-import android.support.v4.content.Loader
-import android.support.v7.widget.LinearLayoutManager
+import androidx.loader.app.LoaderManager
+import androidx.loader.content.Loader
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
diff --git a/src/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt
index aa325d8719..41b46c8b70 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt
@@ -5,8 +5,8 @@ import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentPagerAdapter
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentPagerAdapter
 import android.text.InputType
 import android.view.LayoutInflater
 import android.view.View
@@ -136,7 +136,7 @@ class EnterPublicKeyFragment : Fragment() {
     private fun copyPublicKey() {
         val clipboard = activity!!.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
         val clip = ClipData.newPlainText("Session ID", hexEncodedPublicKey)
-        clipboard.primaryClip = clip
+        clipboard.setPrimaryClip(clip)
         Toast.makeText(context!!, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
     }
 
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
index e66883325c..88c088ddb5 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
@@ -3,9 +3,9 @@ package org.thoughtcrime.securesms.loki.activities
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import android.support.v4.app.LoaderManager
-import android.support.v4.content.Loader
-import android.support.v7.widget.LinearLayoutManager
+import androidx.loader.app.LoaderManager
+import androidx.loader.content.Loader
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
diff --git a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
index 2ea2a4b56a..384368a9dd 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupMembersAdapter.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.loki.activities
 
 import android.content.Context
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.ViewGroup
 import org.thoughtcrime.securesms.database.Address
 import org.thoughtcrime.securesms.loki.views.UserView
diff --git a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
index 1c799248d9..b69f05d934 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/HomeActivity.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.loki.activities
 
 import android.app.AlertDialog
-import android.arch.lifecycle.Observer
+import androidx.lifecycle.Observer
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
@@ -11,10 +11,10 @@ import android.net.Uri
 import android.os.AsyncTask
 import android.os.Bundle
 import android.os.Handler
-import android.support.v4.app.LoaderManager
-import android.support.v4.content.Loader
-import android.support.v4.content.LocalBroadcastManager
-import android.support.v7.widget.LinearLayoutManager
+import androidx.loader.app.LoaderManager
+import androidx.loader.content.Loader
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.text.Spannable
 import android.text.SpannableString
 import android.text.style.ForegroundColorSpan
diff --git a/src/org/thoughtcrime/securesms/loki/activities/HomeAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/HomeAdapter.kt
index 8ee3294207..c64d342e0a 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/HomeAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/HomeAdapter.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.loki.activities
 
 import android.content.Context
 import android.database.Cursor
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.ViewGroup
 import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter
 import org.thoughtcrime.securesms.database.DatabaseFactory
diff --git a/src/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt
index 11f3a79b06..60b872883c 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.loki.activities
 import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentPagerAdapter
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentPagerAdapter
 import android.util.Patterns
 import android.view.LayoutInflater
 import android.view.View
diff --git a/src/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt
index d9d8f95da3..e80a55d832 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.loki.activities
 
 import android.content.Intent
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentPagerAdapter
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentPagerAdapter
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/src/org/thoughtcrime/securesms/loki/activities/LinkedDevicesActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/LinkedDevicesActivity.kt
index 2c4e9dabde..acd0062486 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/LinkedDevicesActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/LinkedDevicesActivity.kt
@@ -1,10 +1,10 @@
 package org.thoughtcrime.securesms.loki.activities
 
 import android.os.Bundle
-import android.support.v4.app.LoaderManager
-import android.support.v4.content.Loader
-import android.support.v7.app.AlertDialog
-import android.support.v7.widget.LinearLayoutManager
+import androidx.loader.app.LoaderManager
+import androidx.loader.content.Loader
+import androidx.appcompat.app.AlertDialog
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
diff --git a/src/org/thoughtcrime/securesms/loki/activities/LinkedDevicesAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/LinkedDevicesAdapter.kt
index 79da843e75..03def2eccf 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/LinkedDevicesAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/LinkedDevicesAdapter.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.loki.activities
 
 import android.content.Context
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.ViewGroup
 import org.thoughtcrime.securesms.devicelist.Device
 import org.thoughtcrime.securesms.loki.views.DeviceView
diff --git a/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt
index 5e4275d946..acbfea1366 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/PNModeActivity.kt
@@ -5,7 +5,7 @@ import android.content.Intent
 import android.graphics.drawable.TransitionDrawable
 import android.net.Uri
 import android.os.Bundle
-import android.support.annotation.DrawableRes
+import androidx.annotation.DrawableRes
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
diff --git a/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
index 1133865cad..b42661be1f 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/PathActivity.kt
@@ -7,7 +7,7 @@ import android.content.IntentFilter
 import android.net.Uri
 import android.os.Bundle
 import android.os.Handler
-import android.support.v4.content.LocalBroadcastManager
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import android.util.AttributeSet
 import android.util.TypedValue
 import android.view.Gravity
diff --git a/src/org/thoughtcrime/securesms/loki/activities/QRCodeActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/QRCodeActivity.kt
index 34fbe29756..f7c864ad29 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/QRCodeActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/QRCodeActivity.kt
@@ -5,8 +5,8 @@ import android.content.Intent
 import android.graphics.Bitmap
 import android.os.Bundle
 import android.os.Environment
-import android.support.v4.app.Fragment
-import android.support.v4.app.FragmentPagerAdapter
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentPagerAdapter
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/src/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt
index b78cb79308..9d5a71c85b 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/RegisterActivity.kt
@@ -153,7 +153,7 @@ class RegisterActivity : BaseActionBarActivity() {
     private fun copyPublicKey() {
         val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
         val clip = ClipData.newPlainText("Session ID", keyPair!!.hexEncodedPublicKey)
-        clipboard.primaryClip = clip
+        clipboard.setPrimaryClip(clip)
         Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
     }
 
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt
index 50f2a64b22..d0995ee019 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SeedActivity.kt
@@ -78,7 +78,7 @@ class SeedActivity : BaseActionBarActivity() {
         revealSeed()
         val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
         val clip = ClipData.newPlainText("Seed", seed)
-        clipboard.primaryClip = clip
+        clipboard.setPrimaryClip(clip)
         Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
     }
     // endregion
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
index 9292f143bd..43a0bd72c6 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsActivity.kt
@@ -3,9 +3,9 @@ package org.thoughtcrime.securesms.loki.activities
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import android.support.v4.app.LoaderManager
-import android.support.v4.content.Loader
-import android.support.v7.widget.LinearLayoutManager
+import androidx.loader.app.LoaderManager
+import androidx.loader.content.Loader
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
index abe2849165..66f7e7c769 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SelectContactsAdapter.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.loki.activities
 
 import android.content.Context
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.ViewGroup
 import org.thoughtcrime.securesms.database.Address
 import org.thoughtcrime.securesms.loki.views.UserView
diff --git a/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt b/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
index c96a7d0a96..c79812b15a 100644
--- a/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
+++ b/src/org/thoughtcrime/securesms/loki/activities/SettingsActivity.kt
@@ -226,7 +226,7 @@ class SettingsActivity : PassphraseRequiredActionBarActivity() {
     private fun copyPublicKey() {
         val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
         val clip = ClipData.newPlainText("Session ID", hexEncodedPublicKey)
-        clipboard.primaryClip = clip
+        clipboard.setPrimaryClip(clip)
         Toast.makeText(this, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
     }
 
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt b/src/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt
index 0c0a405e76..42e4e0711a 100644
--- a/src/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt
@@ -4,8 +4,8 @@ import android.app.Dialog
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
-import android.support.v7.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import androidx.appcompat.app.AlertDialog
 import android.view.LayoutInflater
 import kotlinx.android.synthetic.main.dialog_clear_all_data.view.*
 import network.loki.messenger.R
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt b/src/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt
index 092b37bc75..b2f62cc37f 100644
--- a/src/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.loki.dialogs
 
 import android.os.Bundle
-import android.support.design.widget.BottomSheetDialogFragment
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt b/src/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt
index 498cb1f0e9..7229cb5df2 100644
--- a/src/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.loki.dialogs
 
 import android.os.Bundle
-import android.support.design.widget.BottomSheetDialogFragment
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/DeviceEditingOptionsBottomSheet.kt b/src/org/thoughtcrime/securesms/loki/dialogs/DeviceEditingOptionsBottomSheet.kt
index b452c1364d..527f88d1e5 100644
--- a/src/org/thoughtcrime/securesms/loki/dialogs/DeviceEditingOptionsBottomSheet.kt
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/DeviceEditingOptionsBottomSheet.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.loki.dialogs
 
 import android.os.Bundle
-import android.support.design.widget.BottomSheetDialogFragment
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/EditDeviceNameDialog.kt b/src/org/thoughtcrime/securesms/loki/dialogs/EditDeviceNameDialog.kt
index e66d3eb387..6ae8b2c4cb 100644
--- a/src/org/thoughtcrime/securesms/loki/dialogs/EditDeviceNameDialog.kt
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/EditDeviceNameDialog.kt
@@ -4,8 +4,8 @@ import android.app.Dialog
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
-import android.support.v7.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import androidx.appcompat.app.AlertDialog
 import android.view.LayoutInflater
 import android.view.View
 import kotlinx.android.synthetic.main.dialog_edit_device_name.view.*
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceMasterModeDialog.kt b/src/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceMasterModeDialog.kt
index 7dd30cf323..ed55eca238 100644
--- a/src/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceMasterModeDialog.kt
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceMasterModeDialog.kt
@@ -4,8 +4,8 @@ import android.app.Dialog
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
-import android.support.v7.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import androidx.appcompat.app.AlertDialog
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.LinearLayout
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceSlaveModeDialog.kt b/src/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceSlaveModeDialog.kt
index b87530bfa0..d795e3148f 100644
--- a/src/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceSlaveModeDialog.kt
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/LinkDeviceSlaveModeDialog.kt
@@ -5,8 +5,8 @@ import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.os.Handler
-import android.support.v4.app.DialogFragment
-import android.support.v7.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import androidx.appcompat.app.AlertDialog
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.LinearLayout
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/MultiDeviceRemovalBottomSheet.kt b/src/org/thoughtcrime/securesms/loki/dialogs/MultiDeviceRemovalBottomSheet.kt
index e236751d98..70e33d8476 100644
--- a/src/org/thoughtcrime/securesms/loki/dialogs/MultiDeviceRemovalBottomSheet.kt
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/MultiDeviceRemovalBottomSheet.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.loki.dialogs
 
 import android.graphics.Typeface
 import android.os.Bundle
-import android.support.design.widget.BottomSheetDialogFragment
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import android.text.Spannable
 import android.text.SpannableStringBuilder
 import android.text.method.LinkMovementMethod
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/OpenGroupSuggestionBottomSheet.kt b/src/org/thoughtcrime/securesms/loki/dialogs/OpenGroupSuggestionBottomSheet.kt
index c87e4f4ef0..d8a84b13c7 100644
--- a/src/org/thoughtcrime/securesms/loki/dialogs/OpenGroupSuggestionBottomSheet.kt
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/OpenGroupSuggestionBottomSheet.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.loki.dialogs
 
 import android.os.Bundle
-import android.support.design.widget.BottomSheetDialogFragment
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/src/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt b/src/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt
index 3caf3d752b..59f96ae433 100644
--- a/src/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt
+++ b/src/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt
@@ -7,8 +7,8 @@ import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
-import android.support.v4.app.DialogFragment
-import android.support.v7.app.AlertDialog
+import androidx.fragment.app.DialogFragment
+import androidx.appcompat.app.AlertDialog
 import android.view.LayoutInflater
 import android.widget.Toast
 import kotlinx.android.synthetic.main.dialog_seed.view.*
@@ -44,7 +44,7 @@ class SeedDialog : DialogFragment() {
     private fun copySeed() {
         val clipboard = activity!!.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
         val clip = ClipData.newPlainText("Seed", seed)
-        clipboard.primaryClip = clip
+        clipboard.setPrimaryClip(clip)
         Toast.makeText(context!!, R.string.copied_to_clipboard, Toast.LENGTH_SHORT).show()
         dismiss()
     }
diff --git a/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt b/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt
index 1180305d5d..d9cfa2f617 100644
--- a/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt
+++ b/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListAdapter.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.loki.fragments
 
 import android.content.Context
-import android.support.v7.widget.RecyclerView
+import androidx.recyclerview.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt b/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt
index e91f0a3355..2bd6924783 100644
--- a/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt
+++ b/src/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt
@@ -1,11 +1,11 @@
 package org.thoughtcrime.securesms.loki.fragments
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v4.app.LoaderManager
-import android.support.v4.content.Loader
-import android.support.v4.widget.SwipeRefreshLayout.OnRefreshListener
-import android.support.v7.widget.LinearLayoutManager
+import androidx.fragment.app.Fragment
+import androidx.loader.app.LoaderManager
+import androidx.loader.content.Loader
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout.OnRefreshListener
+import androidx.recyclerview.widget.LinearLayoutManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeFragment.kt b/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeFragment.kt
index 68b098c655..6f380edb0b 100644
--- a/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeFragment.kt
+++ b/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeFragment.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.loki.fragments
 
 import android.content.res.Configuration
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodePlaceholderFragment.kt b/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodePlaceholderFragment.kt
index 544023f2d4..13e46b6fe1 100644
--- a/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodePlaceholderFragment.kt
+++ b/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodePlaceholderFragment.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.loki.fragments
 
 import android.os.Bundle
-import android.support.v4.app.Fragment
+import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeWrapperFragment.kt b/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeWrapperFragment.kt
index 7c8c416513..ac420ec241 100644
--- a/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeWrapperFragment.kt
+++ b/src/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeWrapperFragment.kt
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.loki.fragments
 import android.Manifest
 import android.content.pm.PackageManager
 import android.os.Bundle
-import android.support.v4.app.Fragment
-import android.support.v4.content.ContextCompat
+import androidx.fragment.app.Fragment
+import androidx.core.content.ContextCompat
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
diff --git a/src/org/thoughtcrime/securesms/loki/todo/JazzIdenticonContactPhoto.kt b/src/org/thoughtcrime/securesms/loki/todo/JazzIdenticonContactPhoto.kt
index 97b97502df..a26751ad48 100644
--- a/src/org/thoughtcrime/securesms/loki/todo/JazzIdenticonContactPhoto.kt
+++ b/src/org/thoughtcrime/securesms/loki/todo/JazzIdenticonContactPhoto.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.loki.todo
 
 import android.content.Context
 import android.graphics.drawable.Drawable
-import android.support.v7.content.res.AppCompatResources
+import androidx.appcompat.content.res.AppCompatResources
 import network.loki.messenger.R
 import org.thoughtcrime.securesms.contacts.avatars.FallbackContactPhoto
 
diff --git a/src/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt b/src/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt
index 3ab0ff813b..656de0436f 100644
--- a/src/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt
+++ b/src/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.loki.utilities
 
 import android.content.Intent
-import android.support.v7.app.ActionBar
-import android.support.v7.app.AppCompatActivity
+import androidx.appcompat.app.ActionBar
+import androidx.appcompat.app.AppCompatActivity
 import android.view.Gravity
 import android.widget.ImageView
 import android.widget.RelativeLayout
diff --git a/src/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt b/src/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt
index ebab9df16a..02cf41dd10 100644
--- a/src/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt
+++ b/src/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.loki.utilities
 
 import android.content.Context
 import android.content.Intent
-import android.support.v4.content.LocalBroadcastManager
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 
 class Broadcaster(private val context: Context) : org.whispersystems.signalservice.loki.utilities.Broadcaster {
 
diff --git a/src/org/thoughtcrime/securesms/loki/utilities/GeneralUtilities.kt b/src/org/thoughtcrime/securesms/loki/utilities/GeneralUtilities.kt
index e788255822..3ff3bd19a5 100644
--- a/src/org/thoughtcrime/securesms/loki/utilities/GeneralUtilities.kt
+++ b/src/org/thoughtcrime/securesms/loki/utilities/GeneralUtilities.kt
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.loki.utilities
 import android.content.Context
 import android.content.res.Resources
 import android.os.Build
-import android.support.annotation.ColorRes
+import androidx.annotation.ColorRes
 import org.thoughtcrime.securesms.database.DatabaseFactory
 import kotlin.math.roundToInt
 
diff --git a/src/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt b/src/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt
index 35bffffae9..8cd1204167 100644
--- a/src/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt
+++ b/src/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt
@@ -4,7 +4,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.support.v4.content.LocalBroadcastManager
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import android.util.Log
 import com.opencsv.CSVReader
 import org.whispersystems.signalservice.loki.api.onionrequests.OnionRequestAPI
diff --git a/src/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt b/src/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt
index 3038c076ae..5c329762f4 100644
--- a/src/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt
+++ b/src/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt
@@ -6,7 +6,7 @@ import android.animation.FloatEvaluator
 import android.animation.ValueAnimator
 import android.graphics.PointF
 import android.graphics.Rect
-import android.support.annotation.DimenRes
+import androidx.annotation.DimenRes
 import android.view.View
 
 fun View.contains(point: PointF): Boolean {
diff --git a/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt b/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
index 1b26e1d917..b81ea34291 100644
--- a/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/NewConversationButtonSetView.kt
@@ -13,8 +13,8 @@ import android.os.Build
 import android.os.VibrationEffect
 import android.os.VibrationEffect.DEFAULT_AMPLITUDE
 import android.os.Vibrator
-import android.support.annotation.ColorRes
-import android.support.annotation.DrawableRes
+import androidx.annotation.ColorRes
+import androidx.annotation.DrawableRes
 import android.util.AttributeSet
 import android.view.Gravity
 import android.view.MotionEvent
diff --git a/src/org/thoughtcrime/securesms/loki/views/PathStatusView.kt b/src/org/thoughtcrime/securesms/loki/views/PathStatusView.kt
index c56c0c51c6..3fd4158b89 100644
--- a/src/org/thoughtcrime/securesms/loki/views/PathStatusView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/PathStatusView.kt
@@ -4,7 +4,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.support.v4.content.LocalBroadcastManager
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import android.util.AttributeSet
 import android.view.View
 import network.loki.messenger.R
diff --git a/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt b/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
index 1250be7514..717baa3270 100644
--- a/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
+++ b/src/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.loki.views
 
 import android.content.Context
-import android.support.annotation.DimenRes
+import androidx.annotation.DimenRes
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
diff --git a/src/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java b/src/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java
index 63da62079a..c245136bba 100644
--- a/src/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java
+++ b/src/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java
@@ -1,13 +1,13 @@
 package org.thoughtcrime.securesms.longmessage;
 
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.SpannableString;
 import android.text.method.LinkMovementMethod;
 import android.text.style.URLSpan;
diff --git a/src/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java b/src/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java
index 2b296eca14..5b31a0ba8c 100644
--- a/src/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java
+++ b/src/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.longmessage;
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
 
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MmsDatabase;
diff --git a/src/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java b/src/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java
index fc5f6c247f..393bd97ccd 100644
--- a/src/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java
+++ b/src/org/thoughtcrime/securesms/longmessage/LongMessageViewModel.java
@@ -1,15 +1,15 @@
 package org.thoughtcrime.securesms.longmessage;
 
 import android.app.Application;
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.ViewModel;
-import android.arch.lifecycle.ViewModelProvider;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
 
 import android.database.ContentObserver;
 import android.net.Uri;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.database.DatabaseContentProviders;
 import org.whispersystems.libsignal.util.guava.Optional;
diff --git a/src/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java b/src/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java
index 987d3cab22..b5d4682e3a 100644
--- a/src/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java
+++ b/src/org/thoughtcrime/securesms/mediapreview/MediaPreviewViewModel.java
@@ -1,13 +1,13 @@
 package org.thoughtcrime.securesms.mediapreview;
 
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.ViewModel;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.database.MediaDatabase.MediaRecord;
 import org.thoughtcrime.securesms.mediasend.Media;
diff --git a/src/org/thoughtcrime/securesms/mediapreview/MediaRailAdapter.java b/src/org/thoughtcrime/securesms/mediapreview/MediaRailAdapter.java
index 770d7910aa..605676dcd0 100644
--- a/src/org/thoughtcrime/securesms/mediapreview/MediaRailAdapter.java
+++ b/src/org/thoughtcrime/securesms/mediapreview/MediaRailAdapter.java
@@ -1,15 +1,14 @@
 package org.thoughtcrime.securesms.mediapreview;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import network.loki.messenger.R;
 import org.thoughtcrime.securesms.components.ThumbnailView;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mediasend.Media;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.util.StableIdGenerator;
diff --git a/src/org/thoughtcrime/securesms/mediasend/Camera1Controller.java b/src/org/thoughtcrime/securesms/mediasend/Camera1Controller.java
index 1bc0da102e..69d7b0e0ab 100644
--- a/src/org/thoughtcrime/securesms/mediasend/Camera1Controller.java
+++ b/src/org/thoughtcrime/securesms/mediasend/Camera1Controller.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.mediasend;
 
 import android.graphics.SurfaceTexture;
 import android.hardware.Camera;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.Surface;
 
 import org.thoughtcrime.securesms.logging.Log;
diff --git a/src/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java b/src/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java
index 45c7eb6430..df51dba9f4 100644
--- a/src/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.mediasend;
 
 import android.annotation.SuppressLint;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
@@ -9,11 +9,10 @@ import android.graphics.Point;
 import android.graphics.PointF;
 import android.graphics.SurfaceTexture;
 import android.graphics.drawable.Drawable;
-import android.hardware.Camera;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.Display;
 import android.view.GestureDetector;
 import android.view.LayoutInflater;
@@ -22,7 +21,6 @@ import android.view.TextureView;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
-import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.view.animation.DecelerateInterpolator;
diff --git a/src/org/thoughtcrime/securesms/mediasend/FlipTransformation.java b/src/org/thoughtcrime/securesms/mediasend/FlipTransformation.java
index d443dfefc6..0c4749b338 100644
--- a/src/org/thoughtcrime/securesms/mediasend/FlipTransformation.java
+++ b/src/org/thoughtcrime/securesms/mediasend/FlipTransformation.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.mediasend;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation;
diff --git a/src/org/thoughtcrime/securesms/mediasend/Media.java b/src/org/thoughtcrime/securesms/mediasend/Media.java
index 3563d5ffb1..842d8371a3 100644
--- a/src/org/thoughtcrime/securesms/mediasend/Media.java
+++ b/src/org/thoughtcrime/securesms/mediasend/Media.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.mediasend;
 import android.net.Uri;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.whispersystems.libsignal.util.guava.Optional;
 
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaFolder.java b/src/org/thoughtcrime/securesms/mediasend/MediaFolder.java
index a6e3dd7e92..ab53c1204a 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaFolder.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaFolder.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.mediasend;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 /**
  * Represents a folder that's shown in {@link MediaPickerFolderFragment}.
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java b/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java
index 15189f3070..de7bb04607 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderAdapter.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.mediasend;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java
index 4ba7db24ba..d492a113d1 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaPickerFolderFragment.java
@@ -1,17 +1,17 @@
 package org.thoughtcrime.securesms.mediasend;
 
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Point;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java b/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java
index 6d56932487..07d92fae0b 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.mediasend;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -18,11 +18,8 @@ import org.thoughtcrime.securesms.util.StableIdGenerator;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
 
 public class MediaPickerItemAdapter extends RecyclerView.Adapter<MediaPickerItemAdapter.ItemViewHolder> {
 
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
index a6d4ac6660..25dec732d6 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
@@ -1,17 +1,17 @@
 package org.thoughtcrime.securesms.mediasend;
 
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Point;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java b/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java
index cf8834176f..d63bfbdb38 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java
@@ -5,14 +5,13 @@ import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.os.Environment;
 import android.provider.MediaStore.Images;
 import android.provider.MediaStore.Video;
 import android.provider.OpenableColumns;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 import android.util.Pair;
 
 import com.annimon.stream.Stream;
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
index 0bf78be56a..a2e0e4190d 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
@@ -1,14 +1,14 @@
 package org.thoughtcrime.securesms.mediasend;
 
 import android.Manifest;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 import android.view.View;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.AccelerateInterpolator;
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
index 818b93d6c8..c9b4020322 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.mediasend;
 
 import android.annotation.SuppressLint;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.PorterDuff;
@@ -9,14 +9,14 @@ import android.graphics.Rect;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.view.ViewPager;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.view.ContextThemeWrapper;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.viewpager.widget.ViewPager;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.view.ContextThemeWrapper;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.KeyEvent;
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java
index 31e718d121..4d6107044f 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendFragmentPagerAdapter.java
@@ -1,11 +1,11 @@
 package org.thoughtcrime.securesms.mediasend;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
 import android.view.View;
 import android.view.ViewGroup;
 
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendGifFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendGifFragment.java
index 30f4ad3503..fec59e0705 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendGifFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendGifFragment.java
@@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.mediasend;
 
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendPageFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendPageFragment.java
index aab97cd043..6de248489f 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendPageFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendPageFragment.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.mediasend;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.View;
 
 /**
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java
index 2db8c8468c..6f98363c57 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java
@@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.mediasend;
 
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
index 6dac4c66df..ac045b2cee 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
@@ -1,13 +1,13 @@
 package org.thoughtcrime.securesms.mediasend;
 
 import android.app.Application;
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.ViewModel;
-import android.arch.lifecycle.ViewModelProvider;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import com.annimon.stream.Stream;
diff --git a/src/org/thoughtcrime/securesms/mediasend/OrderEnforcer.java b/src/org/thoughtcrime/securesms/mediasend/OrderEnforcer.java
index 6851dd97a4..65974ac0c1 100644
--- a/src/org/thoughtcrime/securesms/mediasend/OrderEnforcer.java
+++ b/src/org/thoughtcrime/securesms/mediasend/OrderEnforcer.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.mediasend;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
index 9ce2e90786..5f13c13e6c 100644
--- a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
+++ b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
@@ -30,8 +30,8 @@ import android.os.AsyncTask;
 import android.provider.ContactsContract;
 import android.provider.MediaStore;
 import android.provider.OpenableColumns;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Pair;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java b/src/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java
index b033f70a47..e94e763fa7 100644
--- a/src/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java
+++ b/src/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.mms;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.DataSource;
diff --git a/src/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java b/src/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java
index d98c68c006..4dc3b3243e 100644
--- a/src/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java
+++ b/src/org/thoughtcrime/securesms/mms/AttachmentStreamUriLoader.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.mms;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.Options;
diff --git a/src/org/thoughtcrime/securesms/mms/AudioSlide.java b/src/org/thoughtcrime/securesms/mms/AudioSlide.java
index fb6e9a1eaa..546d3cae0b 100644
--- a/src/org/thoughtcrime/securesms/mms/AudioSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/AudioSlide.java
@@ -19,9 +19,9 @@ package org.thoughtcrime.securesms.mms;
 import android.content.Context;
 import android.content.res.Resources.Theme;
 import android.net.Uri;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import network.loki.messenger.R;
 import org.thoughtcrime.securesms.attachments.Attachment;
diff --git a/src/org/thoughtcrime/securesms/mms/CompatMmsConnection.java b/src/org/thoughtcrime/securesms/mms/CompatMmsConnection.java
index 9f648e80df..8302cae814 100644
--- a/src/org/thoughtcrime/securesms/mms/CompatMmsConnection.java
+++ b/src/org/thoughtcrime/securesms/mms/CompatMmsConnection.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.mms;
 import android.content.Context;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import org.thoughtcrime.securesms.logging.Log;
 
 import com.google.android.mms.pdu_alt.PduHeaders;
diff --git a/src/org/thoughtcrime/securesms/mms/DecryptableStreamUriLoader.java b/src/org/thoughtcrime/securesms/mms/DecryptableStreamUriLoader.java
index 37883c9f50..054de985db 100644
--- a/src/org/thoughtcrime/securesms/mms/DecryptableStreamUriLoader.java
+++ b/src/org/thoughtcrime/securesms/mms/DecryptableStreamUriLoader.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.mms;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.bumptech.glide.load.Key;
 import com.bumptech.glide.load.Options;
diff --git a/src/org/thoughtcrime/securesms/mms/DocumentSlide.java b/src/org/thoughtcrime/securesms/mms/DocumentSlide.java
index 33e6e6fb4d..24d6ceb133 100644
--- a/src/org/thoughtcrime/securesms/mms/DocumentSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/DocumentSlide.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.mms;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.util.StorageUtil;
diff --git a/src/org/thoughtcrime/securesms/mms/GifSlide.java b/src/org/thoughtcrime/securesms/mms/GifSlide.java
index 7253e28bcd..a0f1caaaee 100644
--- a/src/org/thoughtcrime/securesms/mms/GifSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/GifSlide.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.mms;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.util.MediaUtil;
diff --git a/src/org/thoughtcrime/securesms/mms/ImageSlide.java b/src/org/thoughtcrime/securesms/mms/ImageSlide.java
index 412ef1d64b..0502171c21 100644
--- a/src/org/thoughtcrime/securesms/mms/ImageSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/ImageSlide.java
@@ -19,9 +19,9 @@ package org.thoughtcrime.securesms.mms;
 import android.content.Context;
 import android.content.res.Resources.Theme;
 import android.net.Uri;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import network.loki.messenger.R;
 import org.thoughtcrime.securesms.attachments.Attachment;
diff --git a/src/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java b/src/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java
index 3ba8f3b369..89e91902c9 100644
--- a/src/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java
+++ b/src/org/thoughtcrime/securesms/mms/IncomingLegacyMmsConnection.java
@@ -18,8 +18,8 @@ package org.thoughtcrime.securesms.mms;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import org.thoughtcrime.securesms.logging.Log;
 
 import com.google.android.mms.InvalidHeaderValueException;
diff --git a/src/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java b/src/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java
index f86b52e897..a3c58e5513 100644
--- a/src/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java
+++ b/src/org/thoughtcrime/securesms/mms/IncomingLollipopMmsConnection.java
@@ -21,8 +21,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.telephony.SmsManager;
 import org.thoughtcrime.securesms.logging.Log;
 
diff --git a/src/org/thoughtcrime/securesms/mms/IncomingMmsConnection.java b/src/org/thoughtcrime/securesms/mms/IncomingMmsConnection.java
index 96527e5162..44827068fd 100644
--- a/src/org/thoughtcrime/securesms/mms/IncomingMmsConnection.java
+++ b/src/org/thoughtcrime/securesms/mms/IncomingMmsConnection.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.mms;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.google.android.mms.pdu_alt.RetrieveConf;
 
diff --git a/src/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java b/src/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java
index 3acf87d316..2b8fb34268 100644
--- a/src/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java
+++ b/src/org/thoughtcrime/securesms/mms/LegacyMmsConnection.java
@@ -21,8 +21,8 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
diff --git a/src/org/thoughtcrime/securesms/mms/LocationSlide.java b/src/org/thoughtcrime/securesms/mms/LocationSlide.java
index e5f613d2f9..2c89e0ec95 100644
--- a/src/org/thoughtcrime/securesms/mms/LocationSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/LocationSlide.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.mms;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.components.location.SignalPlace;
 import org.whispersystems.libsignal.util.guava.Optional;
diff --git a/src/org/thoughtcrime/securesms/mms/MediaConstraints.java b/src/org/thoughtcrime/securesms/mms/MediaConstraints.java
index edf0cb01ca..37ffb87e83 100644
--- a/src/org/thoughtcrime/securesms/mms/MediaConstraints.java
+++ b/src/org/thoughtcrime/securesms/mms/MediaConstraints.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.mms;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import org.thoughtcrime.securesms.logging.Log;
 import android.util.Pair;
 
diff --git a/src/org/thoughtcrime/securesms/mms/MmsConfigManager.java b/src/org/thoughtcrime/securesms/mms/MmsConfigManager.java
index c0af332512..d356bf8f92 100644
--- a/src/org/thoughtcrime/securesms/mms/MmsConfigManager.java
+++ b/src/org/thoughtcrime/securesms/mms/MmsConfigManager.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.mms;
 
 import android.content.Context;
 import android.content.res.Configuration;
-import android.support.annotation.NonNull;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
 
 import com.android.mms.service_alt.MmsConfig;
 
diff --git a/src/org/thoughtcrime/securesms/mms/MmsSlide.java b/src/org/thoughtcrime/securesms/mms/MmsSlide.java
index bed6a6741d..08593a206f 100644
--- a/src/org/thoughtcrime/securesms/mms/MmsSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/MmsSlide.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.mms;
 
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
 
diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java b/src/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java
index 3391316904..27ad272116 100644
--- a/src/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java
+++ b/src/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.mms;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.contactshare.Contact;
diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java b/src/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java
index 1412daeddf..705616243c 100644
--- a/src/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java
+++ b/src/org/thoughtcrime/securesms/mms/OutgoingLegacyMmsConnection.java
@@ -20,8 +20,8 @@ import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import org.thoughtcrime.securesms.logging.Log;
 
 import com.google.android.mms.pdu_alt.PduParser;
diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java b/src/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java
index 89a2f51fd6..64a9ecf1a4 100644
--- a/src/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java
+++ b/src/org/thoughtcrime/securesms/mms/OutgoingLollipopMmsConnection.java
@@ -22,8 +22,8 @@ import android.content.Intent;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.telephony.SmsManager;
 import org.thoughtcrime.securesms.logging.Log;
 
diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java b/src/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java
index 091c2e81fc..6a73726448 100644
--- a/src/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java
+++ b/src/org/thoughtcrime/securesms/mms/OutgoingMediaMessage.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.mms;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingMmsConnection.java b/src/org/thoughtcrime/securesms/mms/OutgoingMmsConnection.java
index 4e1fce4aca..6f4b0cea89 100644
--- a/src/org/thoughtcrime/securesms/mms/OutgoingMmsConnection.java
+++ b/src/org/thoughtcrime/securesms/mms/OutgoingMmsConnection.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.mms;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.google.android.mms.pdu_alt.SendConf;
 
diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingSecureMediaMessage.java b/src/org/thoughtcrime/securesms/mms/OutgoingSecureMediaMessage.java
index 434fa92171..8332c06575 100644
--- a/src/org/thoughtcrime/securesms/mms/OutgoingSecureMediaMessage.java
+++ b/src/org/thoughtcrime/securesms/mms/OutgoingSecureMediaMessage.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.mms;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.contactshare.Contact;
diff --git a/src/org/thoughtcrime/securesms/mms/PartAuthority.java b/src/org/thoughtcrime/securesms/mms/PartAuthority.java
index f6a0b71a9b..c16bb44d94 100644
--- a/src/org/thoughtcrime/securesms/mms/PartAuthority.java
+++ b/src/org/thoughtcrime/securesms/mms/PartAuthority.java
@@ -4,8 +4,8 @@ import android.content.ContentUris;
 import android.content.Context;
 import android.content.UriMatcher;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.AttachmentId;
diff --git a/src/org/thoughtcrime/securesms/mms/QuoteId.java b/src/org/thoughtcrime/securesms/mms/QuoteId.java
index b5158e172d..929c527600 100644
--- a/src/org/thoughtcrime/securesms/mms/QuoteId.java
+++ b/src/org/thoughtcrime/securesms/mms/QuoteId.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.mms;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.json.JSONException;
 import org.json.JSONObject;
diff --git a/src/org/thoughtcrime/securesms/mms/QuoteModel.java b/src/org/thoughtcrime/securesms/mms/QuoteModel.java
index 43eba6f39a..953f0a5c0c 100644
--- a/src/org/thoughtcrime/securesms/mms/QuoteModel.java
+++ b/src/org/thoughtcrime/securesms/mms/QuoteModel.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.mms;
 
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.database.Address;
diff --git a/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java b/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java
index 808b54c93e..11379f54c3 100644
--- a/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java
+++ b/src/org/thoughtcrime/securesms/mms/SignalGlideModule.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.mms;
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.Log;
 
 import com.bumptech.glide.Glide;
diff --git a/src/org/thoughtcrime/securesms/mms/Slide.java b/src/org/thoughtcrime/securesms/mms/Slide.java
index 58b6934618..2c5dc1cb16 100644
--- a/src/org/thoughtcrime/securesms/mms/Slide.java
+++ b/src/org/thoughtcrime/securesms/mms/Slide.java
@@ -19,9 +19,9 @@ package org.thoughtcrime.securesms.mms;
 import android.content.Context;
 import android.content.res.Resources.Theme;
 import android.net.Uri;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.attachments.UriAttachment;
diff --git a/src/org/thoughtcrime/securesms/mms/SlideDeck.java b/src/org/thoughtcrime/securesms/mms/SlideDeck.java
index d39c4ec913..8d654df472 100644
--- a/src/org/thoughtcrime/securesms/mms/SlideDeck.java
+++ b/src/org/thoughtcrime/securesms/mms/SlideDeck.java
@@ -17,8 +17,8 @@
 package org.thoughtcrime.securesms.mms;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.annimon.stream.Stream;
 
diff --git a/src/org/thoughtcrime/securesms/mms/StickerSlide.java b/src/org/thoughtcrime/securesms/mms/StickerSlide.java
index ed49c79f0a..75baee0f35 100644
--- a/src/org/thoughtcrime/securesms/mms/StickerSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/StickerSlide.java
@@ -3,9 +3,9 @@ package org.thoughtcrime.securesms.mms;
 import android.content.Context;
 import android.content.res.Resources.Theme;
 import android.net.Uri;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.stickers.StickerLocator;
diff --git a/src/org/thoughtcrime/securesms/mms/TextSlide.java b/src/org/thoughtcrime/securesms/mms/TextSlide.java
index d0b75ea0e5..d3612143e9 100644
--- a/src/org/thoughtcrime/securesms/mms/TextSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/TextSlide.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.mms;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.attachments.Attachment;
 import org.thoughtcrime.securesms.util.MediaUtil;
diff --git a/src/org/thoughtcrime/securesms/mms/VideoSlide.java b/src/org/thoughtcrime/securesms/mms/VideoSlide.java
index f290f2bd71..3ab2375f7c 100644
--- a/src/org/thoughtcrime/securesms/mms/VideoSlide.java
+++ b/src/org/thoughtcrime/securesms/mms/VideoSlide.java
@@ -19,9 +19,9 @@ package org.thoughtcrime.securesms.mms;
 import android.content.Context;
 import android.content.res.Resources.Theme;
 import android.net.Uri;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import network.loki.messenger.R;
 import org.thoughtcrime.securesms.attachments.Attachment;
diff --git a/src/org/thoughtcrime/securesms/net/CallRequestController.java b/src/org/thoughtcrime/securesms/net/CallRequestController.java
index e3a3e1c665..034fc3189c 100644
--- a/src/org/thoughtcrime/securesms/net/CallRequestController.java
+++ b/src/org/thoughtcrime/securesms/net/CallRequestController.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.net;
 
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
 
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.libsignal.util.guava.Optional;
diff --git a/src/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java b/src/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java
index bf7946f908..acffd4156e 100644
--- a/src/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java
+++ b/src/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.net;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import com.annimon.stream.Stream;
diff --git a/src/org/thoughtcrime/securesms/net/CompositeRequestController.java b/src/org/thoughtcrime/securesms/net/CompositeRequestController.java
index b6aec71a0d..4c2e2fc49b 100644
--- a/src/org/thoughtcrime/securesms/net/CompositeRequestController.java
+++ b/src/org/thoughtcrime/securesms/net/CompositeRequestController.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.net;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 
diff --git a/src/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java b/src/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java
index 51d32ba2ae..992500b8c1 100644
--- a/src/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java
+++ b/src/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.net;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil;
 import org.thoughtcrime.securesms.logging.Log;
diff --git a/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java
index a1670a7827..32a14ccc7a 100644
--- a/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java
+++ b/src/org/thoughtcrime/securesms/notifications/AbstractNotificationBuilder.java
@@ -4,9 +4,9 @@ import android.app.Notification;
 import android.content.Context;
 import android.graphics.Color;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
 import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 
diff --git a/src/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java b/src/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java
index c77e2753b7..18383ebf9c 100644
--- a/src/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java
+++ b/src/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java
@@ -22,7 +22,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.core.app.NotificationManagerCompat;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
diff --git a/src/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java b/src/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java
index d55df50a33..b7af08227f 100644
--- a/src/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java
+++ b/src/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java
@@ -23,7 +23,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.app.RemoteInput;
+import androidx.core.app.RemoteInput;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.database.Address;
diff --git a/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
index 450607e14a..6945c05027 100644
--- a/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
+++ b/src/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java
@@ -33,9 +33,9 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.service.notification.StatusBarNotification;
-import android.support.annotation.NonNull;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.annotation.NonNull;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
 import android.text.TextUtils;
 
 import org.thoughtcrime.securesms.ApplicationContext;
@@ -61,7 +61,6 @@ import org.thoughtcrime.securesms.util.SpanUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.webrtc.CallNotificationBuilder;
 import org.whispersystems.signalservice.internal.util.Util;
-import org.whispersystems.signalservice.loki.protocol.mentions.Mention;
 
 import java.util.HashSet;
 import java.util.List;
diff --git a/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java b/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
index 8f556026e1..141a8b8195 100644
--- a/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
+++ b/src/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
@@ -5,8 +5,8 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.v4.app.NotificationManagerCompat;
+import androidx.annotation.NonNull;
+import androidx.core.app.NotificationManagerCompat;
 
 import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;
diff --git a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
index 16f4343bea..7de28dfdef 100644
--- a/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
+++ b/src/org/thoughtcrime/securesms/notifications/MessageNotifier.java
@@ -14,6 +14,6 @@ public interface MessageNotifier {
   void updateNotification(@NonNull Context context);
   void updateNotification(@NonNull Context context, long threadId);
   void updateNotification(@NonNull Context context, long threadId, boolean signal);
-  void updateNotification(@android.support.annotation.NonNull Context context, boolean signal, int reminderCount);
+  void updateNotification(@androidx.annotation.NonNull Context context, boolean signal, int reminderCount);
   void clearReminder(@NonNull Context context);
 }
diff --git a/src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
index be91fe34b5..11e57af368 100644
--- a/src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
+++ b/src/org/thoughtcrime/securesms/notifications/MultipleRecipientNotificationBuilder.java
@@ -4,9 +4,9 @@ import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
 import android.text.SpannableStringBuilder;
 
 import org.thoughtcrime.securesms.loki.activities.HomeActivity;
diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationChannels.java b/src/org/thoughtcrime/securesms/notifications/NotificationChannels.java
index 7343e70ac8..748395b151 100644
--- a/src/org/thoughtcrime/securesms/notifications/NotificationChannels.java
+++ b/src/org/thoughtcrime/securesms/notifications/NotificationChannels.java
@@ -12,9 +12,9 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.provider.Settings;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 import android.text.TextUtils;
 
 import com.annimon.stream.Collectors;
diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationItem.java b/src/org/thoughtcrime/securesms/notifications/NotificationItem.java
index 3423b33266..7ffa4d1852 100644
--- a/src/org/thoughtcrime/securesms/notifications/NotificationItem.java
+++ b/src/org/thoughtcrime/securesms/notifications/NotificationItem.java
@@ -4,9 +4,9 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.TaskStackBuilder;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.TaskStackBuilder;
 
 import org.thoughtcrime.securesms.conversation.ConversationActivity;
 import org.thoughtcrime.securesms.mms.SlideDeck;
diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationState.java b/src/org/thoughtcrime/securesms/notifications/NotificationState.java
index 32b5489e35..6200ff0382 100644
--- a/src/org/thoughtcrime/securesms/notifications/NotificationState.java
+++ b/src/org/thoughtcrime/securesms/notifications/NotificationState.java
@@ -4,8 +4,8 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.conversation.ConversationActivity;
 import org.thoughtcrime.securesms.conversation.ConversationPopupActivity;
diff --git a/src/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java b/src/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java
index ee2601e3ff..1050b3a2f8 100644
--- a/src/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java
+++ b/src/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java
@@ -99,7 +99,7 @@ public class OptimizedMessageNotifier implements MessageNotifier {
   }
 
   @Override
-  public void updateNotification(@android.support.annotation.NonNull Context context, boolean signal, int reminderCount) {
+  public void updateNotification(@androidx.annotation.NonNull Context context, boolean signal, int reminderCount) {
     Poller lokiPoller = ApplicationContext.getInstance(context).poller;
     PublicChatManager publicChatManager = ApplicationContext.getInstance(context).publicChatManager;
     boolean isCaughtUp = true;
diff --git a/src/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java
index 50bf8a3c20..e4605df2a4 100644
--- a/src/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java
+++ b/src/org/thoughtcrime/securesms/notifications/PendingMessageNotificationBuilder.java
@@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.notifications;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 
 import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.loki.activities.HomeActivity;
diff --git a/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java b/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
index 84ff4c1664..ca92ecc06b 100644
--- a/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
+++ b/src/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
@@ -23,7 +23,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.v4.app.RemoteInput;
+import androidx.core.app.RemoteInput;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.database.Address;
@@ -33,7 +33,6 @@ import org.thoughtcrime.securesms.mms.OutgoingMediaMessage;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.sms.OutgoingEncryptedMessage;
-import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
 
 import java.util.Collections;
 import java.util.LinkedList;
diff --git a/src/org/thoughtcrime/securesms/notifications/ReplyMethod.java b/src/org/thoughtcrime/securesms/notifications/ReplyMethod.java
index e744b5f58b..f9e80a34bd 100644
--- a/src/org/thoughtcrime/securesms/notifications/ReplyMethod.java
+++ b/src/org/thoughtcrime/securesms/notifications/ReplyMethod.java
@@ -1,11 +1,9 @@
 package org.thoughtcrime.securesms.notifications;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
-import org.thoughtcrime.securesms.database.RecipientDatabase;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 public enum ReplyMethod {
 
diff --git a/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java b/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
index 0476cdff2f..bc5f695a35 100644
--- a/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
+++ b/src/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java
@@ -14,12 +14,12 @@ import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationCompat.Action;
-import android.support.v4.app.RemoteInput;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationCompat.Action;
+import androidx.core.app.RemoteInput;
 import android.text.SpannableStringBuilder;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
diff --git a/src/org/thoughtcrime/securesms/permissions/Permissions.java b/src/org/thoughtcrime/securesms/permissions/Permissions.java
index 96e479cd45..70e2da80fb 100644
--- a/src/org/thoughtcrime/securesms/permissions/Permissions.java
+++ b/src/org/thoughtcrime/securesms/permissions/Permissions.java
@@ -9,11 +9,11 @@ import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.provider.Settings;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.Fragment;
+import androidx.core.content.ContextCompat;
 import android.util.DisplayMetrics;
 import android.view.Display;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/permissions/PermissionsRequest.java b/src/org/thoughtcrime/securesms/permissions/PermissionsRequest.java
index 4837911005..03942adfa5 100644
--- a/src/org/thoughtcrime/securesms/permissions/PermissionsRequest.java
+++ b/src/org/thoughtcrime/securesms/permissions/PermissionsRequest.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.permissions;
 
 
 import android.content.pm.PackageManager;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.annimon.stream.function.Consumer;
 
diff --git a/src/org/thoughtcrime/securesms/permissions/RationaleDialog.java b/src/org/thoughtcrime/securesms/permissions/RationaleDialog.java
index 730577e639..ccacd0873f 100644
--- a/src/org/thoughtcrime/securesms/permissions/RationaleDialog.java
+++ b/src/org/thoughtcrime/securesms/permissions/RationaleDialog.java
@@ -4,8 +4,8 @@ package org.thoughtcrime.securesms.permissions;
 import android.app.AlertDialog;
 import android.content.Context;
 import android.graphics.Color;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
index 094f1fa12e..f50efdff58 100644
--- a/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/AdvancedPreferenceFragment.java
@@ -9,11 +9,11 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.ContactsContract;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.Preference;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.Preference;
 import android.widget.Toast;
 
 import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
diff --git a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
index 5f24d30be8..6bbcd78577 100644
--- a/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java
@@ -5,10 +5,10 @@ import android.app.KeyguardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.CheckBoxPreference;
-import android.support.v7.preference.Preference;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.CheckBoxPreference;
+import androidx.preference.Preference;
 import android.widget.Toast;
 
 import org.thoughtcrime.securesms.ApplicationContext;
diff --git a/src/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java
index 44ccb61111..8266b86abc 100644
--- a/src/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/AppearancePreferenceFragment.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.preferences;
 
 import android.content.Context;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.preference.ListPreference;
+import androidx.annotation.Nullable;
+import androidx.preference.ListPreference;
 
 import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
 import network.loki.messenger.R;
diff --git a/src/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java b/src/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java
index b63cd0d6e5..6ae0518b9b 100644
--- a/src/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java
+++ b/src/org/thoughtcrime/securesms/preferences/BlockedContactListItem.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.preferences;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
diff --git a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
index 3b6ea99151..877da0506d 100644
--- a/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java
@@ -5,11 +5,11 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
-import android.support.v7.preference.EditTextPreference;
-import android.support.v7.preference.Preference;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.EditTextPreference;
+import androidx.preference.Preference;
 import android.text.TextUtils;
 
 import org.greenrobot.eventbus.EventBus;
diff --git a/src/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java
index 7b17a4cf20..6b097a0d56 100644
--- a/src/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java
@@ -3,15 +3,15 @@ package org.thoughtcrime.securesms.preferences;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceCategory;
-import android.support.v7.preference.PreferenceFragmentCompat;
-import android.support.v7.preference.PreferenceGroupAdapter;
-import android.support.v7.preference.PreferenceScreen;
-import android.support.v7.preference.PreferenceViewHolder;
-import android.support.v7.widget.RecyclerView;
+import androidx.fragment.app.DialogFragment;
+import androidx.core.view.ViewCompat;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceGroupAdapter;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.PreferenceViewHolder;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.view.ViewGroup;
 
diff --git a/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java
index 2d155dd32e..4b330459e6 100644
--- a/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.preferences;
 
 
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
 
 import network.loki.messenger.R;
 
diff --git a/src/org/thoughtcrime/securesms/preferences/MmsPreferencesActivity.java b/src/org/thoughtcrime/securesms/preferences/MmsPreferencesActivity.java
index 469f29e2a7..d0e4d944e4 100644
--- a/src/org/thoughtcrime/securesms/preferences/MmsPreferencesActivity.java
+++ b/src/org/thoughtcrime/securesms/preferences/MmsPreferencesActivity.java
@@ -17,9 +17,9 @@
 package org.thoughtcrime.securesms.preferences;
 
 import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
 import android.view.MenuItem;
 
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
diff --git a/src/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java b/src/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java
index 25e76dc8a5..70a2c5b3ac 100644
--- a/src/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/MmsPreferencesFragment.java
@@ -19,7 +19,7 @@ package org.thoughtcrime.securesms.preferences;
 import android.content.Context;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
 import network.loki.messenger.R;
diff --git a/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
index b3ddb9cd1b..179d3c35f2 100644
--- a/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/NotificationsPreferenceFragment.java
@@ -9,14 +9,13 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.support.annotation.Nullable;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
+import androidx.annotation.Nullable;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
 import android.text.TextUtils;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.components.SwitchPreferenceCompat;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
diff --git a/src/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java b/src/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java
index d01ec1389f..3681c6e7ec 100644
--- a/src/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java
+++ b/src/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java
@@ -2,18 +2,17 @@ package org.thoughtcrime.securesms.preferences;
 
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.provider.Telephony;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
 
 import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
 import network.loki.messenger.R;
diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java b/src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java
index 9754b7c1f6..1cccf1d524 100644
--- a/src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java
+++ b/src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreference.java
@@ -5,10 +5,10 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.res.TypedArrayUtils;
-import android.support.v7.preference.DialogPreference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.res.TypedArrayUtils;
+import androidx.preference.DialogPreference;
+import androidx.preference.PreferenceViewHolder;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.widget.ImageView;
diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreferenceDialogFragmentCompat.java b/src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreferenceDialogFragmentCompat.java
index c781c53cdf..964f439ba1 100644
--- a/src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreferenceDialogFragmentCompat.java
+++ b/src/org/thoughtcrime/securesms/preferences/widgets/ColorPickerPreferenceDialogFragmentCompat.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.preferences.widgets;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.preference.PreferenceDialogFragmentCompat;
+import androidx.annotation.NonNull;
+import androidx.preference.PreferenceDialogFragmentCompat;
 
 import com.takisoft.colorpicker.ColorPickerDialog;
 import com.takisoft.colorpicker.OnColorSelectedListener;
diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java b/src/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java
index 7ac8abfb81..80dd7a3791 100644
--- a/src/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java
+++ b/src/org/thoughtcrime/securesms/preferences/widgets/ContactPreference.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.preferences.widgets;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/LEDColorListPreference.java b/src/org/thoughtcrime/securesms/preferences/widgets/LEDColorListPreference.java
index 31f71ff82b..075df3a026 100644
--- a/src/org/thoughtcrime/securesms/preferences/widgets/LEDColorListPreference.java
+++ b/src/org/thoughtcrime/securesms/preferences/widgets/LEDColorListPreference.java
@@ -18,9 +18,9 @@ package org.thoughtcrime.securesms.preferences.widgets;
 
 import android.content.Context;
 import android.graphics.drawable.GradientDrawable;
-import android.support.annotation.NonNull;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.annotation.NonNull;
+import androidx.preference.ListPreference;
+import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.widget.ImageView;
 
diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java b/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java
index 7edfb89df4..21ad43fdd4 100644
--- a/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java
+++ b/src/org/thoughtcrime/securesms/preferences/widgets/ProfilePreference.java
@@ -7,9 +7,9 @@ import android.content.Context;
 import android.graphics.Outline;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.annotation.RequiresApi;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/ProgressPreference.java b/src/org/thoughtcrime/securesms/preferences/widgets/ProgressPreference.java
index e8491e0622..52a88c5664 100644
--- a/src/org/thoughtcrime/securesms/preferences/widgets/ProgressPreference.java
+++ b/src/org/thoughtcrime/securesms/preferences/widgets/ProgressPreference.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.preferences.widgets;
 
 
 import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.TextView;
diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/SignalListPreference.java b/src/org/thoughtcrime/securesms/preferences/widgets/SignalListPreference.java
index ebc5e2aebd..d8e90db156 100644
--- a/src/org/thoughtcrime/securesms/preferences/widgets/SignalListPreference.java
+++ b/src/org/thoughtcrime/securesms/preferences/widgets/SignalListPreference.java
@@ -3,17 +3,14 @@ package org.thoughtcrime.securesms.preferences.widgets;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.support.v7.preference.ListPreference;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.annotation.RequiresApi;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
-import android.util.TypedValue;
-import android.view.View;
 import android.widget.TextView;
 
 import network.loki.messenger.R;
-import org.thoughtcrime.securesms.util.ViewUtil;
 
 public class SignalListPreference extends ListPreference {
 
diff --git a/src/org/thoughtcrime/securesms/preferences/widgets/SignalPreference.java b/src/org/thoughtcrime/securesms/preferences/widgets/SignalPreference.java
index c7d30b2cf6..90635d6d5b 100644
--- a/src/org/thoughtcrime/securesms/preferences/widgets/SignalPreference.java
+++ b/src/org/thoughtcrime/securesms/preferences/widgets/SignalPreference.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.preferences.widgets;
 
 
 import android.content.Context;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceViewHolder;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
 import android.util.AttributeSet;
 import android.widget.TextView;
 
diff --git a/src/org/thoughtcrime/securesms/profiles/AvatarHelper.java b/src/org/thoughtcrime/securesms/profiles/AvatarHelper.java
index 8ff17b3518..572ae4ab6d 100644
--- a/src/org/thoughtcrime/securesms/profiles/AvatarHelper.java
+++ b/src/org/thoughtcrime/securesms/profiles/AvatarHelper.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.profiles;
 
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.annimon.stream.Stream;
 
diff --git a/src/org/thoughtcrime/securesms/profiles/GroupShareProfileView.java b/src/org/thoughtcrime/securesms/profiles/GroupShareProfileView.java
index ac8bf899ff..c403aef634 100644
--- a/src/org/thoughtcrime/securesms/profiles/GroupShareProfileView.java
+++ b/src/org/thoughtcrime/securesms/profiles/GroupShareProfileView.java
@@ -3,12 +3,12 @@ package org.thoughtcrime.securesms.profiles;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.AttrRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.StyleRes;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.StyleRes;
+import androidx.appcompat.app.AlertDialog;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.FrameLayout;
diff --git a/src/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java b/src/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java
index 723034ed4b..b75012e246 100644
--- a/src/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java
+++ b/src/org/thoughtcrime/securesms/profiles/SystemProfileUtil.java
@@ -8,10 +8,9 @@ import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.os.Build;
 import android.provider.ContactsContract;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 import org.thoughtcrime.securesms.logging.Log;
 
diff --git a/src/org/thoughtcrime/securesms/profiles/UnknownSenderView.java b/src/org/thoughtcrime/securesms/profiles/UnknownSenderView.java
index 8652141127..d3f2a57bf8 100644
--- a/src/org/thoughtcrime/securesms/profiles/UnknownSenderView.java
+++ b/src/org/thoughtcrime/securesms/profiles/UnknownSenderView.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.profiles;
 
 import android.content.Context;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import android.view.View;
 import android.widget.FrameLayout;
 
diff --git a/src/org/thoughtcrime/securesms/providers/BlobProvider.java b/src/org/thoughtcrime/securesms/providers/BlobProvider.java
index b3d9e374f4..37e130a588 100644
--- a/src/org/thoughtcrime/securesms/providers/BlobProvider.java
+++ b/src/org/thoughtcrime/securesms/providers/BlobProvider.java
@@ -4,10 +4,10 @@ import android.app.Application;
 import android.content.Context;
 import android.content.UriMatcher;
 import android.net.Uri;
-import android.support.annotation.IntRange;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.IntRange;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 
 import org.thoughtcrime.securesms.crypto.AttachmentSecret;
 import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider;
diff --git a/src/org/thoughtcrime/securesms/providers/DeprecatedPersistentBlobProvider.java b/src/org/thoughtcrime/securesms/providers/DeprecatedPersistentBlobProvider.java
index 178dc2a4b6..07ea7bba46 100644
--- a/src/org/thoughtcrime/securesms/providers/DeprecatedPersistentBlobProvider.java
+++ b/src/org/thoughtcrime/securesms/providers/DeprecatedPersistentBlobProvider.java
@@ -4,8 +4,8 @@ import android.content.ContentUris;
 import android.content.Context;
 import android.content.UriMatcher;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.webkit.MimeTypeMap;
 
 import org.thoughtcrime.securesms.crypto.AttachmentSecret;
diff --git a/src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java b/src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java
index 03c603e326..92f6ade1b6 100644
--- a/src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java
+++ b/src/org/thoughtcrime/securesms/providers/MmsBodyProvider.java
@@ -24,7 +24,7 @@ import android.content.UriMatcher;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.logging.Log;
 
diff --git a/src/org/thoughtcrime/securesms/providers/PartProvider.java b/src/org/thoughtcrime/securesms/providers/PartProvider.java
index 7b50c5493f..b9a10d0e28 100644
--- a/src/org/thoughtcrime/securesms/providers/PartProvider.java
+++ b/src/org/thoughtcrime/securesms/providers/PartProvider.java
@@ -26,7 +26,7 @@ import android.net.Uri;
 import android.os.MemoryFile;
 import android.os.ParcelFileDescriptor;
 import android.provider.OpenableColumns;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import org.thoughtcrime.securesms.logging.Log;
 
 import org.thoughtcrime.securesms.attachments.AttachmentId;
diff --git a/src/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java b/src/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java
index 97fb2e0ecb..150d12cfa8 100644
--- a/src/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java
+++ b/src/org/thoughtcrime/securesms/push/SignalServiceNetworkAccess.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.push;
 
 
 import android.content.Context;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.signalservice.api.push.TrustStore;
diff --git a/src/org/thoughtcrime/securesms/qr/QrCode.java b/src/org/thoughtcrime/securesms/qr/QrCode.java
index 65574aba20..ed0ccee8d3 100644
--- a/src/org/thoughtcrime/securesms/qr/QrCode.java
+++ b/src/org/thoughtcrime/securesms/qr/QrCode.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.qr;
 
 import android.graphics.Bitmap;
 import android.graphics.Color;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.EncodeHintType;
diff --git a/src/org/thoughtcrime/securesms/qr/ScanningThread.java b/src/org/thoughtcrime/securesms/qr/ScanningThread.java
index 00dde4693a..4fddaf871f 100644
--- a/src/org/thoughtcrime/securesms/qr/ScanningThread.java
+++ b/src/org/thoughtcrime/securesms/qr/ScanningThread.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.qr;
 
 import android.content.res.Configuration;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.google.zxing.BinaryBitmap;
 import com.google.zxing.ChecksumException;
diff --git a/src/org/thoughtcrime/securesms/recipients/Recipient.java b/src/org/thoughtcrime/securesms/recipients/Recipient.java
index ca78ea9e84..37fb87eaf0 100644
--- a/src/org/thoughtcrime/securesms/recipients/Recipient.java
+++ b/src/org/thoughtcrime/securesms/recipients/Recipient.java
@@ -20,8 +20,8 @@ package org.thoughtcrime.securesms.recipients;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.annimon.stream.function.Consumer;
 
diff --git a/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java b/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
index 8353a97766..c1f80d8043 100644
--- a/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
+++ b/src/org/thoughtcrime/securesms/recipients/RecipientProvider.java
@@ -18,8 +18,8 @@ package org.thoughtcrime.securesms.recipients;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import network.loki.messenger.R;
diff --git a/src/org/thoughtcrime/securesms/registration/CaptchaActivity.java b/src/org/thoughtcrime/securesms/registration/CaptchaActivity.java
index 79fb6d1fa3..cb8b15d941 100644
--- a/src/org/thoughtcrime/securesms/registration/CaptchaActivity.java
+++ b/src/org/thoughtcrime/securesms/registration/CaptchaActivity.java
@@ -4,20 +4,8 @@ import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Bitmap;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.text.TextUtils;
-import android.webkit.ValueCallback;
-import android.webkit.WebChromeClient;
-import android.webkit.WebResourceRequest;
-import android.webkit.WebResourceResponse;
-import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
diff --git a/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java b/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java
index d0ce12f074..3f56db3525 100644
--- a/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java
+++ b/src/org/thoughtcrime/securesms/registration/WelcomeActivity.java
@@ -5,7 +5,7 @@ import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.BaseActionBarActivity;
 import org.thoughtcrime.securesms.permissions.Permissions;
diff --git a/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java b/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
index 7db935c521..ef369bbb13 100644
--- a/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
+++ b/src/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
@@ -4,9 +4,9 @@ import android.content.Intent;
 import android.graphics.Paint;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java b/src/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java
index 6f5ee52bb3..a40e0d72a6 100644
--- a/src/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java
+++ b/src/org/thoughtcrime/securesms/scribbles/ImageEditorHud.java
@@ -2,10 +2,10 @@ package org.thoughtcrime.securesms.scribbles;
 
 import android.content.Context;
 import android.graphics.Color;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ImageView;
diff --git a/src/org/thoughtcrime/securesms/scribbles/StickerLoader.java b/src/org/thoughtcrime/securesms/scribbles/StickerLoader.java
index d1dd09c56f..f3c6c4fdc7 100644
--- a/src/org/thoughtcrime/securesms/scribbles/StickerLoader.java
+++ b/src/org/thoughtcrime/securesms/scribbles/StickerLoader.java
@@ -18,7 +18,7 @@ package org.thoughtcrime.securesms.scribbles;
 
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import org.thoughtcrime.securesms.logging.Log;
 
 import org.thoughtcrime.securesms.util.AsyncLoader;
diff --git a/src/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java b/src/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java
index 53a1a1eea8..fd2937a5ac 100644
--- a/src/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java
+++ b/src/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java
@@ -18,13 +18,13 @@ package org.thoughtcrime.securesms.scribbles;
 
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.TabLayout;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v4.view.ViewPager;
+import androidx.annotation.Nullable;
+import com.google.android.material.tabs.TabLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentActivity;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.viewpager.widget.ViewPager;
 import android.view.MenuItem;
 
 import network.loki.messenger.R;
diff --git a/src/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java b/src/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java
index 4fb891c81e..4a1ee2453d 100644
--- a/src/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java
+++ b/src/org/thoughtcrime/securesms/scribbles/StickerSelectFragment.java
@@ -19,13 +19,13 @@ package org.thoughtcrime.securesms.scribbles;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.loader.app.LoaderManager;
+import androidx.loader.content.Loader;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java b/src/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java
index cc6e9778ff..598975c18e 100644
--- a/src/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java
+++ b/src/org/thoughtcrime/securesms/scribbles/UriGlideRenderer.java
@@ -8,8 +8,8 @@ import android.graphics.Point;
 import android.graphics.RectF;
 import android.net.Uri;
 import android.os.Parcel;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.target.SimpleTarget;
diff --git a/src/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java b/src/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java
index 105c0e2d50..651d2d8b13 100644
--- a/src/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java
+++ b/src/org/thoughtcrime/securesms/scribbles/widget/ColorPaletteAdapter.java
@@ -1,9 +1,9 @@
 package org.thoughtcrime.securesms.scribbles.widget;
 
 import android.graphics.PorterDuff;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/search/SearchFragment.java b/src/org/thoughtcrime/securesms/search/SearchFragment.java
index ead6cd6c66..71a3665ccb 100644
--- a/src/org/thoughtcrime/securesms/search/SearchFragment.java
+++ b/src/org/thoughtcrime/securesms/search/SearchFragment.java
@@ -1,15 +1,15 @@
 package org.thoughtcrime.securesms.search;
 
 import android.annotation.SuppressLint;
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/search/SearchListAdapter.java b/src/org/thoughtcrime/securesms/search/SearchListAdapter.java
index 0fbba7c31c..141c6ea564 100644
--- a/src/org/thoughtcrime/securesms/search/SearchListAdapter.java
+++ b/src/org/thoughtcrime/securesms/search/SearchListAdapter.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.search;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/search/SearchRepository.java b/src/org/thoughtcrime/securesms/search/SearchRepository.java
index 46b47128f7..ab3f90a788 100644
--- a/src/org/thoughtcrime/securesms/search/SearchRepository.java
+++ b/src/org/thoughtcrime/securesms/search/SearchRepository.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.search;
 import android.content.Context;
 import android.database.Cursor;
 import android.database.DatabaseUtils;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import com.annimon.stream.Stream;
diff --git a/src/org/thoughtcrime/securesms/search/SearchViewModel.java b/src/org/thoughtcrime/securesms/search/SearchViewModel.java
index 592e46ad6e..7c307717f2 100644
--- a/src/org/thoughtcrime/securesms/search/SearchViewModel.java
+++ b/src/org/thoughtcrime/securesms/search/SearchViewModel.java
@@ -1,14 +1,16 @@
 package org.thoughtcrime.securesms.search;
 
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.ViewModel;
-import android.arch.lifecycle.ViewModelProvider;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
 import android.database.ContentObserver;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
+import androidx.fragment.app.Fragment;
+
 import org.thoughtcrime.securesms.search.model.SearchResult;
 import org.thoughtcrime.securesms.util.Debouncer;
 import org.thoughtcrime.securesms.util.Util;
@@ -19,7 +21,7 @@ import org.thoughtcrime.securesms.util.Util;
  *
  * This class should be view- and Android-agnostic, and therefore should contain no references to
  * things like {@link android.content.Context}, {@link android.view.View},
- * {@link android.support.v4.app.Fragment}, etc.
+ * {@link Fragment}, etc.
  */
 class SearchViewModel extends ViewModel {
 
diff --git a/src/org/thoughtcrime/securesms/search/model/MessageResult.java b/src/org/thoughtcrime/securesms/search/model/MessageResult.java
index 2e8aaf3d11..b936109744 100644
--- a/src/org/thoughtcrime/securesms/search/model/MessageResult.java
+++ b/src/org/thoughtcrime/securesms/search/model/MessageResult.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.search.model;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.recipients.Recipient;
 
diff --git a/src/org/thoughtcrime/securesms/search/model/SearchResult.java b/src/org/thoughtcrime/securesms/search/model/SearchResult.java
index 9c2577125d..66d00a8429 100644
--- a/src/org/thoughtcrime/securesms/search/model/SearchResult.java
+++ b/src/org/thoughtcrime/securesms/search/model/SearchResult.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.search.model;
 
 import android.database.ContentObserver;
-import android.database.DataSetObserver;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.database.CursorList;
 import org.thoughtcrime.securesms.database.model.ThreadRecord;
diff --git a/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java b/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
index 2a35649e74..dfd8de2747 100644
--- a/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
+++ b/src/org/thoughtcrime/securesms/service/ApplicationMigrationService.java
@@ -14,7 +14,7 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
-import android.support.v4.app.NotificationCompat;
+import androidx.core.app.NotificationCompat;
 
 import org.thoughtcrime.securesms.database.SmsMigrator;
 import org.thoughtcrime.securesms.database.SmsMigrator.ProgressDescription;
diff --git a/src/org/thoughtcrime/securesms/service/DirectShareService.java b/src/org/thoughtcrime/securesms/service/DirectShareService.java
index 44e6a0421c..7604bb08f6 100644
--- a/src/org/thoughtcrime/securesms/service/DirectShareService.java
+++ b/src/org/thoughtcrime/securesms/service/DirectShareService.java
@@ -11,8 +11,8 @@ import android.os.Bundle;
 import android.os.Parcel;
 import android.service.chooser.ChooserTarget;
 import android.service.chooser.ChooserTargetService;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 
 import org.thoughtcrime.securesms.ShareActivity;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
diff --git a/src/org/thoughtcrime/securesms/service/GenericForegroundService.java b/src/org/thoughtcrime/securesms/service/GenericForegroundService.java
index 5687869c00..9b30041463 100644
--- a/src/org/thoughtcrime/securesms/service/GenericForegroundService.java
+++ b/src/org/thoughtcrime/securesms/service/GenericForegroundService.java
@@ -6,11 +6,11 @@ import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
+import androidx.core.content.ContextCompat;
 
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.loki.activities.HomeActivity;
diff --git a/src/org/thoughtcrime/securesms/service/IncomingMessageObserver.java b/src/org/thoughtcrime/securesms/service/IncomingMessageObserver.java
index cfc9215cee..315beb2fdd 100644
--- a/src/org/thoughtcrime/securesms/service/IncomingMessageObserver.java
+++ b/src/org/thoughtcrime/securesms/service/IncomingMessageObserver.java
@@ -1,16 +1,16 @@
 package org.thoughtcrime.securesms.service;
 
 import android.app.Service;
-import android.arch.lifecycle.DefaultLifecycleObserver;
-import android.arch.lifecycle.LifecycleOwner;
-import android.arch.lifecycle.ProcessLifecycleOwner;
+import androidx.lifecycle.DefaultLifecycleObserver;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.ProcessLifecycleOwner;
 import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
+import androidx.core.content.ContextCompat;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
diff --git a/src/org/thoughtcrime/securesms/service/KeyCachingService.java b/src/org/thoughtcrime/securesms/service/KeyCachingService.java
index b07710e730..aae8b49377 100644
--- a/src/org/thoughtcrime/securesms/service/KeyCachingService.java
+++ b/src/org/thoughtcrime/securesms/service/KeyCachingService.java
@@ -27,9 +27,9 @@ import android.os.AsyncTask;
 import android.os.Binder;
 import android.os.IBinder;
 import android.os.SystemClock;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.DatabaseUpgradeActivity;
@@ -39,7 +39,6 @@ import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.loki.activities.HomeActivity;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.ServiceUtil;
diff --git a/src/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java b/src/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java
index 4d3ce918c9..f7401802ad 100644
--- a/src/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java
+++ b/src/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java
@@ -9,9 +9,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
-import android.os.Build;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
+
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
 import org.thoughtcrime.securesms.logging.Log;
 
 import network.loki.messenger.R;
diff --git a/src/org/thoughtcrime/securesms/service/WebRtcCallService.java b/src/org/thoughtcrime/securesms/service/WebRtcCallService.java
index 855b327131..0841e4f888 100644
--- a/src/org/thoughtcrime/securesms/service/WebRtcCallService.java
+++ b/src/org/thoughtcrime/securesms/service/WebRtcCallService.java
@@ -1,7 +1,6 @@
 package org.thoughtcrime.securesms.service;
 
 
-import android.Manifest;
 import android.app.Service;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -15,9 +14,9 @@ import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
 import android.os.ResultReceiver;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 import android.telephony.PhoneStateListener;
 import android.telephony.TelephonyManager;
 import android.util.Pair;
@@ -27,7 +26,6 @@ import com.google.protobuf.InvalidProtocolBufferException;
 import org.greenrobot.eventbus.EventBus;
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.WebRtcCallActivity;
-import org.thoughtcrime.securesms.contacts.ContactAccessor;
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -35,8 +33,6 @@ import org.thoughtcrime.securesms.database.RecipientDatabase.VibrateState;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
 import org.thoughtcrime.securesms.events.WebRtcViewModel;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
-import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.util.FutureTaskListener;
 import org.thoughtcrime.securesms.util.ListenableFutureTask;
diff --git a/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java b/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java
index 1c787355c3..612ea7a863 100644
--- a/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java
+++ b/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.sms;
 import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.telephony.SmsMessage;
 
 import org.thoughtcrime.securesms.database.Address;
diff --git a/src/org/thoughtcrime/securesms/sms/MessageSender.java b/src/org/thoughtcrime/securesms/sms/MessageSender.java
index 9f16df5c7c..3deb7565dd 100644
--- a/src/org/thoughtcrime/securesms/sms/MessageSender.java
+++ b/src/org/thoughtcrime/securesms/sms/MessageSender.java
@@ -17,7 +17,7 @@
 package org.thoughtcrime.securesms.sms;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.attachments.Attachment;
diff --git a/src/org/thoughtcrime/securesms/stickers/BlessedPacks.java b/src/org/thoughtcrime/securesms/stickers/BlessedPacks.java
index b67a45ebcf..9aa2a3b46c 100644
--- a/src/org/thoughtcrime/securesms/stickers/BlessedPacks.java
+++ b/src/org/thoughtcrime/securesms/stickers/BlessedPacks.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.stickers;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageAdapter.java b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageAdapter.java
index b53382d86c..155e264c78 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageAdapter.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageAdapter.java
@@ -1,9 +1,9 @@
 package org.thoughtcrime.securesms.stickers;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.Px;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Px;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageFragment.java b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageFragment.java
index 837fa5304c..f273c31a80 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageFragment.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageFragment.java
@@ -1,16 +1,16 @@
 package org.thoughtcrime.securesms.stickers;
 
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Point;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.Px;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.Px;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java
index b602a93645..23c31089ac 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java
@@ -1,17 +1,16 @@
 package org.thoughtcrime.securesms.stickers;
 
 import android.app.Application;
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.ViewModel;
-import android.arch.lifecycle.ViewModelProvider;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
 import android.database.ContentObserver;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.database.DatabaseContentProviders;
 import org.thoughtcrime.securesms.database.model.StickerRecord;
-import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.util.Throttler;
 
 import java.util.List;
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java
index 0f37fcf12e..27a7bfd7c3 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java
@@ -1,15 +1,15 @@
 package org.thoughtcrime.securesms.stickers;
 
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentStatePagerAdapter;
-import android.support.v7.app.AppCompatActivity;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentStatePagerAdapter;
+import androidx.appcompat.app.AppCompatActivity;
 import android.widget.ImageView;
 
 import org.thoughtcrime.securesms.components.emoji.MediaKeyboardProvider;
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardRepository.java b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardRepository.java
index 891da94810..d1d8648226 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardRepository.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardRepository.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.stickers;
 
 import android.database.Cursor;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.database.StickerDatabase;
 import org.thoughtcrime.securesms.database.StickerDatabase.StickerPackRecordReader;
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java
index 2833f554a8..0c1c2d5391 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java
@@ -1,13 +1,13 @@
 package org.thoughtcrime.securesms.stickers;
 
 import android.app.Application;
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.ViewModel;
-import android.arch.lifecycle.ViewModelProvider;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
 import android.database.ContentObserver;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.database.DatabaseContentProviders;
 import org.thoughtcrime.securesms.stickers.StickerKeyboardRepository.PackListResult;
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerLocator.java b/src/org/thoughtcrime/securesms/stickers/StickerLocator.java
index 68a8ed972d..ecb99e2a88 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerLocator.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerLocator.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.stickers;
 
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public class StickerLocator implements Parcelable {
 
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManagementActivity.java b/src/org/thoughtcrime/securesms/stickers/StickerManagementActivity.java
index e2c5795308..d814b86958 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerManagementActivity.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerManagementActivity.java
@@ -1,12 +1,12 @@
 package org.thoughtcrime.securesms.stickers;
 
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.MenuItem;
 
 import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity;
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java b/src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java
index 6670ade315..77e3ee8ee5 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerManagementAdapter.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.stickers;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java b/src/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java
index 4208ac0cf8..2dc5abf900 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerManagementRepository.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.stickers;
 
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java b/src/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java
index 062954bd43..2135deae16 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerManagementViewModel.java
@@ -1,13 +1,13 @@
 package org.thoughtcrime.securesms.stickers;
 
 import android.app.Application;
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.ViewModel;
-import android.arch.lifecycle.ViewModelProvider;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
 import android.database.ContentObserver;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.database.DatabaseContentProviders;
 import org.thoughtcrime.securesms.stickers.StickerManagementRepository.PackResult;
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerManifest.java b/src/org/thoughtcrime/securesms/stickers/StickerManifest.java
index 63444a87fa..77b5c5c3c3 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerManifest.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerManifest.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.stickers;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.whispersystems.libsignal.util.guava.Optional;
 
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackInstallEvent.java b/src/org/thoughtcrime/securesms/stickers/StickerPackInstallEvent.java
index b315d67522..22b2505dae 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerPackInstallEvent.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerPackInstallEvent.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.stickers;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public class StickerPackInstallEvent {
   private final Object iconGlideModel;
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java
index 5072aae05e..74350d36dc 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewActivity.java
@@ -1,15 +1,15 @@
 package org.thoughtcrime.securesms.stickers;
 
-import android.arch.lifecycle.ViewModelProviders;
+import androidx.lifecycle.ViewModelProviders;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Point;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java
index 5ba235ef68..1d5e675487 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewAdapter.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.stickers;
 
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java
index 9ef5b4a0f3..8c89422ac6 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewRepository.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.stickers;
 
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.WorkerThread;
 
 import com.annimon.stream.Stream;
 
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java
index cf95b28ca5..b99e75bbc7 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerPackPreviewViewModel.java
@@ -1,13 +1,13 @@
 package org.thoughtcrime.securesms.stickers;
 
 import android.app.Application;
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.ViewModel;
-import android.arch.lifecycle.ViewModelProvider;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
 import android.database.ContentObserver;
 import android.os.Handler;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextUtils;
 
 import org.thoughtcrime.securesms.database.DatabaseContentProviders;
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerPreviewPopup.java b/src/org/thoughtcrime/securesms/stickers/StickerPreviewPopup.java
index a13fe3c2e2..cac515af05 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerPreviewPopup.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerPreviewPopup.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.stickers;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 import android.widget.ImageView;
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerRemoteUri.java b/src/org/thoughtcrime/securesms/stickers/StickerRemoteUri.java
index b4845c2e42..5b5733ec49 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerRemoteUri.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerRemoteUri.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.stickers;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bumptech.glide.load.Key;
 
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java b/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java
index f75c538838..051e862b70 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriFetcher.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.stickers;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.bumptech.glide.Priority;
 import com.bumptech.glide.load.DataSource;
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java b/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java
index b17772f870..89fcc52214 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerRemoteUriLoader.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.stickers;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.bumptech.glide.load.Options;
 import com.bumptech.glide.load.model.ModelLoader;
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerSearchRepository.java b/src/org/thoughtcrime/securesms/stickers/StickerSearchRepository.java
index eea9cba3e7..d9bde9b461 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerSearchRepository.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerSearchRepository.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.stickers;
 
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.CursorList;
diff --git a/src/org/thoughtcrime/securesms/stickers/StickerUrl.java b/src/org/thoughtcrime/securesms/stickers/StickerUrl.java
index ac47f5223a..e20adfbefa 100644
--- a/src/org/thoughtcrime/securesms/stickers/StickerUrl.java
+++ b/src/org/thoughtcrime/securesms/stickers/StickerUrl.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.stickers;
 
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
 import org.whispersystems.libsignal.util.Pair;
diff --git a/src/org/thoughtcrime/securesms/util/AbstractCursorLoader.java b/src/org/thoughtcrime/securesms/util/AbstractCursorLoader.java
index 1e0e550c8f..b8fbef3803 100644
--- a/src/org/thoughtcrime/securesms/util/AbstractCursorLoader.java
+++ b/src/org/thoughtcrime/securesms/util/AbstractCursorLoader.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.util;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.database.Cursor;
-import android.support.v4.content.AsyncTaskLoader;
+import androidx.loader.content.AsyncTaskLoader;
 
 /**
  * A Loader similar to CursorLoader that doesn't require queries to go through the ContentResolver
diff --git a/src/org/thoughtcrime/securesms/util/AsyncLoader.java b/src/org/thoughtcrime/securesms/util/AsyncLoader.java
index 4ca7d67ff4..c585250526 100644
--- a/src/org/thoughtcrime/securesms/util/AsyncLoader.java
+++ b/src/org/thoughtcrime/securesms/util/AsyncLoader.java
@@ -16,7 +16,7 @@ package org.thoughtcrime.securesms.util;
  * limitations under the License.
  */
 
-import android.support.v4.content.AsyncTaskLoader;
+import androidx.loader.content.AsyncTaskLoader;
 import android.content.Context;
 
 /**
diff --git a/src/org/thoughtcrime/securesms/util/AttachmentUtil.java b/src/org/thoughtcrime/securesms/util/AttachmentUtil.java
index 1974b50926..8647440449 100644
--- a/src/org/thoughtcrime/securesms/util/AttachmentUtil.java
+++ b/src/org/thoughtcrime/securesms/util/AttachmentUtil.java
@@ -5,9 +5,9 @@ import android.content.Context;
 import android.database.Cursor;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 import android.text.TextUtils;
 
 import org.thoughtcrime.securesms.attachments.AttachmentId;
diff --git a/src/org/thoughtcrime/securesms/util/BackupUtil.java b/src/org/thoughtcrime/securesms/util/BackupUtil.java
index 46f6684e4c..d3b4f4a112 100644
--- a/src/org/thoughtcrime/securesms/util/BackupUtil.java
+++ b/src/org/thoughtcrime/securesms/util/BackupUtil.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.util;
 
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import org.thoughtcrime.securesms.logging.Log;
 
 import network.loki.messenger.R;
diff --git a/src/org/thoughtcrime/securesms/util/BitmapUtil.java b/src/org/thoughtcrime/securesms/util/BitmapUtil.java
index 90a51d9720..116baf7003 100644
--- a/src/org/thoughtcrime/securesms/util/BitmapUtil.java
+++ b/src/org/thoughtcrime/securesms/util/BitmapUtil.java
@@ -10,10 +10,10 @@ import android.graphics.Rect;
 import android.graphics.YuvImage;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
-import android.support.media.ExifInterface;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+import androidx.exifinterface.media.ExifInterface;
 import android.util.Pair;
 
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
diff --git a/src/org/thoughtcrime/securesms/util/CharacterCalculator.java b/src/org/thoughtcrime/securesms/util/CharacterCalculator.java
index c499c83d78..8bdf2d0c93 100644
--- a/src/org/thoughtcrime/securesms/util/CharacterCalculator.java
+++ b/src/org/thoughtcrime/securesms/util/CharacterCalculator.java
@@ -17,7 +17,7 @@
 package org.thoughtcrime.securesms.util;
 
 import android.os.Parcel;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public abstract class CharacterCalculator {
 
diff --git a/src/org/thoughtcrime/securesms/util/CloseableLiveData.java b/src/org/thoughtcrime/securesms/util/CloseableLiveData.java
index 93286c39d9..5691b7b088 100644
--- a/src/org/thoughtcrime/securesms/util/CloseableLiveData.java
+++ b/src/org/thoughtcrime/securesms/util/CloseableLiveData.java
@@ -1,11 +1,11 @@
 package org.thoughtcrime.securesms.util;
 
-import android.arch.lifecycle.MutableLiveData;
+import androidx.lifecycle.MutableLiveData;
 
 import java.io.Closeable;
 
 /**
- * Implementation of {@link android.arch.lifecycle.LiveData} that will handle closing the contained
+ * Implementation of {@link androidx.lifecycle.LiveData} that will handle closing the contained
  * {@link Closeable} when the value changes.
  */
 public class CloseableLiveData<E extends Closeable> extends MutableLiveData<E> {
diff --git a/src/org/thoughtcrime/securesms/util/CommunicationActions.java b/src/org/thoughtcrime/securesms/util/CommunicationActions.java
index 9cbd256ba9..2c06f714b5 100644
--- a/src/org/thoughtcrime/securesms/util/CommunicationActions.java
+++ b/src/org/thoughtcrime/securesms/util/CommunicationActions.java
@@ -7,9 +7,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.TaskStackBuilder;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.TaskStackBuilder;
 import android.text.TextUtils;
 import android.widget.Toast;
 
diff --git a/src/org/thoughtcrime/securesms/util/DateUtils.java b/src/org/thoughtcrime/securesms/util/DateUtils.java
index 21081da710..a7fc61fb4f 100644
--- a/src/org/thoughtcrime/securesms/util/DateUtils.java
+++ b/src/org/thoughtcrime/securesms/util/DateUtils.java
@@ -17,7 +17,7 @@
 package org.thoughtcrime.securesms.util;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.format.DateFormat;
 
 import java.text.SimpleDateFormat;
diff --git a/src/org/thoughtcrime/securesms/util/Dialogs.java b/src/org/thoughtcrime/securesms/util/Dialogs.java
index 809fc6a65e..4d92621465 100644
--- a/src/org/thoughtcrime/securesms/util/Dialogs.java
+++ b/src/org/thoughtcrime/securesms/util/Dialogs.java
@@ -17,7 +17,7 @@
 package org.thoughtcrime.securesms.util;
 
 import android.content.Context;
-import android.support.v7.app.AlertDialog;
+import androidx.appcompat.app.AlertDialog;
 
 import network.loki.messenger.R;
 
diff --git a/src/org/thoughtcrime/securesms/util/FileProviderUtil.java b/src/org/thoughtcrime/securesms/util/FileProviderUtil.java
index 930290e689..629a5b43bc 100644
--- a/src/org/thoughtcrime/securesms/util/FileProviderUtil.java
+++ b/src/org/thoughtcrime/securesms/util/FileProviderUtil.java
@@ -4,8 +4,8 @@ package org.thoughtcrime.securesms.util;
 import android.content.Context;
 import android.net.Uri;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.v4.content.FileProvider;
+import androidx.annotation.NonNull;
+import androidx.core.content.FileProvider;
 
 import java.io.File;
 
diff --git a/src/org/thoughtcrime/securesms/util/GroupUtil.java b/src/org/thoughtcrime/securesms/util/GroupUtil.java
index 4b67444384..3792c7b5b2 100644
--- a/src/org/thoughtcrime/securesms/util/GroupUtil.java
+++ b/src/org/thoughtcrime/securesms/util/GroupUtil.java
@@ -1,9 +1,9 @@
 package org.thoughtcrime.securesms.util;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 
 import com.google.protobuf.ByteString;
 
diff --git a/src/org/thoughtcrime/securesms/util/IdentityUtil.java b/src/org/thoughtcrime/securesms/util/IdentityUtil.java
index fe5542e9a5..38fa1c3472 100644
--- a/src/org/thoughtcrime/securesms/util/IdentityUtil.java
+++ b/src/org/thoughtcrime/securesms/util/IdentityUtil.java
@@ -2,9 +2,9 @@ package org.thoughtcrime.securesms.util;
 
 import android.content.Context;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
 
 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.crypto.storage.TextSecureIdentityKeyStore;
@@ -17,7 +17,6 @@ import org.thoughtcrime.securesms.database.IdentityDatabase.IdentityRecord;
 import org.thoughtcrime.securesms.database.MessagingDatabase.InsertResult;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.logging.Log;
-import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.sms.IncomingIdentityDefaultMessage;
 import org.thoughtcrime.securesms.sms.IncomingIdentityUpdateMessage;
diff --git a/src/org/thoughtcrime/securesms/util/IntentUtils.java b/src/org/thoughtcrime/securesms/util/IntentUtils.java
index 31295d2406..0eb110ebdc 100644
--- a/src/org/thoughtcrime/securesms/util/IntentUtils.java
+++ b/src/org/thoughtcrime/securesms/util/IntentUtils.java
@@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.util;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.List;
 
diff --git a/src/org/thoughtcrime/securesms/util/ListenableFutureTask.java b/src/org/thoughtcrime/securesms/util/ListenableFutureTask.java
index 56d7a863ad..068772aa4d 100644
--- a/src/org/thoughtcrime/securesms/util/ListenableFutureTask.java
+++ b/src/org/thoughtcrime/securesms/util/ListenableFutureTask.java
@@ -16,7 +16,7 @@
  */
 package org.thoughtcrime.securesms.util;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.LinkedList;
 import java.util.List;
diff --git a/src/org/thoughtcrime/securesms/util/LongClickCopySpan.java b/src/org/thoughtcrime/securesms/util/LongClickCopySpan.java
index 93f59a1c2b..ce8439a20d 100644
--- a/src/org/thoughtcrime/securesms/util/LongClickCopySpan.java
+++ b/src/org/thoughtcrime/securesms/util/LongClickCopySpan.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.util;
 import android.annotation.TargetApi;
 import android.content.ClipData;
 import android.content.Context;
-import android.support.annotation.ColorInt;
-import android.support.annotation.NonNull;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
 import android.text.TextPaint;
 import android.text.style.URLSpan;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/util/LongClickMovementMethod.java b/src/org/thoughtcrime/securesms/util/LongClickMovementMethod.java
index 9506d42750..82077f474d 100644
--- a/src/org/thoughtcrime/securesms/util/LongClickMovementMethod.java
+++ b/src/org/thoughtcrime/securesms/util/LongClickMovementMethod.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.util;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.graphics.Color;
-import android.support.v4.content.ContextCompat;
+import androidx.core.content.ContextCompat;
 import android.text.Layout;
 import android.text.Selection;
 import android.text.Spannable;
diff --git a/src/org/thoughtcrime/securesms/util/MathUtils.java b/src/org/thoughtcrime/securesms/util/MathUtils.java
index 15a049dfeb..93842ea03c 100644
--- a/src/org/thoughtcrime/securesms/util/MathUtils.java
+++ b/src/org/thoughtcrime/securesms/util/MathUtils.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.util;
 
 import android.graphics.PointF;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public class MathUtils {
 
diff --git a/src/org/thoughtcrime/securesms/util/MediaUtil.java b/src/org/thoughtcrime/securesms/util/MediaUtil.java
index 9142f2dc80..6163ba16d6 100644
--- a/src/org/thoughtcrime/securesms/util/MediaUtil.java
+++ b/src/org/thoughtcrime/securesms/util/MediaUtil.java
@@ -5,9 +5,9 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.provider.MediaStore;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.WorkerThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
 import android.text.TextUtils;
 import android.util.Pair;
 import android.webkit.MimeTypeMap;
diff --git a/src/org/thoughtcrime/securesms/util/ObservingLiveData.java b/src/org/thoughtcrime/securesms/util/ObservingLiveData.java
index e0fd8a11cf..8f5ef26771 100644
--- a/src/org/thoughtcrime/securesms/util/ObservingLiveData.java
+++ b/src/org/thoughtcrime/securesms/util/ObservingLiveData.java
@@ -1,15 +1,15 @@
 package org.thoughtcrime.securesms.util;
 
-import android.arch.lifecycle.MutableLiveData;
+import androidx.lifecycle.MutableLiveData;
 import android.database.ContentObserver;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.database.ObservableContent;
 
 import java.io.Closeable;
 
 /**
- * Implementation of {@link android.arch.lifecycle.LiveData} that will handle closing the contained
+ * Implementation of {@link androidx.lifecycle.LiveData} that will handle closing the contained
  * {@link Closeable} when the value changes.
  */
 public class ObservingLiveData<E extends ObservableContent> extends MutableLiveData<E> {
diff --git a/src/org/thoughtcrime/securesms/util/PowerManagerCompat.java b/src/org/thoughtcrime/securesms/util/PowerManagerCompat.java
index f4b7f60868..6fa4ba027a 100644
--- a/src/org/thoughtcrime/securesms/util/PowerManagerCompat.java
+++ b/src/org/thoughtcrime/securesms/util/PowerManagerCompat.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.util;
 
 import android.os.Build;
 import android.os.PowerManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public class PowerManagerCompat {
 
diff --git a/src/org/thoughtcrime/securesms/util/ResUtil.java b/src/org/thoughtcrime/securesms/util/ResUtil.java
index 75b8f707cf..d83c5cbcf4 100644
--- a/src/org/thoughtcrime/securesms/util/ResUtil.java
+++ b/src/org/thoughtcrime/securesms/util/ResUtil.java
@@ -21,11 +21,11 @@ import android.content.Context;
 import android.content.res.Resources.Theme;
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
-import android.support.annotation.ArrayRes;
-import android.support.annotation.AttrRes;
-import android.support.annotation.DimenRes;
-import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
+import androidx.annotation.ArrayRes;
+import androidx.annotation.AttrRes;
+import androidx.annotation.DimenRes;
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
 import android.util.TypedValue;
 
 public class ResUtil {
diff --git a/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java b/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
index a9eefb0250..f1afec8de8 100644
--- a/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
+++ b/src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java
@@ -4,9 +4,9 @@ import android.content.Context;
 import android.content.DialogInterface.OnClickListener;
 import android.media.MediaScannerConnection;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import android.text.TextUtils;
 import android.webkit.MimeTypeMap;
 import android.widget.Toast;
diff --git a/src/org/thoughtcrime/securesms/util/SearchUtil.java b/src/org/thoughtcrime/securesms/util/SearchUtil.java
index 4125caacf3..25e84c87cd 100644
--- a/src/org/thoughtcrime/securesms/util/SearchUtil.java
+++ b/src/org/thoughtcrime/securesms/util/SearchUtil.java
@@ -1,10 +1,9 @@
 package org.thoughtcrime.securesms.util;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.text.Spannable;
 import android.text.SpannableString;
-import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.style.CharacterStyle;
 
diff --git a/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java b/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java
index 4c843409ae..202aa40d8e 100644
--- a/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java
+++ b/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java
@@ -1,8 +1,8 @@
 package org.thoughtcrime.securesms.util;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
diff --git a/src/org/thoughtcrime/securesms/util/ServiceUtil.java b/src/org/thoughtcrime/securesms/util/ServiceUtil.java
index 348df1fd61..dd74ad1d33 100644
--- a/src/org/thoughtcrime/securesms/util/ServiceUtil.java
+++ b/src/org/thoughtcrime/securesms/util/ServiceUtil.java
@@ -9,9 +9,9 @@ import android.net.ConnectivityManager;
 import android.os.Build;
 import android.os.PowerManager;
 import android.os.Vibrator;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.view.WindowManager;
diff --git a/src/org/thoughtcrime/securesms/util/ShortCodeUtil.java b/src/org/thoughtcrime/securesms/util/ShortCodeUtil.java
index 8a4a9d9018..da645d548b 100644
--- a/src/org/thoughtcrime/securesms/util/ShortCodeUtil.java
+++ b/src/org/thoughtcrime/securesms/util/ShortCodeUtil.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.util;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/src/org/thoughtcrime/securesms/util/SingleLiveEvent.java b/src/org/thoughtcrime/securesms/util/SingleLiveEvent.java
index 9df12bd71b..6526853533 100644
--- a/src/org/thoughtcrime/securesms/util/SingleLiveEvent.java
+++ b/src/org/thoughtcrime/securesms/util/SingleLiveEvent.java
@@ -16,12 +16,12 @@
 
 package org.thoughtcrime.securesms.util;
 
-import android.arch.lifecycle.LifecycleOwner;
-import android.arch.lifecycle.MutableLiveData;
-import android.arch.lifecycle.Observer;
-import android.support.annotation.MainThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.lifecycle.LifecycleOwner;
+import androidx.lifecycle.MutableLiveData;
+import androidx.lifecycle.Observer;
+import androidx.annotation.MainThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.logging.Log;
 
@@ -44,7 +44,7 @@ public class SingleLiveEvent<T> extends MutableLiveData<T> {
   private final AtomicBoolean mPending = new AtomicBoolean(false);
 
   @MainThread
-  public void observe(@NonNull LifecycleOwner owner, @NonNull final Observer<T> observer) {
+  public void observe(@NonNull LifecycleOwner owner, @NonNull final Observer<? super T> observer) {
     if (hasActiveObservers()) {
       Log.w(TAG, "Multiple observers registered but only one will be notified of changes.");
     }
diff --git a/src/org/thoughtcrime/securesms/util/SoftHashMap.java b/src/org/thoughtcrime/securesms/util/SoftHashMap.java
index 5396826263..bff4f3a821 100644
--- a/src/org/thoughtcrime/securesms/util/SoftHashMap.java
+++ b/src/org/thoughtcrime/securesms/util/SoftHashMap.java
@@ -19,7 +19,7 @@
 
 package org.thoughtcrime.securesms.util;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.SoftReference;
diff --git a/src/org/thoughtcrime/securesms/util/StableIdGenerator.java b/src/org/thoughtcrime/securesms/util/StableIdGenerator.java
index 7acb9cc2a5..e380f21f95 100644
--- a/src/org/thoughtcrime/securesms/util/StableIdGenerator.java
+++ b/src/org/thoughtcrime/securesms/util/StableIdGenerator.java
@@ -1,14 +1,16 @@
 package org.thoughtcrime.securesms.util;
 
-import android.support.annotation.MainThread;
-import android.support.annotation.NonNull;
+import androidx.annotation.MainThread;
+import androidx.annotation.NonNull;
+
+import androidx.recyclerview.widget.RecyclerView;
 
 import java.util.HashMap;
 import java.util.Map;
 
 /**
  * Useful for generate ID's to be used with
- * {@link android.support.v7.widget.RecyclerView.Adapter#getItemId(int)} when you otherwise don't
+ * {@link RecyclerView.Adapter#getItemId(int)} when you otherwise don't
  * have a good way to generate an ID.
  */
 public class StableIdGenerator<E> {
diff --git a/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java b/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java
index 3370528256..04435fde0f 100644
--- a/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java
+++ b/src/org/thoughtcrime/securesms/util/StickyHeaderDecoration.java
@@ -3,11 +3,11 @@ package org.thoughtcrime.securesms.util;
 import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.os.Build.VERSION;
-import android.support.annotation.NonNull;
-import android.support.v4.view.ViewCompat;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.ViewHolder;
+import androidx.annotation.NonNull;
+import androidx.core.view.ViewCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import android.view.View;
 import android.view.ViewGroup;
 
diff --git a/src/org/thoughtcrime/securesms/util/Stopwatch.java b/src/org/thoughtcrime/securesms/util/Stopwatch.java
index 58aa34a3c8..b18d474a86 100644
--- a/src/org/thoughtcrime/securesms/util/Stopwatch.java
+++ b/src/org/thoughtcrime/securesms/util/Stopwatch.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.util;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.logging.Log;
 
diff --git a/src/org/thoughtcrime/securesms/util/StorageUtil.java b/src/org/thoughtcrime/securesms/util/StorageUtil.java
index e08242b8f2..2fbc6c482f 100644
--- a/src/org/thoughtcrime/securesms/util/StorageUtil.java
+++ b/src/org/thoughtcrime/securesms/util/StorageUtil.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.util;
 
 import android.content.Context;
 import android.os.Environment;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.database.NoExternalStorageException;
 
diff --git a/src/org/thoughtcrime/securesms/util/TelephonyUtil.java b/src/org/thoughtcrime/securesms/util/TelephonyUtil.java
index 3609cc7c7c..e293f8f8af 100644
--- a/src/org/thoughtcrime/securesms/util/TelephonyUtil.java
+++ b/src/org/thoughtcrime/securesms/util/TelephonyUtil.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.util;
 import android.content.Context;
 import android.content.res.Configuration;
 import android.net.ConnectivityManager;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.telephony.TelephonyManager;
 
 import org.thoughtcrime.securesms.logging.Log;
diff --git a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
index 669c265c57..f068954296 100644
--- a/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
+++ b/src/org/thoughtcrime/securesms/util/TextSecurePreferences.java
@@ -7,10 +7,10 @@ import android.net.Uri;
 import android.os.Build;
 import android.preference.PreferenceManager;
 import android.provider.Settings;
-import android.support.annotation.ArrayRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.ArrayRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.NotificationCompat;
 
 import org.greenrobot.eventbus.EventBus;
 import org.thoughtcrime.securesms.jobmanager.impl.SqlCipherMigrationConstraintObserver;
diff --git a/src/org/thoughtcrime/securesms/util/ThemeUtil.java b/src/org/thoughtcrime/securesms/util/ThemeUtil.java
index ccf53cc1ce..564932c57d 100644
--- a/src/org/thoughtcrime/securesms/util/ThemeUtil.java
+++ b/src/org/thoughtcrime/securesms/util/ThemeUtil.java
@@ -3,10 +3,10 @@ package org.thoughtcrime.securesms.util;
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Color;
-import android.support.annotation.AttrRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.StyleRes;
-import android.support.v7.view.ContextThemeWrapper;
+import androidx.annotation.AttrRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StyleRes;
+import androidx.appcompat.view.ContextThemeWrapper;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 
diff --git a/src/org/thoughtcrime/securesms/util/Util.java b/src/org/thoughtcrime/securesms/util/Util.java
index 159cf26586..79874325a5 100644
--- a/src/org/thoughtcrime/securesms/util/Util.java
+++ b/src/org/thoughtcrime/securesms/util/Util.java
@@ -30,8 +30,8 @@ import android.os.Build.VERSION_CODES;
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.Telephony;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.telephony.TelephonyManager;
 import android.text.Spannable;
 import android.text.SpannableString;
diff --git a/src/org/thoughtcrime/securesms/util/VerifySpan.java b/src/org/thoughtcrime/securesms/util/VerifySpan.java
index 0df463de54..c72837b9d6 100644
--- a/src/org/thoughtcrime/securesms/util/VerifySpan.java
+++ b/src/org/thoughtcrime/securesms/util/VerifySpan.java
@@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.util;
 
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.style.ClickableSpan;
 import android.view.View;
 
diff --git a/src/org/thoughtcrime/securesms/util/VersionTracker.java b/src/org/thoughtcrime/securesms/util/VersionTracker.java
index 3c8d06b338..4c9a6ba97a 100644
--- a/src/org/thoughtcrime/securesms/util/VersionTracker.java
+++ b/src/org/thoughtcrime/securesms/util/VersionTracker.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.util;
 
 import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.io.IOException;
 
diff --git a/src/org/thoughtcrime/securesms/util/ViewUtil.java b/src/org/thoughtcrime/securesms/util/ViewUtil.java
index d599a8aef4..d119b05ec0 100644
--- a/src/org/thoughtcrime/securesms/util/ViewUtil.java
+++ b/src/org/thoughtcrime/securesms/util/ViewUtil.java
@@ -22,12 +22,12 @@ import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
-import android.support.annotation.IdRes;
-import android.support.annotation.LayoutRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.view.animation.FastOutSlowInInterpolator;
+import androidx.annotation.IdRes;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.view.ViewCompat;
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/src/org/thoughtcrime/securesms/util/WakeLockUtil.java b/src/org/thoughtcrime/securesms/util/WakeLockUtil.java
index 6d16e354c6..757f2d5801 100644
--- a/src/org/thoughtcrime/securesms/util/WakeLockUtil.java
+++ b/src/org/thoughtcrime/securesms/util/WakeLockUtil.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.util;
 import android.content.Context;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.logging.Log;
 
diff --git a/src/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java b/src/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java
index 4c315843dd..71686a777d 100644
--- a/src/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java
+++ b/src/org/thoughtcrime/securesms/util/concurrent/SignalExecutors.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.util.concurrent;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
diff --git a/src/org/thoughtcrime/securesms/util/concurrent/SimpleTask.java b/src/org/thoughtcrime/securesms/util/concurrent/SimpleTask.java
index 3cfb08ae90..5cd24618f9 100644
--- a/src/org/thoughtcrime/securesms/util/concurrent/SimpleTask.java
+++ b/src/org/thoughtcrime/securesms/util/concurrent/SimpleTask.java
@@ -1,13 +1,11 @@
 package org.thoughtcrime.securesms.util.concurrent;
 
-import android.arch.lifecycle.Lifecycle;
+import androidx.lifecycle.Lifecycle;
 import android.os.AsyncTask;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import org.thoughtcrime.securesms.util.Util;
 
-import java.util.concurrent.Callable;
-
 public class SimpleTask {
 
   /**
diff --git a/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionInfoCompat.java b/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionInfoCompat.java
index f3ef15f413..4a2837668f 100644
--- a/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionInfoCompat.java
+++ b/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionInfoCompat.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.util.dualsim;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 public class SubscriptionInfoCompat {
 
diff --git a/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java b/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java
index 2bbfe11c65..26005a5d83 100644
--- a/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java
+++ b/src/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.util.dualsim;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
diff --git a/src/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageActivityHelper.java b/src/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageActivityHelper.java
index 8c16f51348..8665377d41 100644
--- a/src/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageActivityHelper.java
+++ b/src/org/thoughtcrime/securesms/util/dynamiclanguage/DynamicLanguageActivityHelper.java
@@ -1,9 +1,9 @@
 package org.thoughtcrime.securesms.util.dynamiclanguage;
 
 import android.app.Activity;
-import android.content.Intent;
-import android.support.annotation.MainThread;
-import android.support.v4.os.ConfigurationCompat;
+
+import androidx.annotation.MainThread;
+import androidx.core.os.ConfigurationCompat;
 
 import org.thoughtcrime.securesms.logging.Log;
 
diff --git a/src/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageString.java b/src/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageString.java
index c3d9f2d870..0c74c2ed6f 100644
--- a/src/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageString.java
+++ b/src/org/thoughtcrime/securesms/util/dynamiclanguage/LanguageString.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.util.dynamiclanguage;
 
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import java.util.Locale;
 
diff --git a/src/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser.java b/src/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser.java
index a017362e06..80b011894f 100644
--- a/src/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser.java
+++ b/src/org/thoughtcrime/securesms/util/dynamiclanguage/LocaleParser.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.util.dynamiclanguage;
 
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.support.annotation.Nullable;
-import android.support.v4.os.ConfigurationCompat;
+import androidx.annotation.Nullable;
+import androidx.core.os.ConfigurationCompat;
 
 import network.loki.messenger.BuildConfig;
 
diff --git a/src/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java b/src/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java
index 62bd3874e3..11f2b474dc 100644
--- a/src/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java
+++ b/src/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.util.spans;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.text.TextPaint;
 import android.text.style.MetricAffectingSpan;
 
diff --git a/src/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java b/src/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java
index b3522c15fa..074e4ed253 100644
--- a/src/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java
+++ b/src/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.util.task;
 
 import android.app.ProgressDialog;
 import android.os.AsyncTask;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
+import androidx.annotation.Nullable;
+import com.google.android.material.snackbar.Snackbar;
 import android.view.View;
 
 public abstract class SnackbarAsyncTask<Params>
diff --git a/src/org/thoughtcrime/securesms/util/views/Stub.java b/src/org/thoughtcrime/securesms/util/views/Stub.java
index b208bdc62d..eebfdac097 100644
--- a/src/org/thoughtcrime/securesms/util/views/Stub.java
+++ b/src/org/thoughtcrime/securesms/util/views/Stub.java
@@ -1,7 +1,7 @@
 package org.thoughtcrime.securesms.util.views;
 
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import android.view.ViewStub;
 
 public class Stub<T> {
diff --git a/src/org/thoughtcrime/securesms/video/EncryptedMediaDataSource.java b/src/org/thoughtcrime/securesms/video/EncryptedMediaDataSource.java
index 89956cf67a..f2e036ed84 100644
--- a/src/org/thoughtcrime/securesms/video/EncryptedMediaDataSource.java
+++ b/src/org/thoughtcrime/securesms/video/EncryptedMediaDataSource.java
@@ -4,8 +4,8 @@ package org.thoughtcrime.securesms.video;
 import android.annotation.TargetApi;
 import android.media.MediaDataSource;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.thoughtcrime.securesms.crypto.AttachmentSecret;
 import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream;
diff --git a/src/org/thoughtcrime/securesms/video/VideoPlayer.java b/src/org/thoughtcrime/securesms/video/VideoPlayer.java
index 13cf819155..dff96b4fab 100644
--- a/src/org/thoughtcrime/securesms/video/VideoPlayer.java
+++ b/src/org/thoughtcrime/securesms/video/VideoPlayer.java
@@ -18,8 +18,8 @@ package org.thoughtcrime.securesms.video;
 
 import android.content.Context;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.Window;
diff --git a/src/org/thoughtcrime/securesms/video/exo/AttachmentDataSourceFactory.java b/src/org/thoughtcrime/securesms/video/exo/AttachmentDataSourceFactory.java
index 0d9410f7d0..99a6e28d9b 100644
--- a/src/org/thoughtcrime/securesms/video/exo/AttachmentDataSourceFactory.java
+++ b/src/org/thoughtcrime/securesms/video/exo/AttachmentDataSourceFactory.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.video.exo;
 
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
diff --git a/src/org/thoughtcrime/securesms/video/exo/PartDataSource.java b/src/org/thoughtcrime/securesms/video/exo/PartDataSource.java
index 78116e5992..e504eff71a 100644
--- a/src/org/thoughtcrime/securesms/video/exo/PartDataSource.java
+++ b/src/org/thoughtcrime/securesms/video/exo/PartDataSource.java
@@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.video.exo;
 
 import android.content.Context;
 import android.net.Uri;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSpec;
diff --git a/src/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java b/src/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java
index 25d2d3992a..ebeb58a87e 100644
--- a/src/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java
+++ b/src/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java
@@ -4,10 +4,10 @@ import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.NonNull;
-import android.support.annotation.StringRes;
-import android.support.v4.app.NotificationCompat;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.core.app.NotificationCompat;
 
 import org.thoughtcrime.securesms.WebRtcCallActivity;
 import org.thoughtcrime.securesms.notifications.NotificationChannels;
diff --git a/src/org/thoughtcrime/securesms/webrtc/CameraState.java b/src/org/thoughtcrime/securesms/webrtc/CameraState.java
index c5b0e25723..b2f5d1ee07 100644
--- a/src/org/thoughtcrime/securesms/webrtc/CameraState.java
+++ b/src/org/thoughtcrime/securesms/webrtc/CameraState.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.webrtc;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 public class CameraState {
 
diff --git a/src/org/thoughtcrime/securesms/webrtc/PeerConnectionWrapper.java b/src/org/thoughtcrime/securesms/webrtc/PeerConnectionWrapper.java
index a4bb08dc48..d4e0fdb65d 100644
--- a/src/org/thoughtcrime/securesms/webrtc/PeerConnectionWrapper.java
+++ b/src/org/thoughtcrime/securesms/webrtc/PeerConnectionWrapper.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.webrtc;
 
 
 import android.content.Context;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import org.thoughtcrime.securesms.logging.Log;
 
 import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
diff --git a/src/org/thoughtcrime/securesms/webrtc/audio/BluetoothStateManager.java b/src/org/thoughtcrime/securesms/webrtc/audio/BluetoothStateManager.java
index 93c9858f28..853ae15fcb 100644
--- a/src/org/thoughtcrime/securesms/webrtc/audio/BluetoothStateManager.java
+++ b/src/org/thoughtcrime/securesms/webrtc/audio/BluetoothStateManager.java
@@ -11,9 +11,9 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.media.AudioManager;
 import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import org.thoughtcrime.securesms.logging.Log;
 
 import org.thoughtcrime.securesms.util.ServiceUtil;
diff --git a/src/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java b/src/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java
index e1c96b605f..dfb8fb33a6 100644
--- a/src/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java
+++ b/src/org/thoughtcrime/securesms/webrtc/audio/IncomingRinger.java
@@ -8,8 +8,8 @@ import android.media.MediaPlayer;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Vibrator;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import org.thoughtcrime.securesms.logging.Log;
 
 import org.thoughtcrime.securesms.util.ServiceUtil;
diff --git a/src/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java b/src/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java
index ac6cbe7891..7e2373cc6e 100644
--- a/src/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java
+++ b/src/org/thoughtcrime/securesms/webrtc/audio/OutgoingRinger.java
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 import android.net.Uri;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 import org.thoughtcrime.securesms.logging.Log;
 
 import network.loki.messenger.R;
diff --git a/src/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java b/src/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java
index 6ad31f37e3..be5fb9c3a1 100644
--- a/src/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java
+++ b/src/org/thoughtcrime/securesms/webrtc/audio/SignalAudioManager.java
@@ -5,9 +5,9 @@ import android.content.Context;
 import android.media.AudioManager;
 import android.media.SoundPool;
 import android.net.Uri;
-import android.os.Build;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import network.loki.messenger.R;
 import org.thoughtcrime.securesms.util.ServiceUtil;
diff --git a/test/unitTest/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapterTest.java b/test/unitTest/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapterTest.java
index ec61223c36..3fc27d08a2 100644
--- a/test/unitTest/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapterTest.java
+++ b/test/unitTest/java/org/thoughtcrime/securesms/database/CursorRecyclerViewAdapterTest.java
@@ -2,8 +2,8 @@ package org.thoughtcrime.securesms.database;
 
 import android.content.Context;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
-import android.support.v7.widget.RecyclerView.ViewHolder;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView.ViewHolder;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -12,7 +12,6 @@ import org.junit.Test;
 
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.anyInt;
-import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
diff --git a/test/unitTest/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java b/test/unitTest/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java
index 7844aa0672..2198a1c26a 100644
--- a/test/unitTest/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java
+++ b/test/unitTest/java/org/thoughtcrime/securesms/jobs/FastJobStorageTest.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.jobs;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import com.annimon.stream.Stream;
 
diff --git a/test/unitTest/java/org/thoughtcrime/securesms/testutil/DirectExecutor.java b/test/unitTest/java/org/thoughtcrime/securesms/testutil/DirectExecutor.java
index b602ba25ba..0a573e580c 100644
--- a/test/unitTest/java/org/thoughtcrime/securesms/testutil/DirectExecutor.java
+++ b/test/unitTest/java/org/thoughtcrime/securesms/testutil/DirectExecutor.java
@@ -1,6 +1,6 @@
 package org.thoughtcrime.securesms.testutil;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.concurrent.Executor;
 

From 6de5b25e97b8120ea3581f372577a70c41e0c206 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Wed, 19 Aug 2020 10:18:02 +1000
Subject: [PATCH 29/30] Only externally define versions that are used multiple
 times

---
 build.gradle | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index c1b4cc7025..2a8d791677 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,8 @@
 import java.security.MessageDigest
 
 buildscript {
-    ext.gradle_version = "3.4.1"
     ext.kotlin_version = "1.3.31"
     ext.kovenant_version = "3.3.0"
-    ext.identicon_version = "v11"
-    ext.rss_parser_version = "2.0.4"
-    ext.google_services_version = "4.3.3"
-    ext.firebase_messaging_version = "18.0.0"
-    ext.opencsv_version = "4.6"
 
     repositories {
         mavenLocal()
@@ -16,10 +10,10 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:$gradle_version"
+        classpath "com.android.tools.build:gradle:3.4.1"
         classpath files('libs/gradle-witness.jar')
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "com.google.gms:google-services:$google_services_version"
+        classpath "com.google.gms:google-services:4.3.3"
     }
 }
 
@@ -91,7 +85,7 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
     implementation 'androidx.lifecycle:lifecycle-common-java8:2.0.0'
 
-    implementation ("com.google.firebase:firebase-messaging:$firebase_messaging_version") {
+    implementation ("com.google.firebase:firebase-messaging:18.0.0") {
         exclude group: 'com.google.firebase', module: 'firebase-core'
         exclude group: 'com.google.firebase', module: 'firebase-analytics'
         exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
@@ -187,12 +181,12 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "nl.komponents.kovenant:kovenant:$kovenant_version"
     implementation "nl.komponents.kovenant:kovenant-android:$kovenant_version"
-    implementation "com.github.lelloman:android-identicons:$identicon_version"
-    implementation "com.prof.rssparser:rssparser:$rss_parser_version"
+    implementation "com.github.lelloman:android-identicons:v11"
+    implementation "com.prof.rssparser:rssparser:2.0.4"
     implementation "com.jakewharton.rxbinding3:rxbinding:3.1.0"
     implementation "com.github.tbruyelle:rxpermissions:0.10.2"
     implementation "com.github.ybq:Android-SpinKit:1.4.0"
-    implementation "com.opencsv:opencsv:$opencsv_version"
+    implementation "com.opencsv:opencsv:4.6"
 }
 
 def canonicalVersionCode = 65

From 3a1a99b18319a43e44a2caaed2861525a0de34e6 Mon Sep 17 00:00:00 2001
From: nielsandriesse <andriesseniels@gmail.com>
Date: Wed, 19 Aug 2020 10:42:46 +1000
Subject: [PATCH 30/30] Update dependencies

---
 build.gradle | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index 2a8d791677..8bf64b9d56 100644
--- a/build.gradle
+++ b/build.gradle
@@ -71,19 +71,19 @@ configurations.all {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0'
+    implementation 'com.google.android.material:material:1.2.0'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation 'androidx.exifinterface:exifinterface:1.0.0'
+    implementation 'androidx.exifinterface:exifinterface:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.multidex:multidex:2.0.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.0.0'
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
+    implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0'
 
     implementation ("com.google.firebase:firebase-messaging:18.0.0") {
         exclude group: 'com.google.firebase', module: 'firebase-core'
@@ -93,12 +93,9 @@ dependencies {
 
     implementation 'com.google.android.exoplayer:exoplayer-core:2.9.1'
     implementation 'com.google.android.exoplayer:exoplayer-ui:2.9.1'
-
     implementation 'org.conscrypt:conscrypt-android:2.0.0'
     implementation 'org.signal:aesgcmprovider:0.0.3'
-
     implementation 'org.whispersystems:webrtc-android:M74'
-
     implementation "me.leolin:ShortcutBadger:1.1.16"
     implementation 'se.emilsjolander:stickylistheaders:2.7.0'
     implementation 'com.jpardogo.materialtabstrip:library:1.0.9'
@@ -154,8 +151,8 @@ dependencies {
     testImplementation 'org.powermock:powermock-module-junit4-rule:1.6.1'
     testImplementation 'org.powermock:powermock-classloading-xstream:1.6.1'
 
-    testImplementation 'androidx.test:core:1.1.1-alpha02'
-    androidTestImplementation 'androidx.multidex:multidex:2.0.0'
+    testImplementation 'androidx.test:core:1.3.0-rc03'
+    androidTestImplementation 'androidx.multidex:multidex:2.0.1'
     androidTestImplementation 'androidx.multidex:multidex-instrumentation:2.0.0'
     androidTestImplementation 'com.google.dexmaker:dexmaker:1.2'
     androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.2'
@@ -171,10 +168,9 @@ dependencies {
 
     // Loki
     // Local:
-    implementation "org.whispersystems:signal-service-android:2.13.2" // Run ./gradlew install from loki-messenger-android-service to install
+    implementation "org.whispersystems:signal-service-android:2.13.2" // Run ./gradlew install from session-android-service to install
     implementation "org.whispersystems:curve25519-java:0.5.0"
     // Remote:
-    // implementation "com.github.loki-project:loki-messenger-android-service:dev-SNAPSHOT"
     implementation "com.google.protobuf:protobuf-java:2.5.0"
     implementation "com.fasterxml.jackson.core:jackson-databind:2.9.8"
     implementation "com.squareup.okhttp3:okhttp:3.12.1"