diff --git a/app/src/main/java/org/thoughtcrime/securesms/BlockUnblockDialog.java b/app/src/main/java/org/thoughtcrime/securesms/BlockUnblockDialog.java
index 9da24e2aaa..0f5dd9966b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/BlockUnblockDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/BlockUnblockDialog.java
@@ -13,7 +13,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 
 /**
  * This should be used whenever we want to prompt the user to block/unblock a recipient.
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
index bfc339e053..563a492f3b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ContactSelectionListFragment.java
@@ -85,7 +85,7 @@ import org.thoughtcrime.securesms.util.UsernameUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.adapter.FixedViewsAdapter;
 import org.thoughtcrime.securesms.util.adapter.RecyclerViewConcatenateAdapterStickyHeader;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 
 import java.io.IOException;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java
index 75a7f35633..163295aaca 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/NewConversationActivity.java
@@ -33,7 +33,7 @@ import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 
 import java.io.IOException;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java
index 2938921bf9..d4305c48ed 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java
@@ -28,7 +28,7 @@ import org.thoughtcrime.securesms.util.BitmapDecodingException;
 import org.thoughtcrime.securesms.util.BitmapUtil;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java
index 4427236914..435a1ba6f0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UntrustedSendDialog.java
@@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.crypto.ReentrantSessionLock;
 import org.thoughtcrime.securesms.crypto.storage.SignalIdentityKeyStore;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.whispersystems.signalservice.api.SignalSessionLock;
 
 import java.util.List;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java
index 02bb0519b9..caa7cfe8ee 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/identity/UnverifiedSendDialog.java
@@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.crypto.ReentrantSessionLock;
 import org.thoughtcrime.securesms.database.IdentityDatabase;
 import org.thoughtcrime.securesms.database.model.IdentityRecord;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.whispersystems.signalservice.api.SignalSessionLock;
 
 import java.util.List;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt
index 0c837043e3..077527193f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/internal/InternalSettingsFragment.kt
@@ -9,6 +9,7 @@ import androidx.lifecycle.ViewModelProvider
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.signal.core.util.AppUtil
 import org.signal.core.util.concurrent.SignalExecutors
+import org.signal.core.util.concurrent.SimpleTask
 import org.signal.ringrtc.CallManager
 import org.thoughtcrime.securesms.BuildConfig
 import org.thoughtcrime.securesms.R
@@ -34,7 +35,6 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.payments.DataExportUtil
 import org.thoughtcrime.securesms.util.ConversationUtil
 import org.thoughtcrime.securesms.util.FeatureFlags
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask
 import java.util.Optional
 import java.util.concurrent.TimeUnit
 import kotlin.math.max
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailFragment.kt
index a7fe4bbdfc..9205b5c1d1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/subscription/receipts/detail/DonationReceiptDetailFragment.kt
@@ -13,6 +13,7 @@ import androidx.core.app.ShareCompat
 import androidx.core.view.drawToBitmap
 import androidx.fragment.app.viewModels
 import com.google.android.material.button.MaterialButton
+import org.signal.core.util.concurrent.SimpleTask
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.R
 import org.thoughtcrime.securesms.components.settings.DSLConfiguration
@@ -25,7 +26,6 @@ import org.thoughtcrime.securesms.database.model.DonationReceiptRecord
 import org.thoughtcrime.securesms.payments.FiatMoneyUtil
 import org.thoughtcrime.securesms.providers.BlobProvider
 import org.thoughtcrime.securesms.util.DateUtils
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask
 import java.io.ByteArrayOutputStream
 import java.util.Locale
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackPreparer.java b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackPreparer.java
index 3d45dc3953..cd5955c7d4 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackPreparer.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackPreparer.java
@@ -28,7 +28,7 @@ import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.util.MessageRecordUtil;
 import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/TurnOffContactJoinedNotificationsActivity.java b/app/src/main/java/org/thoughtcrime/securesms/contacts/TurnOffContactJoinedNotificationsActivity.java
index d4c369fb9e..0f8650cbd6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/TurnOffContactJoinedNotificationsActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/TurnOffContactJoinedNotificationsActivity.java
@@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.notifications.MarkReadReceiver;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 
 import java.util.List;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt
index f963e7e9c2..75ced05c1f 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt
@@ -17,6 +17,7 @@ object ContactDiscovery {
 
   private const val MESSAGE_MIMETYPE = "vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.contact"
   private const val CALL_MIMETYPE = "vnd.android.cursor.item/vnd.org.thoughtcrime.securesms.call"
+  private const val CONTACT_TAG = "__TS"
 
   @JvmStatic
   @Throws(IOException::class)
@@ -54,7 +55,8 @@ object ContactDiscovery {
       callPrompt = { e164 -> context.getString(R.string.ContactsDatabase_signal_call_s, e164) },
       e164Formatter = { number -> PhoneNumberFormatter.get(context).format(number) },
       messageMimetype = MESSAGE_MIMETYPE,
-      callMimetype = CALL_MIMETYPE
+      callMimetype = CALL_MIMETYPE,
+      syncTag = CONTACT_TAG
     )
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
index 6abd9accd3..375fc16b4a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
@@ -121,7 +121,6 @@ import org.thoughtcrime.securesms.groups.ui.managegroup.dialogs.GroupDescription
 import org.thoughtcrime.securesms.groups.ui.migration.GroupsV1MigrationInfoBottomSheetDialogFragment;
 import org.thoughtcrime.securesms.groups.v2.GroupBlockJoinRequestResult;
 import org.thoughtcrime.securesms.groups.v2.GroupDescriptionUtil;
-import org.thoughtcrime.securesms.groups.v2.GroupManagementRepository;
 import org.thoughtcrime.securesms.jobs.DirectoryRefreshJob;
 import org.thoughtcrime.securesms.jobs.MultiDeviceViewOnceOpenJob;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
@@ -170,7 +169,7 @@ import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.WindowUtil;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
 import org.thoughtcrime.securesms.verify.VerifyIdentityActivity;
 import org.thoughtcrime.securesms.wallpaper.ChatWallpaper;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationGroupViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationGroupViewModel.java
index 9715b4079c..6c3ee6c2e6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationGroupViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationGroupViewModel.java
@@ -33,7 +33,7 @@ import org.thoughtcrime.securesms.profiles.spoofing.ReviewUtil;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.AsynchronousCallback;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.livedata.LiveDataUtil;
 
 import java.io.IOException;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
index 5ee0703671..6cab2a502c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationParentFragment.java
@@ -294,7 +294,7 @@ import org.thoughtcrime.securesms.util.WindowUtil;
 import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
 import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.views.Stub;
 import org.thoughtcrime.securesms.wallpaper.ChatWallpaper;
 import org.thoughtcrime.securesms.wallpaper.ChatWallpaperDimLevelUtil;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
index 12e27de491..058edca684 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversationlist/ConversationListFragment.java
@@ -151,7 +151,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.WindowUtil;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.task.SnackbarAsyncTask;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 import org.thoughtcrime.securesms.util.views.Stub;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiPageCache.kt b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiPageCache.kt
index 5179c07a35..de9b4eb480 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiPageCache.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/emoji/EmojiPageCache.kt
@@ -5,11 +5,11 @@ import android.graphics.Bitmap
 import android.graphics.BitmapFactory
 import androidx.annotation.MainThread
 import androidx.annotation.WorkerThread
+import org.signal.core.util.concurrent.SimpleTask
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.mms.PartAuthority
 import org.thoughtcrime.securesms.util.ListenableFutureTask
 import org.thoughtcrime.securesms.util.SoftHashMap
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask
 import java.io.IOException
 import java.io.InputStream
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/emoji/JumboEmoji.kt b/app/src/main/java/org/thoughtcrime/securesms/emoji/JumboEmoji.kt
index 4d5724f3ac..fd386b5ada 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/emoji/JumboEmoji.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/emoji/JumboEmoji.kt
@@ -7,6 +7,7 @@ import android.os.SystemClock
 import androidx.annotation.MainThread
 import org.signal.core.util.ThreadUtil
 import org.signal.core.util.concurrent.SignalExecutors
+import org.signal.core.util.concurrent.SimpleTask
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.components.emoji.parsing.EmojiDrawInfo
 import org.thoughtcrime.securesms.emoji.protos.JumbomojiPack
@@ -14,7 +15,6 @@ import org.thoughtcrime.securesms.jobmanager.impl.AutoDownloadEmojiConstraint
 import org.thoughtcrime.securesms.keyvalue.SignalStore
 import org.thoughtcrime.securesms.util.ListenableFutureTask
 import org.thoughtcrime.securesms.util.SoftHashMap
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask
 import java.io.IOException
 import java.util.UUID
 import java.util.concurrent.ExecutionException
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/LeaveGroupDialog.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/LeaveGroupDialog.java
index 42713a423b..015427155a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/LeaveGroupDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/LeaveGroupDialog.java
@@ -19,7 +19,7 @@ import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.groups.GroupManager;
 import org.thoughtcrime.securesms.groups.ui.chooseadmin.ChooseNewAdminActivity;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 
 import java.io.IOException;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersViewModel.java
index a8fef6e6fa..b84cb81340 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addmembers/AddMembersViewModel.java
@@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.whispersystems.signalservice.api.util.Preconditions;
 
 import java.util.List;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/chooseadmin/ChooseNewAdminViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/chooseadmin/ChooseNewAdminViewModel.java
index 21ddda7a97..d786dc2337 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/chooseadmin/ChooseNewAdminViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/chooseadmin/ChooseNewAdminViewModel.java
@@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.groups.LiveGroup;
 import org.thoughtcrime.securesms.groups.ui.GroupChangeResult;
 import org.thoughtcrime.securesms.groups.ui.GroupMemberEntry;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.java
index fe1b144b31..fd49643a96 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/creategroup/CreateGroupActivity.java
@@ -26,7 +26,7 @@ import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.Stopwatch;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 
 import java.io.IOException;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invited/PendingMemberInvitesViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invited/PendingMemberInvitesViewModel.java
index 6b0cd707a1..5828e62d4b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invited/PendingMemberInvitesViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/invitesandrequests/invited/PendingMemberInvitesViewModel.java
@@ -13,7 +13,7 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.groups.GroupId;
 import org.thoughtcrime.securesms.groups.ui.GroupMemberEntry;
 import org.thoughtcrime.securesms.util.DefaultValueLiveData;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/migration/GroupsV1MigrationSuggestionsDialog.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/migration/GroupsV1MigrationSuggestionsDialog.java
index c2916b05b4..358c4594e3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/migration/GroupsV1MigrationSuggestionsDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/migration/GroupsV1MigrationSuggestionsDialog.java
@@ -21,7 +21,7 @@ import org.thoughtcrime.securesms.groups.MembershipNotSuitableForV2Exception;
 import org.thoughtcrime.securesms.groups.ui.GroupMemberListView;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 
 import java.io.IOException;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsRepository.java b/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsRepository.java
index 72805b3487..ec038045ee 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/insights/InsightsRepository.java
@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
 import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/invites/InviteReminderModel.java b/app/src/main/java/org/thoughtcrime/securesms/invites/InviteReminderModel.java
index b94e3efe45..8b4dc42a22 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/invites/InviteReminderModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/invites/InviteReminderModel.java
@@ -13,7 +13,7 @@ import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.recipients.LiveRecipient;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 
 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinRepository.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinRepository.java
index 7cd417b353..b3d590cd95 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmKbsPinRepository.java
@@ -9,7 +9,7 @@ import org.signal.core.util.logging.Log;
 import org.signal.libsignal.protocol.InvalidKeyException;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.pin.PinState;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.whispersystems.signalservice.internal.contacts.crypto.UnauthenticatedResponseException;
 
 import java.io.IOException;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
index 607a2bff6b..354a5edeaf 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/main/MainActivityListHostFragment.kt
@@ -15,6 +15,7 @@ import androidx.fragment.app.viewModels
 import androidx.navigation.NavController
 import androidx.navigation.NavDestination
 import androidx.navigation.findNavController
+import org.signal.core.util.concurrent.SimpleTask
 import org.signal.core.util.logging.Log
 import org.thoughtcrime.securesms.MainActivity
 import org.thoughtcrime.securesms.R
@@ -36,7 +37,6 @@ import org.thoughtcrime.securesms.util.BottomSheetUtil
 import org.thoughtcrime.securesms.util.TopToastPopup
 import org.thoughtcrime.securesms.util.TopToastPopup.Companion.show
 import org.thoughtcrime.securesms.util.Util
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask
 import org.thoughtcrime.securesms.util.views.Stub
 import org.thoughtcrime.securesms.util.visible
 import org.whispersystems.signalservice.api.websocket.WebSocketConnectionState
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewActivity.java
index 7f962b36d2..16faad727c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediaoverview/MediaOverviewActivity.java
@@ -47,7 +47,7 @@ import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.loaders.MediaLoader;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
 import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java
index 0489c0cc84..047455da8b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediapreview/MediaPreviewFragment.java
@@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.attachments.AttachmentId;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.mms.PartUriParser;
 import org.thoughtcrime.securesms.util.MediaUtil;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 
 import java.util.Objects;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
index d09525a86f..a6c51d3481 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/CameraXFragment.java
@@ -52,7 +52,7 @@ import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.MemoryFileDescriptor;
 import org.thoughtcrime.securesms.util.Stopwatch;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.video.VideoUtil;
 
 import java.io.FileDescriptor;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentRecipientSelectionFragment.java b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentRecipientSelectionFragment.java
index d062b1b787..ee8f68d5a3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentRecipientSelectionFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/payments/preferences/PaymentRecipientSelectionFragment.java
@@ -22,7 +22,7 @@ import org.thoughtcrime.securesms.payments.preferences.model.PayeeParcelable;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.ViewUtil;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
 
 import java.util.Optional;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/pin/PinOptOutDialog.java b/app/src/main/java/org/thoughtcrime/securesms/pin/PinOptOutDialog.java
index bc8eee2163..c366f24fb2 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/pin/PinOptOutDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/pin/PinOptOutDialog.java
@@ -8,7 +8,7 @@ import androidx.core.content.ContextCompat;
 
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 
 public final class PinOptOutDialog {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/pin/RegistrationLockV2Dialog.java b/app/src/main/java/org/thoughtcrime/securesms/pin/RegistrationLockV2Dialog.java
index ef94feecff..14e037d300 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/pin/RegistrationLockV2Dialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/pin/RegistrationLockV2Dialog.java
@@ -11,7 +11,7 @@ import androidx.appcompat.app.AlertDialog;
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 
 import java.io.IOException;
 import java.util.Objects;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditGroupProfileRepository.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditGroupProfileRepository.java
index 237801ae27..0c561a7880 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditGroupProfileRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditGroupProfileRepository.java
@@ -19,7 +19,7 @@ import org.thoughtcrime.securesms.profiles.AvatarHelper;
 import org.thoughtcrime.securesms.profiles.ProfileName;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 
 import java.io.IOException;
 import java.util.Optional;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java
index b03527324a..4f8b680876 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditProfileFragment.java
@@ -42,7 +42,7 @@ import org.thoughtcrime.securesms.profiles.manage.EditProfileNameFragment;
 import org.thoughtcrime.securesms.providers.BlobProvider;
 import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
 import org.thoughtcrime.securesms.util.text.AfterTextChanged;
 import org.thoughtcrime.securesms.util.views.LearnMoreTextView;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditSelfProfileRepository.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditSelfProfileRepository.java
index 42d07acfdb..ed8f121cee 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditSelfProfileRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditSelfProfileRepository.java
@@ -24,7 +24,7 @@ import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.registration.RegistrationUtil;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ratelimit/RecaptchaProofActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ratelimit/RecaptchaProofActivity.java
index 783e8ee09b..3a6af56c57 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ratelimit/RecaptchaProofActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/ratelimit/RecaptchaProofActivity.java
@@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.keyvalue.SignalStore;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogRepository.java b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogRepository.java
index 7c08c75e26..86c534263c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogRepository.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/recipients/ui/bottomsheet/RecipientDialogRepository.java
@@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.groups.ui.GroupChangeErrorCallback;
 import org.thoughtcrime.securesms.groups.ui.GroupChangeFailureReason;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterSmsCodeFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterSmsCodeFragment.java
index 0f109362e2..0f0cd5994a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterSmsCodeFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterSmsCodeFragment.java
@@ -9,7 +9,7 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.registration.viewmodel.RegistrationViewModel;
 import org.thoughtcrime.securesms.util.FeatureFlags;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
 
 import java.io.IOException;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java
index b65355b5b8..b87eb147b5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RegistrationLockFragment.java
@@ -16,7 +16,7 @@ import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.Stopwatch;
 import org.thoughtcrime.securesms.util.SupportEmailUtil;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
 
 import java.io.IOException;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java
index 928dbd5578..258c425dd1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fragments/RestoreBackupFragment.java
@@ -56,7 +56,7 @@ import org.thoughtcrime.securesms.service.LocalBackupListener;
 import org.thoughtcrime.securesms.util.BackupUtil;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.navigation.SafeNavigation;
 
 import java.io.IOException;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
index 349ca8e525..de08ce0344 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java
@@ -61,7 +61,7 @@ import org.thoughtcrime.securesms.util.StorageUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.ThrottledDebouncer;
 import org.thoughtcrime.securesms.util.ViewUtil;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 
 import java.io.ByteArrayOutputStream;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java b/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java
index 786fc067e0..f51de2c9ae 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/sharing/MultiShareSender.java
@@ -33,7 +33,7 @@ import org.thoughtcrime.securesms.sms.OutgoingEncryptedMessage;
 import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
 import org.thoughtcrime.securesms.util.MessageUtil;
 import org.thoughtcrime.securesms.util.Util;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareActivity.java b/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareActivity.java
index 7b1918e119..fdce1974cb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/sharing/ShareActivity.java
@@ -67,7 +67,7 @@ import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.LifecycleDisposable;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 
 import java.util.ArrayList;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java b/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java
index e135e8e217..77bef7c399 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java
@@ -37,7 +37,7 @@ import org.thoughtcrime.securesms.permissions.Permissions;
 import org.thoughtcrime.securesms.proxy.ProxyBottomSheetFragment;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.sms.MessageSender;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.thoughtcrime.securesms.util.views.SimpleProgressDialog;
 
 import java.io.IOException;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java
index e10f440fa7..f62c51f69a 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/IdentityUtil.java
@@ -33,7 +33,7 @@ import org.thoughtcrime.securesms.sms.OutgoingIdentityVerifiedMessage;
 import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture;
 import org.thoughtcrime.securesms.util.concurrent.SettableFuture;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.whispersystems.signalservice.api.SignalSessionLock;
 import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
 import org.whispersystems.signalservice.api.push.SignalServiceAddress;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayFragment.java b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayFragment.java
index f4e5fdaf9b..a3a43c7b34 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/verify/VerifyDisplayFragment.java
@@ -63,7 +63,7 @@ import org.thoughtcrime.securesms.util.FeatureFlags;
 import org.thoughtcrime.securesms.util.IdentityUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 import org.whispersystems.signalservice.api.SignalSessionLock;
 
 import java.nio.charset.Charset;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/webrtc/VoiceCallShare.java b/app/src/main/java/org/thoughtcrime/securesms/webrtc/VoiceCallShare.java
index 6d05e712de..e54e8c1b84 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/webrtc/VoiceCallShare.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/webrtc/VoiceCallShare.java
@@ -11,7 +11,7 @@ import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.WebRtcCallActivity;
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
 import org.thoughtcrime.securesms.recipients.Recipient;
-import org.thoughtcrime.securesms.util.concurrent.SimpleTask;
+import org.signal.core.util.concurrent.SimpleTask;
 
 public class VoiceCallShare extends Activity {
   
diff --git a/contacts/app/build.gradle b/contacts/app/build.gradle
index 3fa1875fed..bcd392831d 100644
--- a/contacts/app/build.gradle
+++ b/contacts/app/build.gradle
@@ -13,7 +13,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        minSdkVersion 19
+        minSdkVersion 21
         targetSdkVersion TARGET_SDK
         multiDexEnabled true
     }
diff --git a/contacts/app/src/main/AndroidManifest.xml b/contacts/app/src/main/AndroidManifest.xml
index cbc7ad4961..29356491c8 100644
--- a/contacts/app/src/main/AndroidManifest.xml
+++ b/contacts/app/src/main/AndroidManifest.xml
@@ -23,7 +23,6 @@
             android:name=".ContactsActivity"
             android:exported="false" />
 
-
         <service
             android:name=".AccountAuthenticatorService"
             android:exported="true">
@@ -34,6 +33,21 @@
                 android:name="android.accounts.AccountAuthenticator"
                 android:resource="@xml/authenticator" />
         </service>
+
+        <service
+            android:name=".ContactsSyncAdapterService"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.content.SyncAdapter" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.content.SyncAdapter"
+                android:resource="@xml/syncadapter" />
+            <meta-data
+                android:name="android.provider.CONTACTS_STRUCTURE"
+                android:resource="@xml/contactsformat" />
+        </service>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/contacts/app/src/main/java/org/signal/contactstest/ContactsSyncAdapter.kt b/contacts/app/src/main/java/org/signal/contactstest/ContactsSyncAdapter.kt
new file mode 100644
index 0000000000..63719ba8d5
--- /dev/null
+++ b/contacts/app/src/main/java/org/signal/contactstest/ContactsSyncAdapter.kt
@@ -0,0 +1,33 @@
+package org.signal.contactstest
+
+import android.accounts.Account
+import android.content.AbstractThreadedSyncAdapter
+import android.content.ContentProviderClient
+import android.content.Context
+import android.content.SyncResult
+import android.os.Bundle
+import org.signal.core.util.logging.Log
+
+class ContactsSyncAdapter(context: Context?, autoInitialize: Boolean) : AbstractThreadedSyncAdapter(context, autoInitialize) {
+  override fun onPerformSync(
+    account: Account,
+    extras: Bundle,
+    authority: String,
+    provider: ContentProviderClient,
+    syncResult: SyncResult
+  ) {
+    Log.i(TAG, "onPerformSync()")
+  }
+
+  override fun onSyncCanceled() {
+    Log.w(TAG, "onSyncCanceled()")
+  }
+
+  override fun onSyncCanceled(thread: Thread) {
+    Log.w(TAG, "onSyncCanceled($thread)")
+  }
+
+  companion object {
+    private val TAG = Log.tag(ContactsSyncAdapter::class.java)
+  }
+}
diff --git a/contacts/app/src/main/java/org/signal/contactstest/ContactsSyncAdapterService.kt b/contacts/app/src/main/java/org/signal/contactstest/ContactsSyncAdapterService.kt
new file mode 100644
index 0000000000..5c619c593d
--- /dev/null
+++ b/contacts/app/src/main/java/org/signal/contactstest/ContactsSyncAdapterService.kt
@@ -0,0 +1,22 @@
+package org.signal.contactstest
+
+import android.app.Service
+import android.content.Intent
+import android.os.IBinder
+
+class ContactsSyncAdapterService : Service() {
+  @Synchronized
+  override fun onCreate() {
+    if (syncAdapter == null) {
+      syncAdapter = ContactsSyncAdapter(this, true)
+    }
+  }
+
+  override fun onBind(intent: Intent): IBinder? {
+    return syncAdapter!!.syncAdapterBinder
+  }
+
+  companion object {
+    private var syncAdapter: ContactsSyncAdapter? = null
+  }
+}
diff --git a/contacts/app/src/main/java/org/signal/contactstest/MainActivity.kt b/contacts/app/src/main/java/org/signal/contactstest/MainActivity.kt
index d14fe65350..89fe336a58 100644
--- a/contacts/app/src/main/java/org/signal/contactstest/MainActivity.kt
+++ b/contacts/app/src/main/java/org/signal/contactstest/MainActivity.kt
@@ -1,13 +1,19 @@
 package org.signal.contactstest
 
 import android.Manifest
+import android.accounts.Account
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Bundle
+import android.telephony.PhoneNumberUtils
 import android.widget.Button
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import org.signal.contacts.ContactLinkConfiguration
+import org.signal.contacts.SystemContactsRepository
+import org.signal.core.util.concurrent.SimpleTask
 import org.signal.core.util.logging.Log
 
 class MainActivity : AppCompatActivity() {
@@ -22,15 +28,64 @@ class MainActivity : AppCompatActivity() {
 
     setContentView(R.layout.activity_main)
 
-    if (hasPermission(Manifest.permission.READ_CONTACTS) && hasPermission(Manifest.permission.WRITE_CONTACTS)) {
-      Log.i(TAG, "Already have permission.")
-      startActivity(Intent(this, ContactsActivity::class.java))
-      finish()
-      return
+    findViewById<Button>(R.id.contact_list_button).setOnClickListener { v ->
+      if (hasPermission(Manifest.permission.READ_CONTACTS) && hasPermission(Manifest.permission.WRITE_CONTACTS)) {
+        startActivity(Intent(this, ContactsActivity::class.java))
+        finish()
+      } else {
+        ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS), PERMISSION_CODE)
+      }
     }
 
-    findViewById<Button>(R.id.permission_button).setOnClickListener { v ->
-      requestPermissions(arrayOf(Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS), PERMISSION_CODE)
+    findViewById<Button>(R.id.link_contacts_button).setOnClickListener { v ->
+      if (hasPermission(Manifest.permission.READ_CONTACTS) && hasPermission(Manifest.permission.WRITE_CONTACTS)) {
+        SimpleTask.run({
+          val allE164s: Set<String> = SystemContactsRepository.getAllDisplayNumbers(this).map { PhoneNumberUtils.formatNumberToE164(it, "US") }.toSet()
+          val account: Account = SystemContactsRepository.getOrCreateSystemAccount(this, BuildConfig.APPLICATION_ID, "Contact Test") ?: return@run false
+
+          SystemContactsRepository.addMessageAndCallLinksToContacts(
+            context = this,
+            config = buildLinkConfig(account),
+            targetE164s = allE164s,
+            removeIfMissing = true
+          )
+
+          return@run true
+        }, { success ->
+          if (success) {
+            Toast.makeText(this, "Success!", Toast.LENGTH_SHORT).show()
+          } else {
+            Toast.makeText(this, "Failed to create account!", Toast.LENGTH_SHORT).show()
+          }
+        })
+      } else {
+        ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS), PERMISSION_CODE)
+      }
+    }
+
+    findViewById<Button>(R.id.unlink_contact_button).setOnClickListener { v ->
+      if (hasPermission(Manifest.permission.READ_CONTACTS) && hasPermission(Manifest.permission.WRITE_CONTACTS)) {
+        SimpleTask.run({
+          val account: Account = SystemContactsRepository.getOrCreateSystemAccount(this, BuildConfig.APPLICATION_ID, "Contact Test") ?: return@run false
+
+          SystemContactsRepository.addMessageAndCallLinksToContacts(
+            context = this,
+            config = buildLinkConfig(account),
+            targetE164s = emptySet(),
+            removeIfMissing = true
+          )
+
+          return@run true
+        }, { success ->
+          if (success) {
+            Toast.makeText(this, "Success!", Toast.LENGTH_SHORT).show()
+          } else {
+            Toast.makeText(this, "Failed to create account!", Toast.LENGTH_SHORT).show()
+          }
+        })
+      } else {
+        ActivityCompat.requestPermissions(this, arrayOf(Manifest.permission.READ_CONTACTS, Manifest.permission.WRITE_CONTACTS), PERMISSION_CODE)
+      }
     }
   }
 
@@ -48,4 +103,17 @@ class MainActivity : AppCompatActivity() {
   private fun hasPermission(permission: String): Boolean {
     return ContextCompat.checkSelfPermission(this, permission) == PackageManager.PERMISSION_GRANTED
   }
+
+  private fun buildLinkConfig(account: Account): ContactLinkConfiguration {
+    return ContactLinkConfiguration(
+      account = account,
+      appName = "Contact Test",
+      messagePrompt = { "(Test) Message $it" },
+      callPrompt = { "(Test) Call $it" },
+      e164Formatter = { PhoneNumberUtils.formatNumberToE164(it, "US") },
+      messageMimetype = "vnd.android.cursor.item/vnd.org.signal.contacts.test.message",
+      callMimetype = "vnd.android.cursor.item/vnd.org.signal.contacts.test.call",
+      syncTag = "__TEST"
+    )
+  }
 }
diff --git a/contacts/app/src/main/res/layout/activity_contacts.xml b/contacts/app/src/main/res/layout/activity_contacts.xml
index 065b5d4f6d..f4dc2016ff 100644
--- a/contacts/app/src/main/res/layout/activity_contacts.xml
+++ b/contacts/app/src/main/res/layout/activity_contacts.xml
@@ -10,6 +10,8 @@
   <androidx.recyclerview.widget.RecyclerView
       android:id="@+id/list"
       android:layout_width="match_parent"
-      android:layout_height="match_parent" />
+      android:layout_height="match_parent"
+      android:clipToPadding="false"
+      android:clipChildren="false" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/contacts/app/src/main/res/layout/activity_main.xml b/contacts/app/src/main/res/layout/activity_main.xml
index 2c2e442a7f..08f9c87126 100644
--- a/contacts/app/src/main/res/layout/activity_main.xml
+++ b/contacts/app/src/main/res/layout/activity_main.xml
@@ -7,13 +7,34 @@
     tools:context=".MainActivity">
 
     <Button
-        android:id="@+id/permission_button"
+        android:id="@+id/contact_list_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Permissions"
+        android:text="Contact List"
+        app:layout_constraintBottom_toTopOf="@id/link_contacts_button"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed"/>
+
+    <Button
+        android:id="@+id/link_contacts_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Link Contacts"
+        app:layout_constraintBottom_toTopOf="@id/unlink_contact_button"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/contact_list_button" />
+
+    <Button
+        android:id="@+id/unlink_contact_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Unlink Contacts"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@id/link_contacts_button" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/contacts/app/src/main/res/layout/child_item.xml b/contacts/app/src/main/res/layout/child_item.xml
index b083b5f0db..d1abfcfb0a 100644
--- a/contacts/app/src/main/res/layout/child_item.xml
+++ b/contacts/app/src/main/res/layout/child_item.xml
@@ -29,7 +29,6 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="4dp"
             android:layout_marginBottom="2dp"
-            android:fontFamily="monospace"
             tools:text="Spider-Man"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toEndOf="@id/contact_photo"
diff --git a/contacts/app/src/main/res/layout/parent_item.xml b/contacts/app/src/main/res/layout/parent_item.xml
index 8c4ced1362..e6552ceedc 100644
--- a/contacts/app/src/main/res/layout/parent_item.xml
+++ b/contacts/app/src/main/res/layout/parent_item.xml
@@ -29,7 +29,6 @@
           android:id="@+id/given_name"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:fontFamily="monospace"
           tools:text="Spider-Man"/>
 
       <TextView
@@ -37,7 +36,6 @@
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
           android:layout_marginBottom="4dp"
-          android:fontFamily="monospace"
           tools:text="Spider-Man"/>
 
       <androidx.recyclerview.widget.RecyclerView
diff --git a/contacts/app/src/main/res/xml/contactsformat.xml b/contacts/app/src/main/res/xml/contactsformat.xml
new file mode 100644
index 0000000000..01fb78ec57
--- /dev/null
+++ b/contacts/app/src/main/res/xml/contactsformat.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ContactsSource
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <ContactsDataKind
+        android:detailColumn="data3"
+        android:detailSocialSummary="true"
+        android:icon="@mipmap/ic_launcher"
+        android:mimeType="vnd.android.cursor.item/vnd.org.signal.contacts.test.message"
+        android:summaryColumn="data2" />
+    <ContactsDataKind
+        android:detailColumn="data3"
+        android:icon="@mipmap/ic_launcher"
+        android:mimeType="vnd.android.cursor.item/vnd.org.signal.contacts.test.call"
+        android:summaryColumn="data2" />
+</ContactsSource>
diff --git a/contacts/app/src/main/res/xml/syncadapter.xml b/contacts/app/src/main/res/xml/syncadapter.xml
new file mode 100644
index 0000000000..9b6e8b1044
--- /dev/null
+++ b/contacts/app/src/main/res/xml/syncadapter.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<sync-adapter
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:accountType="org.signal.contactstest"
+    android:allowParallelSyncs="false"
+    android:contentAuthority="com.android.contacts"
+    android:isAlwaysSyncable="true"
+    android:supportsUploading="true"
+    android:userVisible="true" />
\ No newline at end of file
diff --git a/contacts/lib/src/main/java/org/signal/contacts/ContactLinkConfiguration.kt b/contacts/lib/src/main/java/org/signal/contacts/ContactLinkConfiguration.kt
index aecef161f0..3d32e63e7d 100644
--- a/contacts/lib/src/main/java/org/signal/contacts/ContactLinkConfiguration.kt
+++ b/contacts/lib/src/main/java/org/signal/contacts/ContactLinkConfiguration.kt
@@ -20,4 +20,5 @@ class ContactLinkConfiguration(
   val e164Formatter: (String) -> String,
   val messageMimetype: String,
   val callMimetype: String,
+  val syncTag: String
 )
diff --git a/contacts/lib/src/main/java/org/signal/contacts/SystemContactsRepository.kt b/contacts/lib/src/main/java/org/signal/contacts/SystemContactsRepository.kt
index a6a715a34f..6a3a1ebc18 100644
--- a/contacts/lib/src/main/java/org/signal/contacts/SystemContactsRepository.kt
+++ b/contacts/lib/src/main/java/org/signal/contacts/SystemContactsRepository.kt
@@ -26,7 +26,6 @@ import java.util.Objects
 object SystemContactsRepository {
 
   private val TAG = Log.tag(SystemContactsRepository::class.java)
-  private const val SYNC_TAG = "__TS"
 
   private const val FIELD_FORMATTED_PHONE = ContactsContract.RawContacts.SYNC1
   private const val FIELD_TAG = ContactsContract.Data.SYNC2
@@ -146,7 +145,7 @@ object SystemContactsRepository {
     removeIfMissing: Boolean
   ) {
     val operations: ArrayList<ContentProviderOperation> = ArrayList()
-    val currentLinkedContacts: Map<String, RawContactDetails> = getRawContactsByE164(context, config.account, config.e164Formatter)
+    val currentLinkedContacts: Map<String, LinkedContactDetails> = getLinkedContactsByE164(context, config.account, config.e164Formatter)
 
     val targetChunks: List<List<String>> = targetE164s.chunked(50).toList()
     for (targetChunk in targetChunks) {
@@ -157,15 +156,8 @@ object SystemContactsRepository {
             Log.i(TAG, "Adding number: $target")
             operations += buildAddRawContactOperations(
               operationIndex = operations.size,
-              account = config.account,
-              appName = config.appName,
-              messagePrompt = config.messagePrompt,
-              callPrompt = config.callPrompt,
-              formattedPhone = systemContactInfo.formattedPhone,
-              displayName = systemContactInfo.displayName,
-              aggregateId = systemContactInfo.rawContactId,
-              messageMimetype = config.messageMimetype,
-              callMimetype = config.callMimetype
+              linkConfig = config,
+              systemContactInfo = systemContactInfo
             )
           }
         }
@@ -181,7 +173,7 @@ object SystemContactsRepository {
       if (!targetE164s.contains(e164)) {
         if (removeIfMissing) {
           Log.i(TAG, "Removing number: $e164")
-          removeTextSecureRawContact(operations, config.account, details.id)
+          removeLinkedContact(operations, config.account, details.id)
         }
       } else if (!Objects.equals(details.rawDisplayName, details.aggregateDisplayName)) {
         Log.i(TAG, "Updating display name: $e164")
@@ -372,15 +364,8 @@ object SystemContactsRepository {
 
   private fun buildAddRawContactOperations(
     operationIndex: Int,
-    account: Account,
-    appName: String,
-    messagePrompt: (String) -> String,
-    callPrompt: (String) -> String,
-    formattedPhone: String,
-    displayName: String?,
-    aggregateId: Long,
-    messageMimetype: String,
-    callMimetype: String
+    linkConfig: ContactLinkConfiguration,
+    systemContactInfo: SystemContactInfo
   ): List<ContentProviderOperation> {
     val dataUri = ContactsContract.Data.CONTENT_URI.buildUpon()
       .appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true")
@@ -388,59 +373,60 @@ object SystemContactsRepository {
 
     return listOf(
       ContentProviderOperation.newInsert(ContactsContract.RawContacts.CONTENT_URI)
-        .withValue(ContactsContract.RawContacts.ACCOUNT_NAME, account.name)
-        .withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, account.type)
-        .withValue(FIELD_FORMATTED_PHONE, formattedPhone)
+        .withValue(ContactsContract.RawContacts.ACCOUNT_NAME, linkConfig.account.name)
+        .withValue(ContactsContract.RawContacts.ACCOUNT_TYPE, linkConfig.account.type)
+        .withValue(FIELD_FORMATTED_PHONE, systemContactInfo.formattedPhone)
         .withValue(FIELD_SUPPORTS_VOICE, true.toString())
         .build(),
 
       ContentProviderOperation.newInsert(dataUri)
         .withValueBackReference(ContactsContract.CommonDataKinds.StructuredName.RAW_CONTACT_ID, operationIndex)
-        .withValue(ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME, displayName)
+        .withValue(ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME, systemContactInfo.displayName)
         .withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE)
         .build(),
 
       ContentProviderOperation.newInsert(dataUri)
         .withValueBackReference(ContactsContract.CommonDataKinds.Phone.RAW_CONTACT_ID, operationIndex)
         .withValue(ContactsContract.Data.MIMETYPE, ContactsContract.CommonDataKinds.Phone.CONTENT_ITEM_TYPE)
-        .withValue(ContactsContract.CommonDataKinds.Phone.NUMBER, formattedPhone)
-        .withValue(ContactsContract.CommonDataKinds.Phone.TYPE, ContactsContract.CommonDataKinds.Phone.TYPE_OTHER)
-        .withValue(FIELD_TAG, SYNC_TAG)
+        .withValue(ContactsContract.CommonDataKinds.Phone.NUMBER, systemContactInfo.formattedPhone)
+        .withValue(ContactsContract.CommonDataKinds.Phone.TYPE, systemContactInfo.type)
+        .withValue(FIELD_TAG, linkConfig.syncTag)
         .build(),
 
       ContentProviderOperation.newInsert(dataUri)
         .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, operationIndex)
-        .withValue(ContactsContract.Data.MIMETYPE, messageMimetype)
-        .withValue(ContactsContract.Data.DATA1, formattedPhone)
-        .withValue(ContactsContract.Data.DATA2, appName)
-        .withValue(ContactsContract.Data.DATA3, messagePrompt(formattedPhone))
+        .withValue(ContactsContract.Data.MIMETYPE, linkConfig.messageMimetype)
+        .withValue(ContactsContract.Data.DATA1, systemContactInfo.formattedPhone)
+        .withValue(ContactsContract.Data.DATA2, linkConfig.appName)
+        .withValue(ContactsContract.Data.DATA3, linkConfig.messagePrompt(systemContactInfo.formattedPhone))
         .withYieldAllowed(true)
         .build(),
 
       ContentProviderOperation.newInsert(dataUri)
         .withValueBackReference(ContactsContract.Data.RAW_CONTACT_ID, operationIndex)
-        .withValue(ContactsContract.Data.MIMETYPE, callMimetype)
-        .withValue(ContactsContract.Data.DATA1, formattedPhone)
-        .withValue(ContactsContract.Data.DATA2, appName)
-        .withValue(ContactsContract.Data.DATA3, callPrompt(formattedPhone))
+        .withValue(ContactsContract.Data.MIMETYPE, linkConfig.callMimetype)
+        .withValue(ContactsContract.Data.DATA1, systemContactInfo.formattedPhone)
+        .withValue(ContactsContract.Data.DATA2, linkConfig.appName)
+        .withValue(ContactsContract.Data.DATA3, linkConfig.callPrompt(systemContactInfo.formattedPhone))
         .withYieldAllowed(true)
         .build(),
 
       ContentProviderOperation.newUpdate(ContactsContract.AggregationExceptions.CONTENT_URI)
-        .withValue(ContactsContract.AggregationExceptions.RAW_CONTACT_ID1, aggregateId)
+        .withValue(ContactsContract.AggregationExceptions.RAW_CONTACT_ID1, systemContactInfo.rawContactId)
         .withValueBackReference(ContactsContract.AggregationExceptions.RAW_CONTACT_ID2, operationIndex)
         .withValue(ContactsContract.AggregationExceptions.TYPE, ContactsContract.AggregationExceptions.TYPE_KEEP_TOGETHER)
         .build()
     )
   }
 
-  private fun removeTextSecureRawContact(operations: MutableList<ContentProviderOperation>, account: Account, rowId: Long) {
+  private fun removeLinkedContact(operations: MutableList<ContentProviderOperation>, account: Account, rowId: Long) {
     operations.add(
       ContentProviderOperation.newDelete(
         ContactsContract.RawContacts.CONTENT_URI.buildUpon()
           .appendQueryParameter(ContactsContract.RawContacts.ACCOUNT_NAME, account.name)
           .appendQueryParameter(ContactsContract.RawContacts.ACCOUNT_TYPE, account.type)
-          .appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true").build()
+          .appendQueryParameter(ContactsContract.CALLER_IS_SYNCADAPTER, "true")
+          .build()
       )
         .withYieldAllowed(true)
         .withSelection("${BaseColumns._ID} = ?", SqlUtil.buildArgs(rowId))
@@ -448,7 +434,7 @@ object SystemContactsRepository {
     )
   }
 
-  private fun getRawContactsByE164(context: Context, account: Account, e164Formatter: (String) -> String): Map<String, RawContactDetails> {
+  private fun getLinkedContactsByE164(context: Context, account: Account, e164Formatter: (String) -> String): Map<String, LinkedContactDetails> {
     val currentContactsUri = ContactsContract.RawContacts.CONTENT_URI.buildUpon()
       .appendQueryParameter(ContactsContract.RawContacts.ACCOUNT_NAME, account.name)
       .appendQueryParameter(ContactsContract.RawContacts.ACCOUNT_TYPE, account.type).build()
@@ -461,7 +447,7 @@ object SystemContactsRepository {
       ContactsContract.RawContacts.DISPLAY_NAME_SOURCE
     )
 
-    val contactsDetails: MutableMap<String, RawContactDetails> = HashMap()
+    val contactsDetails: MutableMap<String, LinkedContactDetails> = HashMap()
 
     context.contentResolver.query(currentContactsUri, projection, null, null, null)?.use { cursor ->
       while (cursor.moveToNext()) {
@@ -470,7 +456,7 @@ object SystemContactsRepository {
         if (formattedPhone != null) {
           val e164 = e164Formatter(formattedPhone)
 
-          contactsDetails[e164] = RawContactDetails(
+          contactsDetails[e164] = LinkedContactDetails(
             id = cursor.requireLong(BaseColumns._ID),
             supportsVoice = cursor.requireString(FIELD_SUPPORTS_VOICE),
             rawDisplayName = cursor.requireString(ContactsContract.RawContacts.DISPLAY_NAME_PRIMARY),
@@ -489,7 +475,8 @@ object SystemContactsRepository {
     val projection = arrayOf(
       ContactsContract.PhoneLookup.NUMBER,
       ContactsContract.PhoneLookup._ID,
-      ContactsContract.PhoneLookup.DISPLAY_NAME
+      ContactsContract.PhoneLookup.DISPLAY_NAME,
+      ContactsContract.PhoneLookup.TYPE
     )
 
     context.contentResolver.query(uri, projection, null, null, null)?.use { contactCursor ->
@@ -503,7 +490,8 @@ object SystemContactsRepository {
               return SystemContactInfo(
                 displayName = contactCursor.requireString(ContactsContract.PhoneLookup.DISPLAY_NAME),
                 formattedPhone = systemNumber,
-                rawContactId = idCursor.requireLong(ContactsContract.RawContacts._ID)
+                rawContactId = idCursor.requireLong(ContactsContract.RawContacts._ID),
+                type = contactCursor.requireInt(ContactsContract.PhoneLookup.TYPE)
               )
             }
           }
@@ -530,7 +518,8 @@ object SystemContactsRepository {
 
   interface ContactIterator : Iterator<ContactDetails>, Closeable {
     @Throws
-    override fun close() {}
+    override fun close() {
+    }
   }
 
   private class EmptyContactIterator : ContactIterator {
@@ -718,7 +707,7 @@ object SystemContactsRepository {
     val country: String?
   )
 
-  private data class RawContactDetails(
+  private data class LinkedContactDetails(
     val id: Long,
     val supportsVoice: String?,
     val rawDisplayName: String?,
@@ -729,7 +718,8 @@ object SystemContactsRepository {
   private data class SystemContactInfo(
     val displayName: String?,
     val formattedPhone: String,
-    val rawContactId: Long
+    val rawContactId: Long,
+    val type: Int
   )
 
   private data class StructuredName(val givenName: String?, val familyName: String?)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/concurrent/SimpleTask.java b/core-util/src/main/java/org/signal/core/util/concurrent/SimpleTask.java
similarity index 97%
rename from app/src/main/java/org/thoughtcrime/securesms/util/concurrent/SimpleTask.java
rename to core-util/src/main/java/org/signal/core/util/concurrent/SimpleTask.java
index 0ddb5540c4..b4004bdf65 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/concurrent/SimpleTask.java
+++ b/core-util/src/main/java/org/signal/core/util/concurrent/SimpleTask.java
@@ -1,4 +1,4 @@
-package org.thoughtcrime.securesms.util.concurrent;
+package org.signal.core.util.concurrent;
 
 import android.os.AsyncTask;