From 3dcc2d817118bf25f0d9fecd47f174352fd27bf9 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Fri, 6 Sep 2019 10:27:45 -0400 Subject: [PATCH] Moved DirectoryHelper. --- .../thoughtcrime/securesms/ContactSelectionActivity.java | 2 +- .../securesms/ContactSelectionListFragment.java | 2 +- .../securesms/contacts/ContactsSyncAdapter.java | 3 ++- .../securesms/{util => contacts/sync}/DirectoryHelper.java | 7 ++++--- .../securesms/conversation/ConversationActivity.java | 2 +- .../thoughtcrime/securesms/jobs/DirectoryRefreshJob.java | 2 +- .../securesms/migrations/RecipientSearchMigrationJob.java | 2 +- 7 files changed, 11 insertions(+), 9 deletions(-) rename src/org/thoughtcrime/securesms/{util => contacts/sync}/DirectoryHelper.java (99%) diff --git a/src/org/thoughtcrime/securesms/ContactSelectionActivity.java b/src/org/thoughtcrime/securesms/ContactSelectionActivity.java index ddf7f6323e..207833bba1 100644 --- a/src/org/thoughtcrime/securesms/ContactSelectionActivity.java +++ b/src/org/thoughtcrime/securesms/ContactSelectionActivity.java @@ -25,7 +25,7 @@ import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.components.ContactFilterToolbar; import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode; -import org.thoughtcrime.securesms.util.DirectoryHelper; +import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper; import org.thoughtcrime.securesms.util.DynamicLanguage; import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme; import org.thoughtcrime.securesms.util.DynamicTheme; diff --git a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java index 29b39906fb..d7cdf91d88 100644 --- a/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java +++ b/src/org/thoughtcrime/securesms/ContactSelectionListFragment.java @@ -50,7 +50,7 @@ import org.thoughtcrime.securesms.contacts.ContactsCursorLoader.DisplayMode; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.permissions.Permissions; -import org.thoughtcrime.securesms.util.DirectoryHelper; +import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper; import org.thoughtcrime.securesms.util.StickyHeaderDecoration; import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.ViewUtil; diff --git a/src/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java b/src/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java index 71d3b790d1..d1de25c3a1 100644 --- a/src/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java +++ b/src/org/thoughtcrime/securesms/contacts/ContactsSyncAdapter.java @@ -6,9 +6,10 @@ import android.content.ContentProviderClient; import android.content.Context; import android.content.SyncResult; import android.os.Bundle; + +import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper; import org.thoughtcrime.securesms.logging.Log; -import org.thoughtcrime.securesms.util.DirectoryHelper; import org.thoughtcrime.securesms.util.TextSecurePreferences; import java.io.IOException; diff --git a/src/org/thoughtcrime/securesms/util/DirectoryHelper.java b/src/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java similarity index 99% rename from src/org/thoughtcrime/securesms/util/DirectoryHelper.java rename to src/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java index c79b216337..794255503f 100644 --- a/src/org/thoughtcrime/securesms/util/DirectoryHelper.java +++ b/src/org/thoughtcrime/securesms/contacts/sync/DirectoryHelper.java @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.util; +package org.thoughtcrime.securesms.contacts.sync; import android.Manifest; import android.accounts.Account; @@ -16,15 +16,14 @@ import androidx.annotation.Nullable; import android.text.TextUtils; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; +import org.thoughtcrime.securesms.contacts.ContactAccessor; import org.thoughtcrime.securesms.logging.Log; import com.annimon.stream.Collectors; import com.annimon.stream.Stream; -import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.BuildConfig; import org.thoughtcrime.securesms.R; -import org.thoughtcrime.securesms.contacts.ContactAccessor; import org.thoughtcrime.securesms.crypto.SessionUtil; import org.thoughtcrime.securesms.database.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; @@ -40,6 +39,8 @@ import org.thoughtcrime.securesms.push.IasTrustStore; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.sms.IncomingJoinedMessage; +import org.thoughtcrime.securesms.util.TextSecurePreferences; +import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.concurrent.SignalExecutors; import org.whispersystems.libsignal.util.guava.Optional; import org.whispersystems.signalservice.api.SignalServiceAccountManager; diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 50f02d2f7d..db57dc89e1 100644 --- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -209,8 +209,8 @@ import org.thoughtcrime.securesms.util.BitmapUtil; import org.thoughtcrime.securesms.util.CharacterCalculator.CharacterState; import org.thoughtcrime.securesms.util.CommunicationActions; import org.thoughtcrime.securesms.util.Dialogs; -import org.thoughtcrime.securesms.util.DirectoryHelper; import org.thoughtcrime.securesms.util.DynamicDarkToolbarTheme; +import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper; import org.thoughtcrime.securesms.util.DynamicLanguage; import org.thoughtcrime.securesms.util.DynamicTheme; import org.thoughtcrime.securesms.util.ExpirationUtil; diff --git a/src/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java b/src/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java index 822e076d60..236f3045c3 100644 --- a/src/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java +++ b/src/org/thoughtcrime/securesms/jobs/DirectoryRefreshJob.java @@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; -import org.thoughtcrime.securesms.util.DirectoryHelper; +import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper; import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; import java.io.IOException; diff --git a/src/org/thoughtcrime/securesms/migrations/RecipientSearchMigrationJob.java b/src/org/thoughtcrime/securesms/migrations/RecipientSearchMigrationJob.java index a90e7ac8ab..384598ff29 100644 --- a/src/org/thoughtcrime/securesms/migrations/RecipientSearchMigrationJob.java +++ b/src/org/thoughtcrime/securesms/migrations/RecipientSearchMigrationJob.java @@ -5,7 +5,7 @@ import androidx.annotation.NonNull; import org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; -import org.thoughtcrime.securesms.util.DirectoryHelper; +import org.thoughtcrime.securesms.contacts.sync.DirectoryHelper; import java.io.IOException;