diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java index f1c80bc9d0..ae7e177a0a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MediaOverviewActivity.java @@ -66,7 +66,7 @@ import org.thoughtcrime.securesms.util.SaveAttachmentTask; import org.thoughtcrime.securesms.util.StickyHeaderDecoration; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.ViewUtil; -import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask; +import org.session.libsession.utilities.task.ProgressDialogAsyncTask; import java.util.Collection; import java.util.LinkedList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java b/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java index 3894c10d49..407c5d7e45 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/FromTextView.java @@ -17,7 +17,7 @@ import network.loki.messenger.R; import org.thoughtcrime.securesms.components.emoji.EmojiTextView; import org.session.libsession.messaging.threads.recipients.Recipient; import org.thoughtcrime.securesms.util.ResUtil; -import org.thoughtcrime.securesms.util.spans.CenterAlignedRelativeSizeSpan; +import org.session.libsession.utilities.color.spans.CenterAlignedRelativeSizeSpan; public class FromTextView extends EmojiTextView { 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 67da3867d2..34891e82e5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java @@ -69,7 +69,6 @@ import org.thoughtcrime.securesms.conversation.ConversationAdapter.ItemClickList import org.session.libsession.messaging.threads.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MmsSmsDatabase; -import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.loaders.ConversationLoader; import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord; import org.thoughtcrime.securesms.database.model.MessageRecord; @@ -90,7 +89,7 @@ import org.thoughtcrime.securesms.stickers.StickerPackPreviewActivity; import org.thoughtcrime.securesms.util.CommunicationActions; import org.thoughtcrime.securesms.util.SaveAttachmentTask; import org.thoughtcrime.securesms.util.StickyHeaderDecoration; -import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask; +import org.session.libsession.utilities.task.ProgressDialogAsyncTask; import org.session.libsignal.libsignal.util.guava.Optional; import org.session.libsignal.service.loki.api.opengroups.PublicChat; import org.session.libsignal.service.loki.api.opengroups.PublicChatAPI; @@ -112,11 +111,9 @@ import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Set; -import java.util.TreeSet; import kotlin.Unit; import network.loki.messenger.R; -import nl.komponents.kovenant.Kovenant; @SuppressLint("StaticFieldLeak") public class ConversationFragment extends Fragment diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java index e09d5faf35..d24539982d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationSearchViewModel.java @@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.search.SearchRepository; import org.thoughtcrime.securesms.search.model.MessageResult; import org.thoughtcrime.securesms.util.CloseableLiveData; -import org.thoughtcrime.securesms.util.Debouncer; +import org.session.libsession.utilities.Debouncer; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.concurrent.SignalExecutors; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java index 8f8ff2a693..7c61fa5d3e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationStickerViewModel.java @@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.database.DatabaseContentProviders; import org.thoughtcrime.securesms.database.model.StickerRecord; import org.thoughtcrime.securesms.stickers.StickerSearchRepository; import org.thoughtcrime.securesms.util.CloseableLiveData; -import org.thoughtcrime.securesms.util.Throttler; +import org.session.libsession.utilities.Throttler; class ConversationStickerViewModel extends ViewModel { diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java index 27c5edf2f4..acf5c8aa21 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java @@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.jobmanager.persistence.FullSpec; import org.thoughtcrime.securesms.jobmanager.persistence.JobSpec; import org.thoughtcrime.securesms.jobmanager.persistence.JobStorage; import org.thoughtcrime.securesms.logging.Log; -import org.thoughtcrime.securesms.util.Debouncer; +import org.session.libsession.utilities.Debouncer; import java.util.ArrayList; import java.util.Collections; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java index d61467cdf6..133f06b662 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java @@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.jobmanager.impl.DefaultExecutorFactory; import org.thoughtcrime.securesms.jobmanager.impl.JsonDataSerializer; import org.thoughtcrime.securesms.jobmanager.persistence.JobStorage; import org.thoughtcrime.securesms.logging.Log; -import org.thoughtcrime.securesms.util.Debouncer; +import org.session.libsession.utilities.Debouncer; import java.util.ArrayList; import java.util.Collections; diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java index 9d9c4502f4..f18a54fa13 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewViewModel.java @@ -9,7 +9,7 @@ import androidx.annotation.NonNull; import android.text.TextUtils; import org.thoughtcrime.securesms.net.RequestController; -import org.thoughtcrime.securesms.util.Debouncer; +import org.session.libsession.utilities.Debouncer; import org.session.libsession.utilities.Util; import org.session.libsignal.libsignal.util.guava.Optional; diff --git a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java index 4900e3fb8b..572dd8ff5e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitLogFragment.java @@ -56,7 +56,7 @@ import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.logsubmit.util.Scrubber; import org.thoughtcrime.securesms.util.Util; -import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask; +import org.session.libsession.utilities.task.ProgressDialogAsyncTask; import java.io.BufferedReader; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java index ade793e48b..c994ac4e00 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/OptimizedMessageNotifier.java @@ -8,7 +8,7 @@ import androidx.annotation.NonNull; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.loki.api.PublicChatManager; -import org.thoughtcrime.securesms.util.Debouncer; +import org.session.libsession.utilities.Debouncer; import org.session.libsignal.service.loki.api.Poller; import org.session.libsignal.utilities.ThreadUtils; diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java index 23c31089ac..3649f04eb4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardPageViewModel.java @@ -11,7 +11,7 @@ import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.DatabaseContentProviders; import org.thoughtcrime.securesms.database.model.StickerRecord; -import org.thoughtcrime.securesms.util.Throttler; +import org.session.libsession.utilities.Throttler; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java index 717b72876d..35fd79da4d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java +++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardProvider.java @@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.stickers.StickerKeyboardPageFragment.EventList import org.thoughtcrime.securesms.stickers.StickerKeyboardRepository.PackListResult; import org.thoughtcrime.securesms.util.ResUtil; import org.session.libsession.utilities.ThemeUtil; -import org.thoughtcrime.securesms.util.Throttler; +import org.session.libsession.utilities.Throttler; import java.util.ArrayList; import java.util.HashMap; diff --git a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java index 0c1c2d5391..726aa54e55 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/stickers/StickerKeyboardViewModel.java @@ -11,7 +11,7 @@ import androidx.annotation.NonNull; import org.thoughtcrime.securesms.database.DatabaseContentProviders; import org.thoughtcrime.securesms.stickers.StickerKeyboardRepository.PackListResult; -import org.thoughtcrime.securesms.util.Throttler; +import org.session.libsession.utilities.Throttler; final class StickerKeyboardViewModel extends ViewModel { diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt index f826b4fcae..71309211f6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt @@ -13,7 +13,7 @@ import androidx.appcompat.app.AlertDialog import network.loki.messenger.R import org.thoughtcrime.securesms.logging.Log import org.thoughtcrime.securesms.mms.PartAuthority -import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask +import org.session.libsession.utilities.task.ProgressDialogAsyncTask import java.io.File import java.io.IOException import java.lang.ref.WeakReference diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java b/app/src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java index 169726164e..70cf840132 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/dualsim/SubscriptionManagerCompat.java @@ -9,8 +9,9 @@ import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; import network.loki.messenger.R; -import org.thoughtcrime.securesms.logging.Log; import org.session.libsession.utilities.ServiceUtil; + +import org.session.libsignal.libsignal.logging.Log; import org.session.libsignal.libsignal.util.guava.Function; import org.session.libsignal.libsignal.util.guava.Optional; @@ -25,7 +26,7 @@ import java.util.Set; public final class SubscriptionManagerCompat { - private static final String TAG = Log.tag(SubscriptionManagerCompat.class); + private static final String TAG = SubscriptionManagerCompat.class.getSimpleName(); private final Context context; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Debouncer.java b/libsession/src/main/java/org/session/libsession/utilities/Debouncer.java similarity index 96% rename from app/src/main/java/org/thoughtcrime/securesms/util/Debouncer.java rename to libsession/src/main/java/org/session/libsession/utilities/Debouncer.java index 9daf2c1cb0..0bf82e3e07 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/Debouncer.java +++ b/libsession/src/main/java/org/session/libsession/utilities/Debouncer.java @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.util; +package org.session.libsession.utilities; import android.os.Handler; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Throttler.java b/libsession/src/main/java/org/session/libsession/utilities/Throttler.java similarity index 96% rename from app/src/main/java/org/thoughtcrime/securesms/util/Throttler.java rename to libsession/src/main/java/org/session/libsession/utilities/Throttler.java index 0c26946b4d..d5ac785bfe 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/Throttler.java +++ b/libsession/src/main/java/org/session/libsession/utilities/Throttler.java @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.util; +package org.session.libsession.utilities; import android.os.Handler; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java b/libsession/src/main/java/org/session/libsession/utilities/color/spans/CenterAlignedRelativeSizeSpan.java similarity index 91% rename from app/src/main/java/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java rename to libsession/src/main/java/org/session/libsession/utilities/color/spans/CenterAlignedRelativeSizeSpan.java index 11f2b474dc..cfbb66dd93 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/spans/CenterAlignedRelativeSizeSpan.java +++ b/libsession/src/main/java/org/session/libsession/utilities/color/spans/CenterAlignedRelativeSizeSpan.java @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.util.spans; +package org.session.libsession.utilities.color.spans; import androidx.annotation.NonNull; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java b/libsession/src/main/java/org/session/libsession/utilities/task/ProgressDialogAsyncTask.java similarity index 96% rename from app/src/main/java/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java rename to libsession/src/main/java/org/session/libsession/utilities/task/ProgressDialogAsyncTask.java index 4c343bcf00..10d2ff47e0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/task/ProgressDialogAsyncTask.java +++ b/libsession/src/main/java/org/session/libsession/utilities/task/ProgressDialogAsyncTask.java @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.util.task; +package org.session.libsession.utilities.task; import android.app.ProgressDialog; import android.content.Context; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java b/libsession/src/main/java/org/session/libsession/utilities/task/SnackbarAsyncTask.java similarity index 98% rename from app/src/main/java/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java rename to libsession/src/main/java/org/session/libsession/utilities/task/SnackbarAsyncTask.java index 074e4ed253..3b899c0a2f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/task/SnackbarAsyncTask.java +++ b/libsession/src/main/java/org/session/libsession/utilities/task/SnackbarAsyncTask.java @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.util.task; +package org.session.libsession.utilities.task; import android.app.ProgressDialog; import android.os.AsyncTask;