From c984d90b04ca5c549647f47b0cd9e15e0ce8db39 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 9 Jul 2021 13:18:48 +1000 Subject: [PATCH] Re-organize files --- .../thoughtcrime/securesms/ApplicationContext.java | 6 +++--- .../securesms/backup/BackupRestoreActivity.kt | 4 ++-- .../securesms/components/AvatarImageView.java | 2 +- .../views => components}/LabeledSeparatorView.kt | 4 ++-- .../{loki/views => components}/ProfilePictureView.kt | 4 ++-- .../thoughtcrime/securesms/components/QuoteView.java | 2 +- .../securesms/contacts/SelectContactsLoader.kt | 2 +- .../org/thoughtcrime/securesms/contacts/UserView.kt | 2 +- .../conversation/v2/ConversationActivityV2.kt | 10 +++------- .../conversation/v2/ConversationRecyclerView.kt | 4 ++-- .../conversation/v2/components/AlbumThumbnailView.kt | 2 +- .../v2/components/LinkPreviewDraftView.kt | 2 +- .../v2/components/MentionCandidateSelectionView.kt | 2 +- .../v2/components/OpenGroupGuidelinesView.kt | 2 +- .../securesms/conversation/v2/input_bar/InputBar.kt | 4 ++-- .../conversation/v2/input_bar/InputBarButton.kt | 2 +- .../conversation/v2/input_bar/InputBarEditText.kt | 2 +- .../v2/input_bar/InputBarRecordingView.kt | 6 +++--- .../v2/input_bar/mentions/MentionCandidatesView.kt | 2 +- .../conversation/v2/menus/ConversationMenuHelper.kt | 2 +- .../conversation/v2/messages/LinkPreviewView.kt | 2 +- .../securesms/conversation/v2/messages/QuoteView.kt | 12 +++--------- .../v2/messages/VisibleMessageContentView.kt | 6 +++--- .../conversation/v2/messages/VisibleMessageView.kt | 6 +----- .../conversation/v2/utilities/BaseDialog.kt | 2 +- .../v2}/utilities/MentionManagerUtilities.kt | 2 +- .../v2}/utilities/MentionUtilities.kt | 3 ++- .../{loki/utilities => crypto}/MnemonicUtilities.kt | 2 +- .../utilities => database}/DatabaseUtilities.kt | 2 +- .../org/thoughtcrime/securesms/database/Storage.kt | 2 -- .../securesms/groups/CreateClosedGroupActivity.kt | 4 ++-- .../viewmodel => groups}/DefaultGroupsViewModel.kt | 3 ++- .../securesms/groups/EditClosedGroupActivity.kt | 4 ++-- .../securesms/groups/JoinPublicChatActivity.kt | 5 ++--- .../{loki/utilities => groups}/OpenGroupUtilities.kt | 2 +- .../thoughtcrime/securesms/home/ConversationView.kt | 4 ++-- .../org/thoughtcrime/securesms/home/HomeActivity.kt | 4 +++- .../securesms/home/NewConversationButtonSetView.kt | 2 +- .../org/thoughtcrime/securesms/home/PathActivity.kt | 3 ++- .../thoughtcrime/securesms/home/PathStatusView.kt | 4 ++-- .../securesms/loki/api/PublicChatInfoUpdateWorker.kt | 2 +- .../securesms/loki/database/LokiAPIDatabase.kt | 4 ++-- .../securesms/loki/database/LokiMessageDatabase.kt | 5 ++--- .../securesms/loki/database/LokiThreadDatabase.kt | 6 +++--- .../securesms/loki/database/LokiUserDatabase.kt | 2 +- .../loki/database/SessionContactDatabase.kt | 4 ++-- .../securesms/loki/database/SessionJobDatabase.kt | 4 ++-- .../securesms/loki/dialogs/ChangeUiModeDialog.kt | 4 ++-- .../securesms/loki/dialogs/SeedDialog.kt | 2 +- .../loki/fragments/ContactSelectionListLoader.kt | 2 +- .../securesms/longmessage/LongMessageActivity.java | 2 +- .../notifications/DefaultMessageNotifier.java | 3 +-- .../{loki/utilities => notifications}/FcmUtils.kt | 2 +- .../SingleRecipientNotificationBuilder.java | 2 +- .../securesms/onboarding/DisplayNameActivity.kt | 4 ++-- .../securesms/onboarding/FakeChatView.kt | 2 +- .../securesms/onboarding/LandingActivity.kt | 4 ++-- .../securesms/onboarding/LinkDeviceActivity.kt | 7 +++---- .../securesms/onboarding/PNModeActivity.kt | 8 ++++---- .../onboarding/RecoveryPhraseRestoreActivity.kt | 6 +++--- .../securesms/onboarding/RegisterActivity.kt | 4 ++-- .../securesms/onboarding/SeedActivity.kt | 4 ++-- .../securesms/preferences/QRCodeActivity.kt | 5 ++--- .../securesms/preferences/SettingsActivity.kt | 4 ++-- .../{loki/utilities => util}/ActivityUtilities.kt | 2 +- .../utilities => util}/AvatarPlaceholderGenerator.kt | 2 +- .../{loki/utilities => util}/Broadcaster.kt | 2 +- .../securesms/util/ConfigurationMessageUtilities.kt | 1 - .../{loki/utilities => util}/ContactUtilities.kt | 2 +- .../{loki/utilities => util}/GeneralUtilities.kt | 2 +- .../java/org/thoughtcrime/securesms/util/GlowView.kt | 4 ++-- .../securesms/{loki/utilities => util}/IP2Country.kt | 4 ++-- .../{loki/utilities => util}/PointFUtilities.kt | 3 ++- .../{loki/utilities => util}/QRCodeUtilities.kt | 2 +- .../securesms/{loki/viewmodel => util}/State.kt | 2 +- .../{loki/utilities => util}/UiModeUtilities.kt | 2 +- .../{loki/utilities => util}/ViewGroupUtilities.kt | 2 +- .../{loki/utilities => util}/ViewUtilities.kt | 2 +- .../res/layout-sw400dp/fragment_enter_public_key.xml | 2 +- .../layout/activity_conversation_v2_action_bar.xml | 2 +- app/src/main/res/layout/activity_home.xml | 2 +- app/src/main/res/layout/activity_settings.xml | 4 ++-- .../main/res/layout/fragment_enter_public_key.xml | 2 +- .../layout/fragment_user_details_bottom_sheet.xml | 2 +- app/src/main/res/layout/view_conversation.xml | 2 +- app/src/main/res/layout/view_mention_candidate.xml | 2 +- .../main/res/layout/view_mention_candidate_v2.xml | 2 +- app/src/main/res/layout/view_user.xml | 2 +- app/src/main/res/layout/view_visible_message.xml | 2 +- 89 files changed, 136 insertions(+), 152 deletions(-) rename app/src/main/java/org/thoughtcrime/securesms/{loki/views => components}/LabeledSeparatorView.kt (95%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/views => components}/ProfilePictureView.kt (98%) rename app/src/main/java/org/thoughtcrime/securesms/{loki => conversation/v2}/utilities/MentionManagerUtilities.kt (96%) rename app/src/main/java/org/thoughtcrime/securesms/{loki => conversation/v2}/utilities/MentionUtilities.kt (96%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/utilities => crypto}/MnemonicUtilities.kt (87%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/utilities => database}/DatabaseUtilities.kt (97%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/viewmodel => groups}/DefaultGroupsViewModel.kt (87%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/utilities => groups}/OpenGroupUtilities.kt (97%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/utilities => notifications}/FcmUtils.kt (92%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/utilities => util}/ActivityUtilities.kt (97%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/utilities => util}/AvatarPlaceholderGenerator.kt (98%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/utilities => util}/Broadcaster.kt (92%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/utilities => util}/ContactUtilities.kt (93%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/utilities => util}/GeneralUtilities.kt (94%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/utilities => util}/IP2Country.kt (97%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/utilities => util}/PointFUtilities.kt (92%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/utilities => util}/QRCodeUtilities.kt (96%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/viewmodel => util}/State.kt (78%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/utilities => util}/UiModeUtilities.kt (97%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/utilities => util}/ViewGroupUtilities.kt (73%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/utilities => util}/ViewUtilities.kt (97%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java index 149dd2a3f3..fdf2e5f60a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java @@ -63,9 +63,9 @@ import org.thoughtcrime.securesms.loki.api.BackgroundPollWorker; import org.thoughtcrime.securesms.loki.api.LokiPushNotificationManager; import org.thoughtcrime.securesms.loki.api.OpenGroupManager; import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase; -import org.thoughtcrime.securesms.loki.utilities.Broadcaster; -import org.thoughtcrime.securesms.loki.utilities.FcmUtils; -import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities; +import org.thoughtcrime.securesms.util.Broadcaster; +import org.thoughtcrime.securesms.notifications.FcmUtils; +import org.thoughtcrime.securesms.util.UiModeUtilities; import org.thoughtcrime.securesms.notifications.DefaultMessageNotifier; import org.thoughtcrime.securesms.notifications.NotificationChannels; import org.thoughtcrime.securesms.notifications.OptimizedMessageNotifier; diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupRestoreActivity.kt index c75478a92c..33b0a8a3fc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupRestoreActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupRestoreActivity.kt @@ -29,8 +29,8 @@ import org.thoughtcrime.securesms.backup.FullBackupImporter.DatabaseDowngradeExc import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider import org.thoughtcrime.securesms.database.DatabaseFactory import org.session.libsignal.utilities.Log -import org.thoughtcrime.securesms.loki.utilities.setUpActionBarSessionLogo -import org.thoughtcrime.securesms.loki.utilities.show +import org.thoughtcrime.securesms.util.setUpActionBarSessionLogo +import org.thoughtcrime.securesms.util.show import org.thoughtcrime.securesms.notifications.NotificationChannels import org.thoughtcrime.securesms.util.BackupUtil import org.session.libsession.utilities.TextSecurePreferences diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java index c0757fea24..21797a9eef 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/AvatarImageView.java @@ -19,7 +19,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy; -import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator; +import org.thoughtcrime.securesms.util.AvatarPlaceholderGenerator; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.mms.GlideRequests; diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/LabeledSeparatorView.kt similarity index 95% rename from app/src/main/java/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt rename to app/src/main/java/org/thoughtcrime/securesms/components/LabeledSeparatorView.kt index 5a7cdc8c14..34273e565c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/LabeledSeparatorView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/LabeledSeparatorView.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.views +package org.thoughtcrime.securesms.components import android.content.Context import android.graphics.Canvas @@ -9,7 +9,7 @@ import android.view.LayoutInflater import android.widget.RelativeLayout import kotlinx.android.synthetic.main.view_separator.view.* import network.loki.messenger.R -import org.thoughtcrime.securesms.loki.utilities.toPx +import org.thoughtcrime.securesms.util.toPx import org.session.libsession.utilities.ThemeUtil class LabeledSeparatorView : RelativeLayout { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt b/app/src/main/java/org/thoughtcrime/securesms/components/ProfilePictureView.kt similarity index 98% rename from app/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt rename to app/src/main/java/org/thoughtcrime/securesms/components/ProfilePictureView.kt index b07675f5ea..41e3f510ee 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/ProfilePictureView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/ProfilePictureView.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.views +package org.thoughtcrime.securesms.components import android.content.Context import android.util.AttributeSet @@ -17,7 +17,7 @@ import org.session.libsession.utilities.Address import org.session.libsession.utilities.recipients.Recipient import org.session.libsession.utilities.TextSecurePreferences import org.thoughtcrime.securesms.database.DatabaseFactory -import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator +import org.thoughtcrime.securesms.util.AvatarPlaceholderGenerator import org.thoughtcrime.securesms.mms.GlideRequests class ProfilePictureView : RelativeLayout { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java index 85cf9332bf..2d1db4fb7d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/QuoteView.java @@ -23,7 +23,7 @@ import org.session.libsession.messaging.contacts.Contact; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.loki.database.SessionContactDatabase; -import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities; +import org.thoughtcrime.securesms.util.UiModeUtilities; import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri; import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.mms.Slide; diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/SelectContactsLoader.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/SelectContactsLoader.kt index b28aacc2e9..f71c9b560c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/SelectContactsLoader.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/SelectContactsLoader.kt @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.contacts import android.content.Context -import org.thoughtcrime.securesms.loki.utilities.ContactUtilities +import org.thoughtcrime.securesms.util.ContactUtilities import org.thoughtcrime.securesms.util.AsyncLoader class SelectContactsLoader(context: Context, val usersToExclude: Set) : AsyncLoader>(context) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/UserView.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/UserView.kt index 6175d78133..d2101973e7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/UserView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/UserView.kt @@ -10,7 +10,7 @@ import kotlinx.android.synthetic.main.view_user.view.* import network.loki.messenger.R import org.session.libsession.messaging.contacts.Contact import org.thoughtcrime.securesms.database.DatabaseFactory -import org.thoughtcrime.securesms.loki.utilities.MentionManagerUtilities +import org.thoughtcrime.securesms.conversation.v2.utilities.MentionManagerUtilities import org.thoughtcrime.securesms.mms.GlideRequests import org.session.libsession.utilities.recipients.Recipient diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt index 1b48a8146b..c48d7648af 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt @@ -102,18 +102,14 @@ import org.thoughtcrime.securesms.linkpreview.LinkPreviewViewModel import org.thoughtcrime.securesms.linkpreview.LinkPreviewViewModel.LinkPreviewState import org.thoughtcrime.securesms.contacts.SelectContactsActivity import org.thoughtcrime.securesms.contacts.SelectContactsActivity.Companion.selectedContactsKey -import org.thoughtcrime.securesms.loki.utilities.ActivityDispatcher -import org.thoughtcrime.securesms.loki.utilities.MentionUtilities -import org.thoughtcrime.securesms.loki.utilities.push -import org.thoughtcrime.securesms.loki.utilities.toPx +import org.thoughtcrime.securesms.conversation.v2.utilities.MentionUtilities +import org.thoughtcrime.securesms.util.toPx import org.thoughtcrime.securesms.mediasend.Media import org.thoughtcrime.securesms.mediasend.MediaSendActivity import org.thoughtcrime.securesms.mms.* import org.thoughtcrime.securesms.notifications.MarkReadReceiver import org.thoughtcrime.securesms.permissions.Permissions -import org.thoughtcrime.securesms.util.DateUtils -import org.thoughtcrime.securesms.util.MediaUtil -import org.thoughtcrime.securesms.util.SaveAttachmentTask +import org.thoughtcrime.securesms.util.* import java.util.* import java.util.concurrent.ExecutionException import kotlin.math.* diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRecyclerView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRecyclerView.kt index 1926024015..475efaba38 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRecyclerView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationRecyclerView.kt @@ -8,8 +8,8 @@ import android.view.VelocityTracker import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import kotlinx.android.synthetic.main.activity_conversation_v2.* -import org.thoughtcrime.securesms.loki.utilities.disableClipping -import org.thoughtcrime.securesms.loki.utilities.toPx +import org.thoughtcrime.securesms.util.disableClipping +import org.thoughtcrime.securesms.util.toPx import kotlin.math.abs import kotlin.math.max diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/AlbumThumbnailView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/AlbumThumbnailView.kt index 33018c4c13..accc8b2656 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/AlbumThumbnailView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/AlbumThumbnailView.kt @@ -19,7 +19,7 @@ import org.thoughtcrime.securesms.MediaPreviewActivity import org.thoughtcrime.securesms.components.CornerMask import org.thoughtcrime.securesms.conversation.v2.utilities.KThumbnailView import org.thoughtcrime.securesms.database.model.MmsMessageRecord -import org.thoughtcrime.securesms.loki.utilities.ActivityDispatcher +import org.thoughtcrime.securesms.util.ActivityDispatcher import org.thoughtcrime.securesms.longmessage.LongMessageActivity import org.thoughtcrime.securesms.mms.GlideRequests import org.thoughtcrime.securesms.mms.Slide diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/LinkPreviewDraftView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/LinkPreviewDraftView.kt index 23c0add0ef..b056c4f9a4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/LinkPreviewDraftView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/LinkPreviewDraftView.kt @@ -8,7 +8,7 @@ import androidx.core.view.isVisible import kotlinx.android.synthetic.main.view_link_preview_draft.view.* import network.loki.messenger.R import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview -import org.thoughtcrime.securesms.loki.utilities.toPx +import org.thoughtcrime.securesms.util.toPx import org.thoughtcrime.securesms.mms.GlideRequests import org.thoughtcrime.securesms.mms.ImageSlide diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/MentionCandidateSelectionView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/MentionCandidateSelectionView.kt index 10ed6081d6..5f16b2317d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/MentionCandidateSelectionView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/MentionCandidateSelectionView.kt @@ -8,7 +8,7 @@ import android.view.ViewGroup import android.widget.BaseAdapter import android.widget.ListView import org.thoughtcrime.securesms.database.DatabaseFactory -import org.thoughtcrime.securesms.loki.utilities.toPx +import org.thoughtcrime.securesms.util.toPx import org.thoughtcrime.securesms.mms.GlideRequests import org.session.libsession.messaging.mentions.Mention diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/OpenGroupGuidelinesView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/OpenGroupGuidelinesView.kt index 79e125463d..d6cffd08db 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/OpenGroupGuidelinesView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/components/OpenGroupGuidelinesView.kt @@ -9,7 +9,7 @@ import kotlinx.android.synthetic.main.view_open_group_guidelines.view.* import network.loki.messenger.R import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2 import org.thoughtcrime.securesms.groups.OpenGroupGuidelinesActivity -import org.thoughtcrime.securesms.loki.utilities.push +import org.thoughtcrime.securesms.util.push class OpenGroupGuidelinesView : FrameLayout { diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt index f310cd019b..53ebf036ff 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt @@ -19,8 +19,8 @@ import org.thoughtcrime.securesms.conversation.v2.messages.QuoteView import org.thoughtcrime.securesms.conversation.v2.messages.QuoteViewDelegate import org.thoughtcrime.securesms.database.model.MessageRecord import org.thoughtcrime.securesms.database.model.MmsMessageRecord -import org.thoughtcrime.securesms.loki.utilities.toDp -import org.thoughtcrime.securesms.loki.utilities.toPx +import org.thoughtcrime.securesms.util.toDp +import org.thoughtcrime.securesms.util.toPx import org.thoughtcrime.securesms.mms.GlideRequests import kotlin.math.max import kotlin.math.roundToInt diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarButton.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarButton.kt index 6d71afe9af..25e209424e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarButton.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarButton.kt @@ -17,7 +17,7 @@ import android.widget.ImageView import android.widget.RelativeLayout import androidx.annotation.DrawableRes import network.loki.messenger.R -import org.thoughtcrime.securesms.loki.utilities.* +import org.thoughtcrime.securesms.util.* import org.thoughtcrime.securesms.util.GlowViewUtilities import org.thoughtcrime.securesms.util.InputBarButtonImageViewContainer import java.util.* diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarEditText.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarEditText.kt index f2d3e5eded..39db2f6d25 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarEditText.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarEditText.kt @@ -9,7 +9,7 @@ import android.util.Log import android.widget.RelativeLayout import androidx.appcompat.widget.AppCompatEditText import org.thoughtcrime.securesms.conversation.v2.utilities.TextUtilities -import org.thoughtcrime.securesms.loki.utilities.toPx +import org.thoughtcrime.securesms.util.toPx import kotlin.math.max import kotlin.math.min import kotlin.math.roundToInt diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarRecordingView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarRecordingView.kt index 0a210d6ae5..cc8166212b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarRecordingView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBarRecordingView.kt @@ -13,9 +13,9 @@ import androidx.core.content.res.ResourcesCompat import androidx.core.view.isVisible import kotlinx.android.synthetic.main.view_input_bar_recording.view.* import network.loki.messenger.R -import org.thoughtcrime.securesms.loki.utilities.animateSizeChange -import org.thoughtcrime.securesms.loki.utilities.disableClipping -import org.thoughtcrime.securesms.loki.utilities.toPx +import org.thoughtcrime.securesms.util.animateSizeChange +import org.thoughtcrime.securesms.util.disableClipping +import org.thoughtcrime.securesms.util.toPx import org.thoughtcrime.securesms.util.DateUtils import java.util.* diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/mentions/MentionCandidatesView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/mentions/MentionCandidatesView.kt index bbf97f0afd..4fcfba74b2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/mentions/MentionCandidatesView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/mentions/MentionCandidatesView.kt @@ -8,7 +8,7 @@ import android.view.ViewGroup import android.widget.BaseAdapter import android.widget.ListView import org.thoughtcrime.securesms.database.DatabaseFactory -import org.thoughtcrime.securesms.loki.utilities.toPx +import org.thoughtcrime.securesms.util.toPx import org.thoughtcrime.securesms.mms.GlideRequests import org.session.libsession.messaging.mentions.Mention diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt index f91b29b5ba..93278cb6a6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt @@ -41,7 +41,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.groups.EditClosedGroupActivity import org.thoughtcrime.securesms.groups.EditClosedGroupActivity.Companion.groupIDKey import org.thoughtcrime.securesms.contacts.SelectContactsActivity -import org.thoughtcrime.securesms.loki.utilities.getColorWithID +import org.thoughtcrime.securesms.util.getColorWithID import org.thoughtcrime.securesms.util.BitmapUtil import java.io.IOException diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/LinkPreviewView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/LinkPreviewView.kt index f684152482..0457f82702 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/LinkPreviewView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/LinkPreviewView.kt @@ -22,7 +22,7 @@ import org.thoughtcrime.securesms.conversation.v2.utilities.MessageBubbleUtiliti import org.thoughtcrime.securesms.conversation.v2.utilities.ModalURLSpan import org.thoughtcrime.securesms.conversation.v2.utilities.TextUtilities.getIntersectedModalSpans import org.thoughtcrime.securesms.database.model.MmsMessageRecord -import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities +import org.thoughtcrime.securesms.util.UiModeUtilities import org.thoughtcrime.securesms.mms.GlideRequests import org.thoughtcrime.securesms.mms.ImageSlide diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt index b03b4be278..1798b07f0a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/QuoteView.kt @@ -1,11 +1,8 @@ package org.thoughtcrime.securesms.conversation.v2.messages -import android.content.ContentResolver import android.content.Context import android.content.res.ColorStateList -import android.content.res.Resources import android.util.AttributeSet -import android.util.Log import android.view.LayoutInflater import android.widget.LinearLayout import android.widget.RelativeLayout @@ -13,22 +10,19 @@ import androidx.annotation.ColorInt import androidx.core.content.res.ResourcesCompat import androidx.core.text.toSpannable import androidx.core.view.isVisible -import androidx.core.view.marginStart -import com.google.android.exoplayer2.util.MimeTypes import kotlinx.android.synthetic.main.view_link_preview.view.* import kotlinx.android.synthetic.main.view_quote.view.* import network.loki.messenger.R import org.session.libsession.messaging.contacts.Contact -import org.session.libsession.messaging.utilities.UpdateMessageData import org.session.libsession.utilities.recipients.Recipient +import org.thoughtcrime.securesms.conversation.v2.utilities.MentionUtilities import org.thoughtcrime.securesms.conversation.v2.utilities.TextUtilities import org.thoughtcrime.securesms.database.DatabaseFactory -import org.thoughtcrime.securesms.database.model.MessageRecord -import org.thoughtcrime.securesms.loki.utilities.* +import org.thoughtcrime.securesms.util.* import org.thoughtcrime.securesms.mms.GlideRequests -import org.thoughtcrime.securesms.mms.ImageSlide import org.thoughtcrime.securesms.mms.SlideDeck import org.thoughtcrime.securesms.util.MediaUtil +import org.thoughtcrime.securesms.util.UiModeUtilities import kotlin.math.max import kotlin.math.min import kotlin.math.roundToInt diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt index b8b3b9812e..1750d8bb0b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageContentView.kt @@ -6,7 +6,6 @@ import android.graphics.Rect import android.graphics.drawable.Drawable import android.text.style.BackgroundColorSpan import android.text.style.ForegroundColorSpan -import android.text.method.LinkMovementMethod import android.text.style.URLSpan import android.text.util.Linkify import android.util.AttributeSet @@ -23,7 +22,6 @@ import androidx.core.graphics.BlendModeColorFilterCompat import androidx.core.graphics.BlendModeCompat import androidx.core.text.getSpans import androidx.core.text.toSpannable -import androidx.core.text.util.LinkifyCompat import kotlinx.android.synthetic.main.view_link_preview.view.* import kotlinx.android.synthetic.main.view_visible_message_content.view.* import network.loki.messenger.R @@ -34,14 +32,16 @@ import org.thoughtcrime.securesms.conversation.v2.components.AlbumThumbnailView import org.thoughtcrime.securesms.components.emoji.EmojiTextView import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2 import org.thoughtcrime.securesms.conversation.v2.dialogs.OpenURLDialog +import org.thoughtcrime.securesms.conversation.v2.utilities.MentionUtilities import org.thoughtcrime.securesms.conversation.v2.utilities.ModalURLSpan import org.thoughtcrime.securesms.conversation.v2.utilities.TextUtilities.getIntersectedModalSpans import org.thoughtcrime.securesms.database.model.MessageRecord import org.thoughtcrime.securesms.database.model.MmsMessageRecord -import org.thoughtcrime.securesms.loki.utilities.* +import org.thoughtcrime.securesms.util.* import org.thoughtcrime.securesms.mms.GlideRequests import org.thoughtcrime.securesms.util.SearchUtil import org.thoughtcrime.securesms.util.SearchUtil.StyleFactory +import org.thoughtcrime.securesms.util.UiModeUtilities import java.util.* import kotlin.math.roundToInt diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt index afb2683b89..bfd7fa2cb1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/messages/VisibleMessageView.kt @@ -24,12 +24,8 @@ import org.session.libsignal.utilities.ThreadUtils import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.database.model.MessageRecord -import org.thoughtcrime.securesms.loki.utilities.disableClipping -import org.thoughtcrime.securesms.loki.utilities.getColorWithID -import org.thoughtcrime.securesms.loki.utilities.toDp -import org.thoughtcrime.securesms.loki.utilities.toPx import org.thoughtcrime.securesms.mms.GlideRequests -import org.thoughtcrime.securesms.util.DateUtils +import org.thoughtcrime.securesms.util.* import java.util.* import kotlin.math.abs import kotlin.math.min diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/BaseDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/BaseDialog.kt index 79bb1405a7..e1456a7f94 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/BaseDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/BaseDialog.kt @@ -6,7 +6,7 @@ import android.graphics.drawable.ColorDrawable import android.os.Bundle import androidx.appcompat.app.AlertDialog import androidx.fragment.app.DialogFragment -import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities +import org.thoughtcrime.securesms.util.UiModeUtilities open class BaseDialog : DialogFragment() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionManagerUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionManagerUtilities.kt similarity index 96% rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionManagerUtilities.kt rename to app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionManagerUtilities.kt index 000b61db89..31d650a671 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionManagerUtilities.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionManagerUtilities.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.utilities +package org.thoughtcrime.securesms.conversation.v2.utilities import android.content.Context import org.session.libsession.utilities.TextSecurePreferences diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionUtilities.kt similarity index 96% rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt rename to app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionUtilities.kt index d54d19f0ee..3a0c6e7c15 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MentionUtilities.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/utilities/MentionUtilities.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.utilities +package org.thoughtcrime.securesms.conversation.v2.utilities import android.content.Context import android.graphics.Typeface @@ -13,6 +13,7 @@ import nl.komponents.kovenant.combine.Tuple2 import org.session.libsession.messaging.contacts.Contact import org.thoughtcrime.securesms.database.DatabaseFactory import org.session.libsession.utilities.TextSecurePreferences +import org.thoughtcrime.securesms.util.UiModeUtilities import java.util.regex.Pattern object MentionUtilities { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MnemonicUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/crypto/MnemonicUtilities.kt similarity index 87% rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MnemonicUtilities.kt rename to app/src/main/java/org/thoughtcrime/securesms/crypto/MnemonicUtilities.kt index 226bb1abfd..04cdd85ae4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/MnemonicUtilities.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/MnemonicUtilities.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.utilities +package org.thoughtcrime.securesms.crypto import android.content.Context diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/DatabaseUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseUtilities.kt similarity index 97% rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/DatabaseUtilities.kt rename to app/src/main/java/org/thoughtcrime/securesms/database/DatabaseUtilities.kt index 23834fb9af..b063eb1b63 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/DatabaseUtilities.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/DatabaseUtilities.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.utilities +package org.thoughtcrime.securesms.database import android.content.ContentValues import androidx.core.database.getStringOrNull diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index 2d88615db4..14448eb4d1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -32,8 +32,6 @@ import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob import org.thoughtcrime.securesms.loki.api.OpenGroupManager import org.thoughtcrime.securesms.loki.database.LokiThreadDatabase import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol -import org.thoughtcrime.securesms.loki.utilities.get -import org.thoughtcrime.securesms.loki.utilities.getString import org.thoughtcrime.securesms.mms.PartAuthority class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper), StorageProtocol { diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/CreateClosedGroupActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/CreateClosedGroupActivity.kt index 910dc91205..e8ab3c6337 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/CreateClosedGroupActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/CreateClosedGroupActivity.kt @@ -20,8 +20,8 @@ import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.session.libsession.utilities.Address import org.thoughtcrime.securesms.database.DatabaseFactory -import org.thoughtcrime.securesms.loki.utilities.fadeIn -import org.thoughtcrime.securesms.loki.utilities.fadeOut +import org.thoughtcrime.securesms.util.fadeIn +import org.thoughtcrime.securesms.util.fadeOut import org.thoughtcrime.securesms.mms.GlideApp import org.session.libsession.utilities.recipients.Recipient import org.session.libsession.utilities.TextSecurePreferences diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/viewmodel/DefaultGroupsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/DefaultGroupsViewModel.kt similarity index 87% rename from app/src/main/java/org/thoughtcrime/securesms/loki/viewmodel/DefaultGroupsViewModel.kt rename to app/src/main/java/org/thoughtcrime/securesms/groups/DefaultGroupsViewModel.kt index d4281a6cfb..a9b6662d8b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/viewmodel/DefaultGroupsViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/DefaultGroupsViewModel.kt @@ -1,10 +1,11 @@ -package org.thoughtcrime.securesms.loki.viewmodel +package org.thoughtcrime.securesms.groups import androidx.lifecycle.ViewModel import androidx.lifecycle.asLiveData import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onStart import org.session.libsession.messaging.open_groups.OpenGroupAPIV2 +import org.thoughtcrime.securesms.util.State typealias DefaultGroups = List typealias GroupState = State diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupActivity.kt index 8c56d9aac2..ebd23da151 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupActivity.kt @@ -25,8 +25,8 @@ import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.session.libsession.utilities.Address import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.loki.dialogs.ClosedGroupEditingOptionsBottomSheet -import org.thoughtcrime.securesms.loki.utilities.fadeIn -import org.thoughtcrime.securesms.loki.utilities.fadeOut +import org.thoughtcrime.securesms.util.fadeIn +import org.thoughtcrime.securesms.util.fadeOut import org.thoughtcrime.securesms.mms.GlideApp import org.session.libsession.utilities.recipients.Recipient import org.session.libsession.utilities.GroupUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/JoinPublicChatActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/JoinPublicChatActivity.kt index ab0bbaaf00..562497c2ca 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/JoinPublicChatActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/JoinPublicChatActivity.kt @@ -31,15 +31,14 @@ import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.PublicKeyValidation import org.thoughtcrime.securesms.BaseActionBarActivity import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity - import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2 +import org.thoughtcrime.securesms.groups.DefaultGroupsViewModel import org.thoughtcrime.securesms.groups.GroupManager import org.thoughtcrime.securesms.loki.api.OpenGroupManager import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragment import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragmentDelegate import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities -import org.thoughtcrime.securesms.loki.viewmodel.DefaultGroupsViewModel -import org.thoughtcrime.securesms.loki.viewmodel.State +import org.thoughtcrime.securesms.util.State import java.util.* class JoinPublicChatActivity : PassphraseRequiredActionBarActivity(), ScanQRCodeWrapperFragmentDelegate { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/OpenGroupUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupUtilities.kt similarity index 97% rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/OpenGroupUtilities.kt rename to app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupUtilities.kt index 2f562e87c6..6729b5ca2e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/OpenGroupUtilities.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/OpenGroupUtilities.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.utilities +package org.thoughtcrime.securesms.groups import android.content.Context import androidx.annotation.WorkerThread diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt index 934d40a63b..57681963c1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationView.kt @@ -15,8 +15,8 @@ import kotlinx.android.synthetic.main.view_conversation.view.* import network.loki.messenger.R import org.session.libsession.utilities.recipients.Recipient import org.thoughtcrime.securesms.database.model.ThreadRecord -import org.thoughtcrime.securesms.loki.utilities.MentionManagerUtilities.populateUserPublicKeyCacheIfNeeded -import org.thoughtcrime.securesms.loki.utilities.MentionUtilities.highlightMentions +import org.thoughtcrime.securesms.conversation.v2.utilities.MentionManagerUtilities.populateUserPublicKeyCacheIfNeeded +import org.thoughtcrime.securesms.conversation.v2.utilities.MentionUtilities.highlightMentions import org.thoughtcrime.securesms.mms.GlideRequests import org.thoughtcrime.securesms.util.DateUtils import java.util.* diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt index 9633cbf73d..7b79e0ece1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt @@ -31,6 +31,7 @@ import org.greenrobot.eventbus.ThreadMode import org.session.libsession.messaging.jobs.JobQueue import org.session.libsession.messaging.sending_receiving.MessageSender import org.session.libsession.utilities.* +import org.session.libsession.utilities.Util import org.session.libsignal.utilities.ThreadUtils import org.session.libsignal.utilities.toHexString import org.thoughtcrime.securesms.ApplicationContext @@ -44,12 +45,13 @@ import org.thoughtcrime.securesms.loki.activities.* import org.thoughtcrime.securesms.loki.api.OpenGroupManager import org.thoughtcrime.securesms.loki.dialogs.* import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities -import org.thoughtcrime.securesms.loki.utilities.* +import org.thoughtcrime.securesms.util.* import org.thoughtcrime.securesms.onboarding.SeedReminderViewDelegate import org.thoughtcrime.securesms.mms.GlideApp import org.thoughtcrime.securesms.mms.GlideRequests import org.thoughtcrime.securesms.onboarding.SeedActivity import org.thoughtcrime.securesms.preferences.SettingsActivity +import org.thoughtcrime.securesms.util.IP2Country import java.io.IOException import java.util.* diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/NewConversationButtonSetView.kt b/app/src/main/java/org/thoughtcrime/securesms/home/NewConversationButtonSetView.kt index cb99321eb5..1bd4df55d9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/home/NewConversationButtonSetView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/home/NewConversationButtonSetView.kt @@ -16,7 +16,7 @@ import android.widget.RelativeLayout import androidx.annotation.ColorRes import androidx.annotation.DrawableRes import network.loki.messenger.R -import org.thoughtcrime.securesms.loki.utilities.* +import org.thoughtcrime.securesms.util.* import org.thoughtcrime.securesms.util.GlowViewUtilities import org.thoughtcrime.securesms.util.NewConversationButtonImageView diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/PathActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/home/PathActivity.kt index 10ddb11034..b812d5c0db 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/home/PathActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/home/PathActivity.kt @@ -22,8 +22,9 @@ import network.loki.messenger.R import org.session.libsession.snode.OnionRequestAPI import org.session.libsignal.utilities.Snode import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity -import org.thoughtcrime.securesms.loki.utilities.* +import org.thoughtcrime.securesms.util.* import org.thoughtcrime.securesms.util.GlowViewUtilities +import org.thoughtcrime.securesms.util.IP2Country import org.thoughtcrime.securesms.util.PathDotView class PathActivity : PassphraseRequiredActionBarActivity() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/PathStatusView.kt b/app/src/main/java/org/thoughtcrime/securesms/home/PathStatusView.kt index 5d571f1a9b..85d54a977f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/home/PathStatusView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/home/PathStatusView.kt @@ -12,8 +12,8 @@ import android.view.View import androidx.annotation.ColorInt import network.loki.messenger.R import org.session.libsession.snode.OnionRequestAPI -import org.thoughtcrime.securesms.loki.utilities.getColorWithID -import org.thoughtcrime.securesms.loki.utilities.toPx +import org.thoughtcrime.securesms.util.getColorWithID +import org.thoughtcrime.securesms.util.toPx class PathStatusView : View { private val broadcastReceivers = mutableListOf() diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatInfoUpdateWorker.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatInfoUpdateWorker.kt index db0e6c5e7f..236f450b26 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatInfoUpdateWorker.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PublicChatInfoUpdateWorker.kt @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.loki.api import android.content.Context import androidx.work.* import org.session.libsignal.utilities.Log -import org.thoughtcrime.securesms.loki.utilities.OpenGroupUtilities +import org.thoughtcrime.securesms.groups.OpenGroupUtilities /** * Delegates the [OpenGroupUtilities.updateGroupInfo] call to the work manager. diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt index f9bfe7f862..8d65c7e328 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiAPIDatabase.kt @@ -9,9 +9,9 @@ import org.session.libsignal.crypto.ecc.ECKeyPair import org.session.libsignal.database.LokiAPIDatabaseProtocol import org.session.libsignal.utilities.* import org.thoughtcrime.securesms.crypto.IdentityKeyUtil -import org.thoughtcrime.securesms.database.Database +import org.thoughtcrime.securesms.database.* import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper -import org.thoughtcrime.securesms.loki.utilities.* +import org.thoughtcrime.securesms.util.* import java.util.* import kotlin.Array import kotlin.Boolean diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt index fc1aa4351b..4c829dcad1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiMessageDatabase.kt @@ -3,12 +3,11 @@ package org.thoughtcrime.securesms.loki.database import android.content.ContentValues import android.content.Context import net.sqlcipher.database.SQLiteDatabase.CONFLICT_REPLACE -import org.thoughtcrime.securesms.database.Database -import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper -import org.thoughtcrime.securesms.loki.utilities.* +import org.thoughtcrime.securesms.util.* import org.session.libsignal.database.LokiMessageDatabaseProtocol import org.session.libsignal.utilities.Log +import org.thoughtcrime.securesms.database.* class LokiMessageDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper), LokiMessageDatabaseProtocol { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt index f0f6123b2e..82e5a236fd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiThreadDatabase.kt @@ -3,14 +3,14 @@ package org.thoughtcrime.securesms.loki.database import android.content.ContentValues import android.content.Context import android.database.Cursor -import org.thoughtcrime.securesms.database.Database -import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper -import org.thoughtcrime.securesms.loki.utilities.* +import org.thoughtcrime.securesms.util.* import org.session.libsession.messaging.open_groups.OpenGroupV2 import org.session.libsession.utilities.Address import org.session.libsession.utilities.recipients.Recipient import org.session.libsignal.utilities.JsonUtil +import org.thoughtcrime.securesms.database.* +import org.thoughtcrime.securesms.database.getString class LokiThreadDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt index fba0d64b36..5a7c3cf64e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/LokiUserDatabase.kt @@ -3,8 +3,8 @@ package org.thoughtcrime.securesms.loki.database import android.content.Context import org.thoughtcrime.securesms.database.Database import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper -import org.thoughtcrime.securesms.loki.utilities.get import org.session.libsession.utilities.TextSecurePreferences +import org.thoughtcrime.securesms.database.get class LokiUserDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionContactDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionContactDatabase.kt index 7d5e93b502..07c0e37ff7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionContactDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionContactDatabase.kt @@ -5,9 +5,9 @@ import android.content.Context import net.sqlcipher.Cursor import org.session.libsession.messaging.contacts.Contact import org.session.libsignal.utilities.Base64 -import org.thoughtcrime.securesms.database.Database +import org.thoughtcrime.securesms.database.* import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper -import org.thoughtcrime.securesms.loki.utilities.* +import org.thoughtcrime.securesms.util.* class SessionContactDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionJobDatabase.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionJobDatabase.kt index a0ca59dd0f..fd4940b197 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionJobDatabase.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/database/SessionJobDatabase.kt @@ -6,10 +6,10 @@ import net.sqlcipher.Cursor import org.session.libsession.messaging.jobs.* import org.session.libsession.messaging.utilities.Data import org.session.libsignal.utilities.Log -import org.thoughtcrime.securesms.database.Database +import org.thoughtcrime.securesms.database.* import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper import org.thoughtcrime.securesms.jobmanager.impl.JsonDataSerializer -import org.thoughtcrime.securesms.loki.utilities.* +import org.thoughtcrime.securesms.util.* class SessionJobDatabase(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ChangeUiModeDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ChangeUiModeDialog.kt index 77d8bfe8c0..875f914127 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ChangeUiModeDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ChangeUiModeDialog.kt @@ -5,8 +5,8 @@ import android.os.Bundle import androidx.appcompat.app.AlertDialog import androidx.fragment.app.DialogFragment import network.loki.messenger.R -import org.thoughtcrime.securesms.loki.utilities.UiMode -import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities +import org.thoughtcrime.securesms.util.UiMode +import org.thoughtcrime.securesms.util.UiModeUtilities class ChangeUiModeDialog : DialogFragment() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt index 241857928b..236821eaf3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt @@ -11,7 +11,7 @@ import network.loki.messenger.R import org.session.libsignal.crypto.MnemonicCodec import org.session.libsignal.utilities.hexEncodedPrivateKey import org.thoughtcrime.securesms.crypto.IdentityKeyUtil -import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities +import org.thoughtcrime.securesms.crypto.MnemonicUtilities import org.thoughtcrime.securesms.conversation.v2.utilities.BaseDialog class SeedDialog : BaseDialog() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListLoader.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListLoader.kt index 8eab5b3a8b..ab9c866654 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListLoader.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListLoader.kt @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.loki.fragments import android.content.Context import network.loki.messenger.R -import org.thoughtcrime.securesms.loki.utilities.ContactUtilities +import org.thoughtcrime.securesms.util.ContactUtilities import org.session.libsession.utilities.recipients.Recipient import org.thoughtcrime.securesms.util.AsyncLoader diff --git a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java index adb8a921b5..04edf1194a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageActivity.java @@ -15,7 +15,7 @@ import org.session.libsession.utilities.Address; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.recipients.Recipient; import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity; -import org.thoughtcrime.securesms.loki.utilities.MentionUtilities; +import org.thoughtcrime.securesms.conversation.v2.utilities.MentionUtilities; import network.loki.messenger.R; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java index c02663843e..446d87a327 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java @@ -57,9 +57,8 @@ import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord; import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.MmsMessageRecord; -import org.thoughtcrime.securesms.loki.api.OpenGroupManager; import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol; -import org.thoughtcrime.securesms.loki.utilities.MentionUtilities; +import org.thoughtcrime.securesms.conversation.v2.utilities.MentionUtilities; import org.thoughtcrime.securesms.mms.SlideDeck; import org.thoughtcrime.securesms.service.KeyCachingService; import org.thoughtcrime.securesms.util.SpanUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/FcmUtils.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/FcmUtils.kt similarity index 92% rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/FcmUtils.kt rename to app/src/main/java/org/thoughtcrime/securesms/notifications/FcmUtils.kt index 25b41f0d5e..87a9efc0de 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/FcmUtils.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/FcmUtils.kt @@ -1,5 +1,5 @@ @file:JvmName("FcmUtils") -package org.thoughtcrime.securesms.loki.utilities +package org.thoughtcrime.securesms.notifications import com.google.android.gms.tasks.Task import com.google.firebase.iid.FirebaseInstanceId diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java index 0b38783be8..3c5c39d607 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java @@ -29,7 +29,7 @@ import org.session.libsession.messaging.contacts.Contact; import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.loki.database.SessionContactDatabase; -import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator; +import org.thoughtcrime.securesms.util.AvatarPlaceholderGenerator; import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.mms.Slide; diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/DisplayNameActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/DisplayNameActivity.kt index bf4fb25cc8..885878c5ff 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/DisplayNameActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/DisplayNameActivity.kt @@ -11,8 +11,8 @@ import kotlinx.android.synthetic.main.activity_display_name.* import network.loki.messenger.R import org.session.libsession.utilities.SSKEnvironment.ProfileManagerProtocol import org.thoughtcrime.securesms.BaseActionBarActivity -import org.thoughtcrime.securesms.loki.utilities.push -import org.thoughtcrime.securesms.loki.utilities.setUpActionBarSessionLogo +import org.thoughtcrime.securesms.util.push +import org.thoughtcrime.securesms.util.setUpActionBarSessionLogo import org.session.libsession.utilities.TextSecurePreferences class DisplayNameActivity : BaseActionBarActivity() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/FakeChatView.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/FakeChatView.kt index 835ae4cc70..68c4edd596 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/FakeChatView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/FakeChatView.kt @@ -12,7 +12,7 @@ import android.widget.LinearLayout import android.widget.ScrollView import kotlinx.android.synthetic.main.view_fake_chat.view.* import network.loki.messenger.R -import org.thoughtcrime.securesms.loki.utilities.disableClipping +import org.thoughtcrime.securesms.util.disableClipping class FakeChatView : ScrollView { diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LandingActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LandingActivity.kt index 85bb05c464..3ca0632482 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LandingActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LandingActivity.kt @@ -7,8 +7,8 @@ import network.loki.messenger.R import org.session.libsession.utilities.TextSecurePreferences import org.thoughtcrime.securesms.BaseActionBarActivity import org.thoughtcrime.securesms.crypto.IdentityKeyUtil -import org.thoughtcrime.securesms.loki.utilities.push -import org.thoughtcrime.securesms.loki.utilities.setUpActionBarSessionLogo +import org.thoughtcrime.securesms.util.push +import org.thoughtcrime.securesms.util.setUpActionBarSessionLogo import org.thoughtcrime.securesms.service.KeyCachingService class LandingActivity : BaseActionBarActivity() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceActivity.kt index c98463f14a..94e9626b9e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceActivity.kt @@ -32,10 +32,9 @@ import org.thoughtcrime.securesms.BaseActionBarActivity import org.thoughtcrime.securesms.crypto.KeyPairUtilities import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragment import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragmentDelegate -import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities -import org.thoughtcrime.securesms.loki.utilities.push -import org.thoughtcrime.securesms.loki.utilities.setUpActionBarSessionLogo -import org.thoughtcrime.securesms.onboarding.PNModeActivity +import org.thoughtcrime.securesms.crypto.MnemonicUtilities +import org.thoughtcrime.securesms.util.push +import org.thoughtcrime.securesms.util.setUpActionBarSessionLogo class LinkDeviceActivity : BaseActionBarActivity(), ScanQRCodeWrapperFragmentDelegate { private val adapter = LinkDeviceActivityAdapter(this) diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt index d83a14819c..cbfd5bcc93 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/PNModeActivity.kt @@ -20,10 +20,10 @@ import org.session.libsession.utilities.TextSecurePreferences import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.BaseActionBarActivity import org.thoughtcrime.securesms.home.HomeActivity -import org.thoughtcrime.securesms.loki.utilities.disableClipping -import org.thoughtcrime.securesms.loki.utilities.getColorWithID -import org.thoughtcrime.securesms.loki.utilities.setUpActionBarSessionLogo -import org.thoughtcrime.securesms.loki.utilities.show +import org.thoughtcrime.securesms.util.disableClipping +import org.thoughtcrime.securesms.util.getColorWithID +import org.thoughtcrime.securesms.util.setUpActionBarSessionLogo +import org.thoughtcrime.securesms.util.show import org.thoughtcrime.securesms.util.GlowViewUtilities import org.thoughtcrime.securesms.util.PNModeView diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/RecoveryPhraseRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/RecoveryPhraseRestoreActivity.kt index 649490bfc5..968b3d0ddc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/RecoveryPhraseRestoreActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/RecoveryPhraseRestoreActivity.kt @@ -20,9 +20,9 @@ import org.session.libsignal.utilities.KeyHelper import org.session.libsignal.utilities.hexEncodedPublicKey import org.thoughtcrime.securesms.BaseActionBarActivity import org.thoughtcrime.securesms.crypto.KeyPairUtilities -import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities -import org.thoughtcrime.securesms.loki.utilities.push -import org.thoughtcrime.securesms.loki.utilities.setUpActionBarSessionLogo +import org.thoughtcrime.securesms.crypto.MnemonicUtilities +import org.thoughtcrime.securesms.util.push +import org.thoughtcrime.securesms.util.setUpActionBarSessionLogo class RecoveryPhraseRestoreActivity : BaseActionBarActivity() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/RegisterActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/RegisterActivity.kt index 636f0be4c4..9dac8875d3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/RegisterActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/RegisterActivity.kt @@ -24,8 +24,8 @@ import org.session.libsignal.utilities.KeyHelper import org.session.libsignal.utilities.hexEncodedPublicKey import org.thoughtcrime.securesms.BaseActionBarActivity import org.thoughtcrime.securesms.crypto.KeyPairUtilities -import org.thoughtcrime.securesms.loki.utilities.push -import org.thoughtcrime.securesms.loki.utilities.setUpActionBarSessionLogo +import org.thoughtcrime.securesms.util.push +import org.thoughtcrime.securesms.util.setUpActionBarSessionLogo import java.util.* class RegisterActivity : BaseActionBarActivity() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/SeedActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/SeedActivity.kt index 0b281fb6b0..ad8d3a29c7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/SeedActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/SeedActivity.kt @@ -16,8 +16,8 @@ import org.session.libsignal.crypto.MnemonicCodec import org.session.libsignal.utilities.hexEncodedPrivateKey import org.thoughtcrime.securesms.BaseActionBarActivity import org.thoughtcrime.securesms.crypto.IdentityKeyUtil -import org.thoughtcrime.securesms.loki.utilities.MnemonicUtilities -import org.thoughtcrime.securesms.loki.utilities.getColorWithID +import org.thoughtcrime.securesms.crypto.MnemonicUtilities +import org.thoughtcrime.securesms.util.getColorWithID class SeedActivity : BaseActionBarActivity() { diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/QRCodeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/QRCodeActivity.kt index 9c48552e55..cace00bac4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/QRCodeActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/QRCodeActivity.kt @@ -16,12 +16,11 @@ import network.loki.messenger.R import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.session.libsession.utilities.Address -import org.session.libsession.utilities.DistributionTypes import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragment import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragmentDelegate -import org.thoughtcrime.securesms.loki.utilities.QRCodeUtilities -import org.thoughtcrime.securesms.loki.utilities.toPx +import org.thoughtcrime.securesms.util.QRCodeUtilities +import org.thoughtcrime.securesms.util.toPx import org.session.libsession.utilities.recipients.Recipient import org.thoughtcrime.securesms.util.FileProviderUtil import org.session.libsession.utilities.TextSecurePreferences diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt index 734d31d817..b4715d25f4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt @@ -37,8 +37,8 @@ import org.thoughtcrime.securesms.loki.dialogs.ChangeUiModeDialog import org.thoughtcrime.securesms.loki.dialogs.ClearAllDataDialog import org.thoughtcrime.securesms.loki.dialogs.SeedDialog import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities -import org.thoughtcrime.securesms.loki.utilities.UiModeUtilities -import org.thoughtcrime.securesms.loki.utilities.push +import org.thoughtcrime.securesms.util.UiModeUtilities +import org.thoughtcrime.securesms.util.push import org.thoughtcrime.securesms.mms.GlideApp import org.thoughtcrime.securesms.mms.GlideRequests import org.thoughtcrime.securesms.permissions.Permissions diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ActivityUtilities.kt similarity index 97% rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt rename to app/src/main/java/org/thoughtcrime/securesms/util/ActivityUtilities.kt index 4986a1ce36..132cccf072 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ActivityUtilities.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/ActivityUtilities.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.utilities +package org.thoughtcrime.securesms.util import android.annotation.SuppressLint import android.app.Activity diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/AvatarPlaceholderGenerator.kt b/app/src/main/java/org/thoughtcrime/securesms/util/AvatarPlaceholderGenerator.kt similarity index 98% rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/AvatarPlaceholderGenerator.kt rename to app/src/main/java/org/thoughtcrime/securesms/util/AvatarPlaceholderGenerator.kt index a8bcb4852b..b93a4a0905 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/AvatarPlaceholderGenerator.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/AvatarPlaceholderGenerator.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.utilities +package org.thoughtcrime.securesms.util import android.content.Context import android.graphics.* diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt b/app/src/main/java/org/thoughtcrime/securesms/util/Broadcaster.kt similarity index 92% rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt rename to app/src/main/java/org/thoughtcrime/securesms/util/Broadcaster.kt index 74429f394a..6060c00c81 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/Broadcaster.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/Broadcaster.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.utilities +package org.thoughtcrime.securesms.util import android.content.Context import android.content.Intent diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ConfigurationMessageUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ConfigurationMessageUtilities.kt index 1efc23f8bf..354fa31f79 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/ConfigurationMessageUtilities.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/ConfigurationMessageUtilities.kt @@ -6,7 +6,6 @@ import org.session.libsession.messaging.messages.control.ConfigurationMessage import org.session.libsession.messaging.sending_receiving.MessageSender import org.session.libsession.utilities.Address import org.session.libsession.utilities.TextSecurePreferences -import org.thoughtcrime.securesms.loki.utilities.ContactUtilities object ConfigurationMessageUtilities { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ContactUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ContactUtilities.kt similarity index 93% rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ContactUtilities.kt rename to app/src/main/java/org/thoughtcrime/securesms/util/ContactUtilities.kt index 39a5c68c67..4820d005f6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ContactUtilities.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/ContactUtilities.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.utilities +package org.thoughtcrime.securesms.util import android.content.Context import org.thoughtcrime.securesms.database.DatabaseFactory diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/GeneralUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/GeneralUtilities.kt similarity index 94% rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/GeneralUtilities.kt rename to app/src/main/java/org/thoughtcrime/securesms/util/GeneralUtilities.kt index 798f937d9a..00e3e44418 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/GeneralUtilities.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/GeneralUtilities.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.utilities +package org.thoughtcrime.securesms.util import android.content.res.Resources import android.os.Build diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/GlowView.kt b/app/src/main/java/org/thoughtcrime/securesms/util/GlowView.kt index 821800a3ef..16151fd6c4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/GlowView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/GlowView.kt @@ -11,8 +11,8 @@ import android.widget.RelativeLayout import androidx.annotation.ColorInt import androidx.annotation.ColorRes import network.loki.messenger.R -import org.thoughtcrime.securesms.loki.utilities.getColorWithID -import org.thoughtcrime.securesms.loki.utilities.toPx +import org.thoughtcrime.securesms.util.getColorWithID +import org.thoughtcrime.securesms.util.toPx import kotlin.math.roundToInt interface GlowView { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt b/app/src/main/java/org/thoughtcrime/securesms/util/IP2Country.kt similarity index 97% rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt rename to app/src/main/java/org/thoughtcrime/securesms/util/IP2Country.kt index c3070a16e4..5f8678a58c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/IP2Country.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.utilities +package org.thoughtcrime.securesms.util import android.content.BroadcastReceiver import android.content.Context @@ -51,7 +51,7 @@ class IP2Country private constructor(private val context: Context) { public lateinit var shared: IP2Country - public val isInitialized: Boolean get() = ::shared.isInitialized + public val isInitialized: Boolean get() = Companion::shared.isInitialized public fun configureIfNeeded(context: Context) { if (isInitialized) { return; } diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/PointFUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/PointFUtilities.kt similarity index 92% rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/PointFUtilities.kt rename to app/src/main/java/org/thoughtcrime/securesms/util/PointFUtilities.kt index c05e3fe1cd..2cbe20aa00 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/PointFUtilities.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/PointFUtilities.kt @@ -1,7 +1,8 @@ -package org.thoughtcrime.securesms.loki.utilities +package org.thoughtcrime.securesms.util import android.graphics.PointF import android.view.View +import org.thoughtcrime.securesms.util.hitRect fun PointF.distanceTo(other: PointF): Float { return Math.sqrt(Math.pow(this.x.toDouble() - other.x.toDouble(), 2.toDouble()) + Math.pow(this.y.toDouble() - other.y.toDouble(), 2.toDouble())).toFloat() diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/QRCodeUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/QRCodeUtilities.kt similarity index 96% rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/QRCodeUtilities.kt rename to app/src/main/java/org/thoughtcrime/securesms/util/QRCodeUtilities.kt index 26d3f163b5..f7d1e3e8ad 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/QRCodeUtilities.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/QRCodeUtilities.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.utilities +package org.thoughtcrime.securesms.util import android.graphics.Bitmap import android.graphics.Color diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/viewmodel/State.kt b/app/src/main/java/org/thoughtcrime/securesms/util/State.kt similarity index 78% rename from app/src/main/java/org/thoughtcrime/securesms/loki/viewmodel/State.kt rename to app/src/main/java/org/thoughtcrime/securesms/util/State.kt index 94227d0e0c..2372c107b0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/viewmodel/State.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/State.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.viewmodel +package org.thoughtcrime.securesms.util sealed class State { object Loading : State() diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/UiModeUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/UiModeUtilities.kt similarity index 97% rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/UiModeUtilities.kt rename to app/src/main/java/org/thoughtcrime/securesms/util/UiModeUtilities.kt index 70368b85e2..39df0fccca 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/UiModeUtilities.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/UiModeUtilities.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.utilities +package org.thoughtcrime.securesms.util import android.content.Context import android.content.res.Configuration diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ViewGroupUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ViewGroupUtilities.kt similarity index 73% rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ViewGroupUtilities.kt rename to app/src/main/java/org/thoughtcrime/securesms/util/ViewGroupUtilities.kt index 3e9144206c..29aef9853d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ViewGroupUtilities.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/ViewGroupUtilities.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.utilities +package org.thoughtcrime.securesms.util import android.view.ViewGroup diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtilities.kt similarity index 97% rename from app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt rename to app/src/main/java/org/thoughtcrime/securesms/util/ViewUtilities.kt index 67a137bc48..6d4d053b6d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/ViewUtilities.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/ViewUtilities.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.utilities +package org.thoughtcrime.securesms.util import android.animation.Animator import android.animation.AnimatorListenerAdapter diff --git a/app/src/main/res/layout-sw400dp/fragment_enter_public_key.xml b/app/src/main/res/layout-sw400dp/fragment_enter_public_key.xml index ad8de37b72..33b8133db2 100644 --- a/app/src/main/res/layout-sw400dp/fragment_enter_public_key.xml +++ b/app/src/main/res/layout-sw400dp/fragment_enter_public_key.xml @@ -48,7 +48,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index 48c5944b10..4a3e300d94 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -27,7 +27,7 @@ android:layout_marginLeft="20dp" android:layout_marginRight="20dp"> - - - - - - - - - diff --git a/app/src/main/res/layout/view_visible_message.xml b/app/src/main/res/layout/view_visible_message.xml index 71264b05c0..195a81d020 100644 --- a/app/src/main/res/layout/view_visible_message.xml +++ b/app/src/main/res/layout/view_visible_message.xml @@ -35,7 +35,7 @@ android:layout_width="26dp" android:layout_height="32dp" > -