From a88322a0333dc1e2d20a6c0c5b5f9320de21812b Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Tue, 18 May 2021 09:12:33 +1000 Subject: [PATCH] Move files --- .../securesms/ApplicationContext.java | 8 +------- .../securesms/MediaDocumentsAdapter.java | 2 +- .../securesms/MediaPreviewActivity.java | 2 +- .../securesms/MessageDetailsActivity.java | 2 +- .../securesms/PassphrasePromptActivity.java | 2 +- .../PassphraseRequiredActionBarActivity.java | 2 +- .../thoughtcrime/securesms/ShareActivity.java | 3 +-- .../attachments/AttachmentServer.java | 2 +- .../attachments/DatabaseAttachmentProvider.kt | 2 +- .../securesms/audio/AudioCodec.java | 2 +- .../securesms/audio/AudioRecorder.java | 6 +++--- .../securesms/audio/AudioSlidePlayer.java | 2 +- .../securesms/avatar/AvatarSelection.java | 6 +++--- .../securesms/backup/BackupDialog.java | 2 +- .../securesms/backup/BackupPassphrase.java | 2 +- .../securesms/backup/BackupPreferences.kt | 2 +- .../securesms/backup/FullBackupExporter.kt | 2 +- .../securesms/backup/FullBackupImporter.kt | 2 +- .../securesms/components/ComposeText.java | 2 +- .../components/CustomDefaultPreference.java | 2 +- .../components/GlideBitmapListeningTarget.java | 2 +- .../GlideDrawableListeningTarget.java | 2 +- .../securesms/components/InputPanel.java | 6 +++--- .../components/KeyboardAwareLinearLayout.java | 2 +- .../securesms/components/ThumbnailView.java | 8 ++++---- .../securesms/components/ZoomingImageView.java | 2 +- .../components/camera/CameraUtils.java | 2 +- .../components/camera/CameraView.java | 2 +- .../components/emoji/EmojiProvider.java | 2 +- .../components/emoji/MediaKeyboard.java | 2 +- .../components/emoji/RecentEmojiPageModel.java | 2 +- .../emoji/parsing/EmojiPageBitmap.java | 2 +- .../subsampling/AttachmentRegionDecoder.java | 2 +- .../conversation/ConversationActivity.java | 6 +++--- .../conversation/ConversationAdapter.java | 2 +- .../conversation/ConversationFragment.java | 2 +- .../conversation/ConversationItem.java | 2 +- .../ConversationPopupActivity.java | 4 ++-- .../ClassicDecryptingPartInputStream.java | 2 +- .../securesms/database/AttachmentDatabase.java | 4 ++-- .../securesms/database/EarlyReceiptCache.java | 2 +- .../securesms/database/MessagingDatabase.java | 2 +- .../securesms/database/MmsDatabase.java | 2 +- .../securesms/database/PushDatabase.java | 2 +- .../securesms/database/RecipientDatabase.java | 9 ++------- .../securesms/database/SmsDatabase.java | 2 +- .../securesms/database/ThreadDatabase.java | 2 +- .../database/helpers/SQLCipherOpenHelper.java | 2 +- .../securesms/giph/net/GiphyLoader.java | 2 +- .../securesms/giph/ui/GiphyActivity.java | 2 +- .../securesms/giph/ui/GiphyAdapter.java | 2 +- .../glide/ChunkedImageUrlFetcher.java | 2 +- .../cache/EncryptedBitmapCacheDecoder.java | 2 +- .../cache/EncryptedBitmapResourceEncoder.java | 2 +- .../glide/cache/EncryptedCacheEncoder.java | 2 +- .../glide/cache/EncryptedGifCacheDecoder.java | 2 +- .../EncryptedGifDrawableResourceEncoder.java | 2 +- .../jobmanager/AlarmManagerScheduler.java | 2 +- .../securesms/jobmanager/InAppScheduler.java | 2 +- .../thoughtcrime/securesms/jobmanager/Job.java | 2 +- .../securesms/jobmanager/JobController.java | 2 +- .../securesms/jobmanager/JobManager.java | 2 +- .../securesms/jobmanager/JobRunner.java | 2 +- .../jobmanager/JobSchedulerScheduler.java | 2 +- .../jobmanager/impl/JsonDataSerializer.java | 2 +- .../securesms/jobs/AvatarDownloadJob.java | 2 +- .../thoughtcrime/securesms/jobs/BaseJob.java | 2 +- .../securesms/jobs/LocalBackupJob.java | 4 ++-- .../jobs/RetrieveProfileAvatarJob.java | 2 +- .../securesms/jobs/TrimThreadJob.java | 2 +- .../securesms/jobs/UpdateApkJob.java | 2 +- .../linkpreview/LinkPreviewRepository.java | 2 +- .../securesms/logging/AndroidLogger.java | 2 +- .../securesms/logging/PersistentLogger.java | 8 ++++---- .../logging/UncaughtExceptionLogger.java | 2 +- .../loki/activities/BackupRestoreActivity.kt | 2 +- .../loki/activities/JoinPublicChatActivity.kt | 3 +-- .../loki/activities/LinkDeviceActivity.kt | 2 +- .../securesms/loki/api/BackgroundPollWorker.kt | 2 +- .../loki/api/LokiPushNotificationManager.kt | 2 +- .../api/PrepareAttachmentAudioExtrasJob.kt | 2 +- .../loki/api/PublicChatInfoUpdateWorker.kt | 2 +- .../loki/api/PushNotificationService.kt | 2 +- .../securesms/loki/database/LokiAPIDatabase.kt | 2 +- .../loki/database/LokiUserDatabase.kt | 2 +- .../loki/database/SessionJobDatabase.kt | 2 +- .../fragments/ContactSelectionListFragment.kt | 2 +- .../securesms/loki/utilities/IP2Country.kt | 2 +- .../securesms/loki/views/MessageAudioView.kt | 3 +-- .../loki/views/OpenGroupInvitationView.kt | 6 +----- .../longmessage/LongMessageRepository.java | 2 +- .../securesms/mediasend/Camera1Controller.java | 2 +- .../securesms/mediasend/Camera1Fragment.java | 2 +- .../securesms/mediasend/MediaSendActivity.java | 2 +- .../securesms/mediasend/MediaSendFragment.java | 6 +++--- .../mediasend/MediaSendVideoFragment.java | 2 +- .../mediasend/MediaSendViewModel.java | 2 +- .../securesms/mms/AttachmentManager.java | 12 ++++++------ .../mms/AttachmentStreamLocalUriFetcher.java | 2 +- .../mms/DecryptableStreamLocalUriFetcher.java | 2 +- .../securesms/mms/DocumentSlide.java | 2 +- .../securesms/mms/MediaConstraints.java | 2 +- .../thoughtcrime/securesms/mms/QuoteId.java | 2 +- .../securesms/net/ChunkedDataFetcher.java | 2 +- .../net/ContentProxySafetyInterceptor.java | 2 +- .../securesms/net/ContentProxySelector.java | 2 +- .../AndroidAutoHeardReceiver.java | 2 +- .../AndroidAutoReplyReceiver.java | 2 +- .../notifications/DefaultMessageNotifier.java | 2 +- .../notifications/MarkReadReceiver.java | 2 +- .../notifications/NotificationChannels.java | 2 +- .../notifications/NotificationState.java | 2 +- .../notifications/RemoteReplyReceiver.java | 2 +- .../SingleRecipientNotificationBuilder.java | 2 +- .../preferences/ChatsPreferenceFragment.java | 2 +- .../securesms/providers/BlobProvider.java | 2 +- .../securesms/providers/PartProvider.java | 2 +- .../securesms/qr/ScanningThread.java | 2 +- .../scribbles/ImageEditorFragment.java | 2 +- .../securesms/scribbles/StickerLoader.java | 2 +- .../securesms/search/SearchRepository.java | 2 +- .../securesms/service/DirectShareService.java | 2 +- .../service/ExpiringMessageManager.java | 2 +- .../service/GenericForegroundService.java | 2 +- .../securesms/service/KeyCachingService.java | 2 +- .../PersistentAlarmManagerListener.java | 2 +- .../PersistentConnectionBootListener.java | 2 +- .../service/QuickResponseService.java | 4 +--- .../service/UpdateApkReadyListener.java | 2 +- .../service/UpdateApkRefreshListener.java | 2 +- .../sskenvironment/ReadReceiptManager.kt | 2 +- .../sskenvironment/TypingStatusRepository.java | 2 +- .../securesms/util/AttachmentUtil.java | 2 +- .../thoughtcrime/securesms/util/BackupUtil.kt | 2 +- .../securesms/util/BitmapUtil.java | 2 +- .../thoughtcrime/securesms/util/DateUtils.java | 2 +- .../thoughtcrime/securesms/util/MediaUtil.java | 2 +- .../thoughtcrime/securesms/util/ResUtil.java | 2 +- .../securesms/util/SaveAttachmentTask.kt | 4 ++-- .../securesms/util/SingleLiveEvent.java | 2 +- .../securesms/util/SmsCharacterCalculator.java | 2 +- .../thoughtcrime/securesms/util/Stopwatch.java | 2 +- .../securesms/util/StreamUtil.java | 2 +- .../securesms/util/WakeLockUtil.java | 2 +- .../securesms/video/VideoPlayer.java | 2 +- .../thoughtcrime/securesms/BaseUnitTest.java | 2 +- .../securesms/logging/LogTest.java | 2 +- .../documents/IdentityKeyMismatch.java | 2 +- .../messaging/file_server/FileServerAPI.kt | 2 +- .../messaging/file_server/FileServerAPIV2.kt | 2 +- .../messaging/jobs/AttachmentDownloadJob.kt | 2 +- .../messaging/jobs/AttachmentUploadJob.kt | 4 +--- .../libsession/messaging/jobs/JobQueue.kt | 2 +- .../messaging/jobs/MessageReceiveJob.kt | 2 +- .../messaging/jobs/MessageSendJob.kt | 2 +- .../messaging/jobs/NotifyPNServerJob.kt | 2 +- .../control/ClosedGroupControlMessage.kt | 2 +- .../control/DataExtractionNotification.kt | 2 +- .../messages/control/ExpirationTimerUpdate.kt | 2 +- .../messaging/messages/control/ReadReceipt.kt | 2 +- .../messages/control/TypingIndicator.kt | 2 +- .../messaging/messages/visible/LinkPreview.kt | 2 +- .../messages/visible/OpenGroupInvitation.kt | 2 +- .../messaging/messages/visible/Profile.kt | 2 +- .../messaging/messages/visible/Quote.kt | 2 +- .../messages/visible/VisibleMessage.kt | 2 +- .../messaging/open_groups/OpenGroupAPI.kt | 4 +--- .../messaging/open_groups/OpenGroupAPIV2.kt | 2 +- .../messaging/open_groups/OpenGroupMessage.kt | 2 +- .../open_groups/OpenGroupMessageV2.kt | 2 +- .../messaging/open_groups/OpenGroupV2.kt | 2 +- .../sending_receiving/MessageEncrypter.kt | 2 +- .../sending_receiving/MessageSender.kt | 2 +- .../MessageSenderClosedGroupHandler.kt | 2 +- .../ReceivedMessageHandler.kt | 3 +-- .../notifications/PushNotificationAPI.kt | 2 +- .../pollers/ClosedGroupPoller.kt | 2 +- .../pollers/OpenGroupPoller.kt | 2 +- .../pollers/OpenGroupV2Poller.kt | 2 +- .../sending_receiving/pollers/Poller.kt | 2 +- .../threads/recipients/Recipient.java | 2 +- .../messaging/utilities/DotNetAPI.kt | 6 +----- .../messaging/utilities/MessageWrapper.kt | 3 +-- .../messaging/utilities/UpdateMessageData.kt | 2 +- .../libsession/snode/OnionRequestAPI.kt | 2 +- .../org/session/libsession/snode/SnodeAPI.kt | 2 +- .../libsession/utilities/DownloadUtilities.kt | 2 +- .../utilities/TextSecurePreferences.kt | 2 +- .../libsession/utilities/ThemeUtil.java | 2 +- .../org/session/libsession/utilities/Util.kt | 2 +- .../session/libsession/utilities/ViewUtil.java | 7 ++----- .../concurrent/AssertedSuccessListener.java | 2 +- .../DynamicLanguageActivityHelper.java | 2 +- libsignal/src/main/AndroidManifest.xml | 5 +---- .../api/messages/SignalServiceEnvelope.java | 18 ------------------ .../internal/push/PushTransportDetails.java | 2 +- .../org/session/libsignal/service/loki/HTTP.kt | 2 +- .../ExternalStorageUtil.kt | 2 +- .../session/libsignal/utilities/JsonUtil.java | 10 ---------- .../{concurrent => }/ListenableFuture.java | 2 +- .../libsignal/utilities/{logging => }/Log.java | 2 +- .../NoExternalStorageException.java | 2 +- .../libsignal/utilities/PromiseUtilities.kt | 1 - .../{concurrent => }/SettableFuture.java | 2 +- 204 files changed, 228 insertions(+), 293 deletions(-) rename libsignal/src/main/java/org/session/libsignal/utilities/{externalstorage => }/ExternalStorageUtil.kt (97%) rename libsignal/src/main/java/org/session/libsignal/utilities/{concurrent => }/ListenableFuture.java (85%) rename libsignal/src/main/java/org/session/libsignal/utilities/{logging => }/Log.java (98%) rename libsignal/src/main/java/org/session/libsignal/utilities/{externalstorage => }/NoExternalStorageException.java (95%) rename libsignal/src/main/java/org/session/libsignal/utilities/{concurrent => }/SettableFuture.java (98%) diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java index 2e8294b565..f57a6e40ac 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java @@ -33,7 +33,6 @@ import org.conscrypt.Conscrypt; import org.session.libsession.messaging.MessagingModuleConfiguration; import org.session.libsession.messaging.avatars.AvatarHelper; import org.session.libsession.messaging.file_server.FileServerAPI; -import org.session.libsession.messaging.jobs.JobQueue; import org.session.libsession.messaging.mentions.MentionsManager; import org.session.libsession.messaging.open_groups.OpenGroupAPI; import org.session.libsession.messaging.sending_receiving.notifications.MessageNotifier; @@ -49,10 +48,9 @@ import org.session.libsession.utilities.Util; import org.session.libsession.utilities.dynamiclanguage.DynamicLanguageContextWrapper; import org.session.libsession.utilities.dynamiclanguage.LocaleParser; import org.session.libsession.utilities.preferences.ProfileKeyUtil; -import org.session.libsignal.service.api.util.StreamDetails; import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol; import org.session.libsignal.utilities.ThreadUtils; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.signal.aesgcmprovider.AesGcmProvider; import org.thoughtcrime.securesms.components.TypingStatusSender; import org.thoughtcrime.securesms.database.DatabaseFactory; @@ -93,10 +91,7 @@ import org.webrtc.voiceengine.WebRtcAudioManager; import org.webrtc.voiceengine.WebRtcAudioUtils; import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; import java.io.InputStream; -import java.security.SecureRandom; import java.security.Security; import java.util.Date; import java.util.HashSet; @@ -104,7 +99,6 @@ import java.util.Set; import dagger.ObjectGraph; import kotlin.Unit; -import kotlin.jvm.functions.Function1; import kotlinx.coroutines.Job; import network.loki.messenger.BuildConfig; diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaDocumentsAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/MediaDocumentsAdapter.java index 6e69e78d08..bbc00472a5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MediaDocumentsAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MediaDocumentsAdapter.java @@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.MediaDocumentsAdapter.ViewHolder; import org.thoughtcrime.securesms.components.DocumentView; import org.thoughtcrime.securesms.database.CursorRecyclerViewAdapter; import org.thoughtcrime.securesms.database.MediaDatabase; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.DocumentSlide; import org.thoughtcrime.securesms.mms.PartAuthority; import org.thoughtcrime.securesms.mms.Slide; diff --git a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java index 6edfca5e9d..ba2b2722c1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java @@ -58,7 +58,7 @@ import org.session.libsession.messaging.threads.Address; import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.threads.recipients.RecipientModifiedListener; import org.session.libsession.utilities.Util; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.components.MediaView; import org.thoughtcrime.securesms.database.MediaDatabase.MediaRecord; import org.thoughtcrime.securesms.database.loaders.PagingMediaLoader; diff --git a/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java b/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java index 5789d6f791..707a522007 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/MessageDetailsActivity.java @@ -55,7 +55,7 @@ import org.thoughtcrime.securesms.database.MmsSmsDatabase; import org.thoughtcrime.securesms.database.SmsDatabase; import org.thoughtcrime.securesms.database.loaders.MessageDetailsLoader; import org.thoughtcrime.securesms.database.model.MessageRecord; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.database.model.MmsMessageRecord; import org.thoughtcrime.securesms.loki.database.LokiMessageDatabase; import org.thoughtcrime.securesms.mms.GlideApp; diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java index ad75d60330..df61907714 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/PassphrasePromptActivity.java @@ -41,7 +41,7 @@ import androidx.core.os.CancellationSignal; import org.thoughtcrime.securesms.animation.AnimationCompleteListener; import org.thoughtcrime.securesms.components.AnimatingToggle; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.service.KeyCachingService; import org.session.libsession.utilities.TextSecurePreferences; diff --git a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java index 4cc0210a1d..d4e836ae4d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActionBarActivity.java @@ -11,7 +11,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.loki.activities.HomeActivity; import org.thoughtcrime.securesms.loki.activities.LandingActivity; import org.thoughtcrime.securesms.service.KeyCachingService; diff --git a/app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java b/app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java index 9c873eb6db..68614fe92d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ShareActivity.java @@ -40,8 +40,7 @@ import org.thoughtcrime.securesms.components.SearchToolbar; import org.thoughtcrime.securesms.conversation.ConversationActivity; import org.session.libsession.messaging.threads.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; -import org.thoughtcrime.securesms.database.ThreadDatabase; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.loki.fragments.ContactSelectionListFragment; import org.thoughtcrime.securesms.loki.fragments.ContactSelectionListLoader.DisplayMode; import org.thoughtcrime.securesms.mediasend.Media; diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentServer.java b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentServer.java index 96e615824d..e186007ee3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentServer.java +++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/AttachmentServer.java @@ -5,7 +5,7 @@ import android.content.Context; import android.net.Uri; import androidx.annotation.NonNull; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.PartAuthority; import org.session.libsignal.utilities.Hex; diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt index 1bc9e43de0..43bf135274 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachmentProvider.kt @@ -15,7 +15,7 @@ import org.session.libsignal.service.api.messages.SignalServiceAttachment import org.session.libsignal.service.api.messages.SignalServiceAttachmentPointer import org.session.libsignal.service.api.messages.SignalServiceAttachmentStream import org.session.libsignal.utilities.Base64 -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.database.AttachmentDatabase import org.thoughtcrime.securesms.database.Database import org.thoughtcrime.securesms.database.DatabaseFactory diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java index 257218f147..ff3b0b809a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java +++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioCodec.java @@ -8,7 +8,7 @@ import android.media.MediaCodecInfo; import android.media.MediaFormat; import android.media.MediaRecorder; import android.os.Build; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java index a2c7080518..35cbf16b63 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioRecorder.java @@ -8,7 +8,7 @@ import android.os.ParcelFileDescriptor; import androidx.annotation.NonNull; import org.session.libsession.utilities.MediaTypes; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import android.util.Pair; import org.thoughtcrime.securesms.providers.BlobProvider; @@ -16,8 +16,8 @@ import org.thoughtcrime.securesms.util.MediaUtil; import org.session.libsignal.utilities.ThreadUtils; import org.session.libsession.utilities.Util; -import org.session.libsignal.utilities.concurrent.ListenableFuture; -import org.session.libsignal.utilities.concurrent.SettableFuture; +import org.session.libsignal.utilities.ListenableFuture; +import org.session.libsignal.utilities.SettableFuture; import java.io.IOException; import java.util.concurrent.ExecutorService; diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java index 1af511583c..a33b8748a8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java +++ b/app/src/main/java/org/thoughtcrime/securesms/audio/AudioSlidePlayer.java @@ -34,7 +34,7 @@ import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; import org.jetbrains.annotations.NotNull; import org.thoughtcrime.securesms.attachments.AttachmentServer; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.AudioSlide; import org.session.libsession.utilities.ServiceUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.java b/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.java index ea016ff3c4..b0fbd8e22f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.java +++ b/app/src/main/java/org/thoughtcrime/securesms/avatar/AvatarSelection.java @@ -16,9 +16,9 @@ import androidx.core.content.ContextCompat; import com.theartofdev.edmodo.cropper.CropImage; import com.theartofdev.edmodo.cropper.CropImageView; -import org.session.libsignal.utilities.externalstorage.NoExternalStorageException; -import org.session.libsignal.utilities.logging.Log; -import org.session.libsignal.utilities.externalstorage.ExternalStorageUtil; +import org.session.libsignal.utilities.NoExternalStorageException; +import org.session.libsignal.utilities.Log; +import org.session.libsignal.utilities.ExternalStorageUtil; import org.thoughtcrime.securesms.util.FileProviderUtil; import org.thoughtcrime.securesms.util.IntentUtils; diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java index 41cd8afdf7..76342898b1 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java @@ -12,7 +12,7 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.AlertDialog; import org.thoughtcrime.securesms.components.SwitchPreferenceCompat; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.util.BackupDirSelector; import org.thoughtcrime.securesms.util.BackupUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java index e834454ad1..eec2a2e588 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPassphrase.java @@ -6,7 +6,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.thoughtcrime.securesms.crypto.KeyStoreHelper; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.TextSecurePreferences; /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPreferences.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPreferences.kt index 4ca3ed3f6f..8ddfc23a8b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPreferences.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupPreferences.kt @@ -6,7 +6,7 @@ import android.os.Build import android.preference.PreferenceManager import android.preference.PreferenceManager.getDefaultSharedPreferencesName import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.backup.FullBackupImporter.PREF_PREFIX_TYPE_BOOLEAN import org.thoughtcrime.securesms.backup.FullBackupImporter.PREF_PREFIX_TYPE_INT import java.util.* diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt index 9d1c012fb5..2d0e2fca33 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.kt @@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.crypto.AttachmentSecret import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream import org.thoughtcrime.securesms.database.* -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase import org.thoughtcrime.securesms.loki.database.LokiBackupFilesDatabase import org.thoughtcrime.securesms.util.BackupUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt index 0452f32b41..9d82e9c7e0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupImporter.kt @@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.backup.BackupProtos.* import org.thoughtcrime.securesms.crypto.AttachmentSecret import org.thoughtcrime.securesms.crypto.ModernEncryptingPartOutputStream import org.thoughtcrime.securesms.database.* -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.util.BackupUtil import org.session.libsession.messaging.avatars.AvatarHelper diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java b/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java index ca94a82037..012086dc94 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/ComposeText.java @@ -23,7 +23,7 @@ import androidx.core.view.inputmethod.InputConnectionCompat; import androidx.core.view.inputmethod.InputContentInfoCompat; import org.thoughtcrime.securesms.components.emoji.EmojiEditText; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.TextSecurePreferences; public class ComposeText extends EmojiEditText { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java b/app/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java index 44e3ba60b8..178803a9f0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/CustomDefaultPreference.java @@ -12,7 +12,7 @@ import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; import android.util.AttributeSet; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import android.view.View; import android.widget.AdapterView; import android.widget.Button; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java b/app/src/main/java/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java index ea5103dc12..61094fb7df 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/GlideBitmapListeningTarget.java @@ -8,7 +8,7 @@ import android.widget.ImageView; import com.bumptech.glide.request.target.BitmapImageViewTarget; -import org.session.libsignal.utilities.concurrent.SettableFuture; +import org.session.libsignal.utilities.SettableFuture; public class GlideBitmapListeningTarget extends BitmapImageViewTarget { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java b/app/src/main/java/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java index 0c8b502448..d177900124 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/GlideDrawableListeningTarget.java @@ -7,7 +7,7 @@ import android.widget.ImageView; import com.bumptech.glide.request.target.DrawableImageViewTarget; -import org.session.libsignal.utilities.concurrent.SettableFuture; +import org.session.libsignal.utilities.SettableFuture; public class GlideDrawableListeningTarget extends DrawableImageViewTarget { diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java index 5a67ee67ab..05e91b9e17 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/InputPanel.java @@ -25,7 +25,7 @@ import android.widget.Toast; import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider; import org.thoughtcrime.securesms.components.emoji.EmojiToggle; import org.thoughtcrime.securesms.components.emoji.MediaKeyboard; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.loki.utilities.MentionUtilities; import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.mms.SlideDeck; @@ -37,8 +37,8 @@ import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.ViewUtil; import org.session.libsession.utilities.concurrent.AssertedSuccessListener; -import org.session.libsignal.utilities.concurrent.ListenableFuture; -import org.session.libsignal.utilities.concurrent.SettableFuture; +import org.session.libsignal.utilities.ListenableFuture; +import org.session.libsignal.utilities.SettableFuture; import org.session.libsignal.libsignal.util.guava.Optional; import java.util.concurrent.TimeUnit; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java b/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java index e88e91703d..338b801770 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/KeyboardAwareLinearLayout.java @@ -24,7 +24,7 @@ import android.os.Build.VERSION_CODES; import android.preference.PreferenceManager; import androidx.appcompat.widget.LinearLayoutCompat; import android.util.AttributeSet; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import android.view.Surface; import android.view.View; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java index 2628f031dc..8546d95601 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/ThumbnailView.java @@ -8,7 +8,7 @@ import androidx.annotation.UiThread; import android.util.AttributeSet; import org.session.libsession.messaging.sending_receiving.attachments.AttachmentTransferProgress; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; @@ -23,7 +23,7 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.request.RequestOptions; import network.loki.messenger.R; -import org.thoughtcrime.securesms.database.AttachmentDatabase; + import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri; import org.thoughtcrime.securesms.mms.GlideRequest; import org.thoughtcrime.securesms.mms.GlideRequests; @@ -34,8 +34,8 @@ import org.session.libsignal.libsignal.util.guava.Optional; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.ViewUtil; -import org.session.libsignal.utilities.concurrent.ListenableFuture; -import org.session.libsignal.utilities.concurrent.SettableFuture; +import org.session.libsignal.utilities.ListenableFuture; +import org.session.libsignal.utilities.SettableFuture; import java.util.Collections; import java.util.Locale; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java b/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java index 507a99e05a..265f707df9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/ZoomingImageView.java @@ -9,7 +9,7 @@ import androidx.annotation.Nullable; import android.util.AttributeSet; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import android.util.Pair; import android.view.View; import android.widget.FrameLayout; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java b/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java index b929871d2b..1aea994a98 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraUtils.java @@ -8,7 +8,7 @@ import android.hardware.Camera.Size; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import android.util.DisplayMetrics; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import android.view.Surface; import java.util.Collections; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java b/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java index 7ec7683b1a..f072960c65 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/camera/CameraView.java @@ -32,7 +32,7 @@ import android.os.Build.VERSION; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import android.util.AttributeSet; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import android.view.OrientationEventListener; import android.view.ViewGroup; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java index 3e417e107a..76dfe1bf13 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java @@ -22,7 +22,7 @@ import org.thoughtcrime.securesms.components.emoji.parsing.EmojiDrawInfo; import org.thoughtcrime.securesms.components.emoji.parsing.EmojiPageBitmap; import org.thoughtcrime.securesms.components.emoji.parsing.EmojiParser; import org.thoughtcrime.securesms.components.emoji.parsing.EmojiTree; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.FutureTaskListener; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java index 42a1e09f87..0aa3c33c71 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/MediaKeyboard.java @@ -16,7 +16,7 @@ import android.widget.FrameLayout; import org.thoughtcrime.securesms.components.InputAwareLayout.InputView; import org.thoughtcrime.securesms.components.RepeatableImageKey; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.GlideApp; import java.util.Arrays; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java index 447d062ccb..ec6babe405 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java @@ -11,7 +11,7 @@ import com.fasterxml.jackson.databind.type.CollectionType; import com.fasterxml.jackson.databind.type.TypeFactory; import network.loki.messenger.R; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsignal.utilities.JsonUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java index 763062e78c..a01e8f329f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/parsing/EmojiPageBitmap.java @@ -7,7 +7,7 @@ import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.os.AsyncTask; import androidx.annotation.NonNull; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.components.emoji.EmojiPageModel; import org.thoughtcrime.securesms.util.Stopwatch; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java b/app/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java index 60669714b7..f7b1724504 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/subsampling/AttachmentRegionDecoder.java @@ -12,7 +12,7 @@ import android.net.Uri; import com.davemorrissey.labs.subscaleview.decoder.ImageRegionDecoder; import com.davemorrissey.labs.subscaleview.decoder.SkiaImageRegionDecoder; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.PartAuthority; import java.io.InputStream; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 8143b5df5f..f6a32654ff 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -117,9 +117,9 @@ import org.session.libsignal.libsignal.util.guava.Optional; import org.session.libsignal.service.loki.Mention; import org.session.libsignal.service.loki.utilities.HexEncodingKt; import org.session.libsignal.service.loki.utilities.PublicKeyValidation; -import org.session.libsignal.utilities.concurrent.ListenableFuture; -import org.session.libsignal.utilities.concurrent.SettableFuture; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.ListenableFuture; +import org.session.libsignal.utilities.SettableFuture; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.ExpirationDialog; import org.thoughtcrime.securesms.MediaOverviewActivity; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java index f2b2d38b70..b748a0945f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationAdapter.java @@ -40,7 +40,7 @@ import org.thoughtcrime.securesms.database.MmsSmsColumns; import org.thoughtcrime.securesms.database.MmsSmsDatabase; import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.MmsMessageRecord; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.GlideRequests; import org.thoughtcrime.securesms.mms.SlideDeck; import org.session.libsession.messaging.threads.recipients.Recipient; 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 dae7408bb9..91b45536a5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java @@ -78,7 +78,7 @@ import org.session.libsession.utilities.ViewUtil; import org.session.libsession.utilities.concurrent.SimpleTask; import org.session.libsession.utilities.task.ProgressDialogAsyncTask; import org.session.libsignal.libsignal.util.guava.Optional; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.MessageDetailsActivity; import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java index 1b7d11e743..b8acb80571 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java @@ -71,7 +71,7 @@ import org.session.libsession.utilities.Util; import org.session.libsession.utilities.ViewUtil; import org.session.libsession.utilities.views.Stub; import org.session.libsignal.libsignal.util.guava.Optional; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.BindableConversationItem; import org.thoughtcrime.securesms.MediaPreviewActivity; import org.thoughtcrime.securesms.MessageDetailsActivity; diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java index 7807d2820d..f288ac5ba5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationPopupActivity.java @@ -12,8 +12,8 @@ import android.view.MenuInflater; import android.view.MenuItem; import android.view.WindowManager; -import org.session.libsignal.utilities.logging.Log; -import org.session.libsignal.utilities.concurrent.ListenableFuture; +import org.session.libsignal.utilities.Log; +import org.session.libsignal.utilities.ListenableFuture; import java.util.concurrent.ExecutionException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java b/app/src/main/java/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java index 0a24003db5..a8800a2507 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java +++ b/app/src/main/java/org/thoughtcrime/securesms/crypto/ClassicDecryptingPartInputStream.java @@ -18,7 +18,7 @@ package org.thoughtcrime.securesms.crypto; import androidx.annotation.NonNull; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.util.LimitedInputStream; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java index 59b7f52c7d..4b20ee202e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/AttachmentDatabase.java @@ -45,8 +45,8 @@ import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAt import org.session.libsession.utilities.MediaTypes; import org.session.libsession.utilities.Util; import org.session.libsignal.utilities.JsonUtil; -import org.session.libsignal.utilities.externalstorage.ExternalStorageUtil; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.ExternalStorageUtil; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.crypto.AttachmentSecret; import org.thoughtcrime.securesms.crypto.ClassicDecryptingPartInputStream; import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/EarlyReceiptCache.java b/app/src/main/java/org/thoughtcrime/securesms/database/EarlyReceiptCache.java index 7c7a292d0c..ac21ff3bed 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/EarlyReceiptCache.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/EarlyReceiptCache.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.database; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.messaging.threads.Address; import org.thoughtcrime.securesms.util.LRUCache; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java index 5c92b976f5..026d6b48a6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessagingDatabase.java @@ -11,7 +11,7 @@ import org.session.libsession.database.documents.Document; import org.session.libsession.database.documents.IdentityKeyMismatch; import org.session.libsession.database.documents.IdentityKeyMismatchList; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsignal.libsignal.IdentityKey; import org.session.libsession.messaging.threads.Address; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java index 84ad24c601..3d6510dcaa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java @@ -68,7 +68,7 @@ import org.session.libsignal.utilities.JsonUtil; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsignal.libsignal.util.guava.Optional; import java.io.Closeable; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java index 73a361ae55..6d63e2797a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/PushDatabase.java @@ -4,7 +4,7 @@ import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import androidx.annotation.NonNull; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import net.sqlcipher.database.SQLiteDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java index 20c9fe83f3..316822b406 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/RecipientDatabase.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.database; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; -import android.net.Uri; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -20,16 +20,11 @@ import org.session.libsignal.utilities.Base64; import org.session.libsession.utilities.Util; import org.session.libsignal.libsignal.util.guava.Optional; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.io.Closeable; import java.io.IOException; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; import java.util.List; -import java.util.Map; -import java.util.Set; public class RecipientDatabase extends Database { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java index 1da23548da..15dc6003cf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java @@ -28,7 +28,7 @@ import com.annimon.stream.Stream; import net.sqlcipher.database.SQLiteDatabase; import net.sqlcipher.database.SQLiteStatement; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.session.libsession.database.documents.IdentityKeyMismatch; import org.session.libsession.database.documents.IdentityKeyMismatchList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java index 1ebfa6146b..f70ebabd11 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java @@ -41,7 +41,7 @@ import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; import org.session.libsignal.libsignal.util.Pair; import org.session.libsignal.libsignal.util.guava.Optional; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.contactshare.ContactUtil; import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java index ef04bedbb7..034fd7f521 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/helpers/SQLCipherOpenHelper.java @@ -22,7 +22,7 @@ import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.database.SearchDatabase; import org.thoughtcrime.securesms.database.SmsDatabase; import org.thoughtcrime.securesms.database.ThreadDatabase; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.loki.database.LokiAPIDatabase; import org.thoughtcrime.securesms.loki.database.LokiBackupFilesDatabase; import org.thoughtcrime.securesms.loki.database.LokiMessageDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyLoader.java b/app/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyLoader.java index 7de0aa4ad9..c908dd8d23 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyLoader.java +++ b/app/src/main/java/org/thoughtcrime/securesms/giph/net/GiphyLoader.java @@ -6,7 +6,7 @@ import android.net.Uri; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import android.text.TextUtils; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.giph.model.GiphyImage; diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java index adbc8a86b8..dcfdb66112 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyActivity.java @@ -20,7 +20,7 @@ import com.google.android.material.tabs.TabLayout; import org.session.libsession.utilities.MediaTypes; import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.providers.BlobProvider; import org.session.libsession.utilities.ViewUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java index 41298ec0bf..a955f368fd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java +++ b/app/src/main/java/org/thoughtcrime/securesms/giph/ui/GiphyAdapter.java @@ -10,7 +10,7 @@ import androidx.recyclerview.widget.RecyclerView; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java index 8d6002dbdc..15628245a4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/glide/ChunkedImageUrlFetcher.java @@ -8,7 +8,7 @@ import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.data.DataFetcher; import org.thoughtcrime.securesms.giph.model.ChunkedImageUrl; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.net.ChunkedDataFetcher; import org.thoughtcrime.securesms.net.RequestController; diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java index abefc3a10f..91f2cb2f26 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapCacheDecoder.java @@ -4,7 +4,7 @@ package org.thoughtcrime.securesms.glide.cache; import android.graphics.Bitmap; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import com.bumptech.glide.load.Options; import com.bumptech.glide.load.ResourceDecoder; diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java index 91833cc485..e10e3ecc6e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedBitmapResourceEncoder.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.glide.cache; import android.graphics.Bitmap; import androidx.annotation.NonNull; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import com.bumptech.glide.load.EncodeStrategy; import com.bumptech.glide.load.Options; diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java index 3fc1040a20..c5f91ae2ab 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCacheEncoder.java @@ -7,7 +7,7 @@ import com.bumptech.glide.load.Encoder; import com.bumptech.glide.load.Options; import com.bumptech.glide.load.engine.bitmap_recycle.ArrayPool; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.io.File; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java index 4bed667cf0..24a678c8fa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifCacheDecoder.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.glide.cache; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import com.bumptech.glide.load.Options; import com.bumptech.glide.load.ResourceDecoder; diff --git a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java index b4efbd822f..a208e81c3e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedGifDrawableResourceEncoder.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.glide.cache; import androidx.annotation.NonNull; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import com.bumptech.glide.load.EncodeStrategy; import com.bumptech.glide.load.Options; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java index 605ff7f2e4..62f2ee6b27 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/AlarmManagerScheduler.java @@ -12,7 +12,7 @@ import com.annimon.stream.Stream; import org.thoughtcrime.securesms.ApplicationContext; import network.loki.messenger.BuildConfig; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.List; import java.util.UUID; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java index 0cd295824c..b0f314eaa6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/InAppScheduler.java @@ -6,7 +6,7 @@ import androidx.annotation.NonNull; import com.annimon.stream.Stream; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java index d82e851f39..990207779d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/Job.java @@ -6,7 +6,7 @@ import androidx.annotation.Nullable; import androidx.annotation.WorkerThread; import org.session.libsession.messaging.utilities.Data; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.LinkedList; import java.util.List; 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 17be996b3c..c2a8b4f553 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobController.java @@ -13,7 +13,7 @@ import org.thoughtcrime.securesms.jobmanager.persistence.DependencySpec; import org.thoughtcrime.securesms.jobmanager.persistence.FullSpec; import org.thoughtcrime.securesms.jobmanager.persistence.JobSpec; import org.thoughtcrime.securesms.jobmanager.persistence.JobStorage; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.Debouncer; import java.util.ArrayList; 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 6b101faed2..49159ef7e2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobManager.java @@ -9,7 +9,7 @@ import org.session.libsession.messaging.utilities.Data; import org.thoughtcrime.securesms.jobmanager.impl.DefaultExecutorFactory; import org.thoughtcrime.securesms.jobmanager.impl.JsonDataSerializer; import org.thoughtcrime.securesms.jobmanager.persistence.JobStorage; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.Debouncer; import java.util.ArrayList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java index 768ff39c70..6eadf0fd5d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobRunner.java @@ -6,7 +6,7 @@ import androidx.annotation.NonNull; import com.annimon.stream.Stream; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.util.WakeLockUtil; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java index a42e64e861..40acbf520b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/JobSchedulerScheduler.java @@ -12,7 +12,7 @@ import androidx.annotation.NonNull; import androidx.annotation.RequiresApi; import org.thoughtcrime.securesms.ApplicationContext; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java index 87854452a5..e4342e717c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobmanager/impl/JsonDataSerializer.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.jobmanager.impl; import androidx.annotation.NonNull; import org.session.libsession.messaging.utilities.Data; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsignal.utilities.JsonUtil; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java index e79db7d00e..e1782e271f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java @@ -12,7 +12,7 @@ import org.session.libsession.messaging.threads.GroupRecord; import org.thoughtcrime.securesms.dependencies.InjectableType; import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.AttachmentStreamUriLoader.AttachmentModel; import org.thoughtcrime.securesms.util.BitmapDecodingException; import org.thoughtcrime.securesms.util.BitmapUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java index 3bd16d0d1f..0c11cc552b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/BaseJob.java @@ -4,7 +4,7 @@ import androidx.annotation.NonNull; import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.JobLogger; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; /** * @deprecated diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java index f8e0c531f7..147db87ce5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/LocalBackupJob.java @@ -3,9 +3,9 @@ package org.thoughtcrime.securesms.jobs; import androidx.annotation.NonNull; import org.session.libsession.messaging.utilities.Data; -import org.session.libsignal.utilities.externalstorage.NoExternalStorageException; +import org.session.libsignal.utilities.NoExternalStorageException; import org.thoughtcrime.securesms.jobmanager.Job; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.loki.database.BackupFileRecord; import org.thoughtcrime.securesms.notifications.NotificationChannels; import org.thoughtcrime.securesms.service.GenericForegroundService; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java index 26e3280f98..36baa2860d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/RetrieveProfileAvatarJob.java @@ -15,7 +15,7 @@ import org.session.libsession.utilities.Util; import org.session.libsignal.service.api.SignalServiceMessageReceiver; import org.session.libsignal.service.api.crypto.ProfileCipherInputStream; import org.session.libsignal.service.api.push.exceptions.PushNetworkException; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.RecipientDatabase; import org.thoughtcrime.securesms.dependencies.InjectableType; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java index bbd51c8837..45f037d453 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/TrimThreadJob.java @@ -21,7 +21,7 @@ import androidx.annotation.NonNull; import org.session.libsession.messaging.utilities.Data; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.jobmanager.Job; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.TextSecurePreferences; diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java index 81e34b5a58..5b4ce8d13c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/UpdateApkJob.java @@ -16,7 +16,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import org.session.libsession.messaging.utilities.Data; import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.service.UpdateApkReadyListener; import org.session.libsession.utilities.FileUtils; import org.session.libsignal.utilities.Hex; diff --git a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java index e60d5821af..c2a9def90c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/linkpreview/LinkPreviewRepository.java @@ -13,7 +13,7 @@ import org.session.libsession.messaging.sending_receiving.attachments.Attachment import org.session.libsession.utilities.MediaTypes; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.dependencies.InjectableType; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.net.CallRequestController; import org.thoughtcrime.securesms.net.CompositeRequestController; import org.thoughtcrime.securesms.net.ContentProxySafetyInterceptor; diff --git a/app/src/main/java/org/thoughtcrime/securesms/logging/AndroidLogger.java b/app/src/main/java/org/thoughtcrime/securesms/logging/AndroidLogger.java index f54d43cc34..d62aac647c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/logging/AndroidLogger.java +++ b/app/src/main/java/org/thoughtcrime/securesms/logging/AndroidLogger.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.logging; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; public class AndroidLogger extends Log.Logger { diff --git a/app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.java b/app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.java index f08797a7d0..ecb4b68983 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.java +++ b/app/src/main/java/org/thoughtcrime/securesms/logging/PersistentLogger.java @@ -4,11 +4,11 @@ import android.content.Context; import androidx.annotation.AnyThread; import androidx.annotation.WorkerThread; -import org.session.libsignal.utilities.externalstorage.NoExternalStorageException; +import org.session.libsignal.utilities.NoExternalStorageException; -import org.session.libsignal.utilities.concurrent.ListenableFuture; -import org.session.libsignal.utilities.concurrent.SettableFuture; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.ListenableFuture; +import org.session.libsignal.utilities.SettableFuture; +import org.session.libsignal.utilities.Log; import java.io.ByteArrayOutputStream; import java.io.File; diff --git a/app/src/main/java/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java b/app/src/main/java/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java index 553bc47f8f..59c1bf39e6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java +++ b/app/src/main/java/org/thoughtcrime/securesms/logging/UncaughtExceptionLogger.java @@ -1,6 +1,6 @@ package org.thoughtcrime.securesms.logging; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import androidx.annotation.NonNull; diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/BackupRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/BackupRestoreActivity.kt index 9811c70bf2..6450115184 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/BackupRestoreActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/BackupRestoreActivity.kt @@ -35,7 +35,7 @@ import org.thoughtcrime.securesms.backup.FullBackupImporter import org.thoughtcrime.securesms.backup.FullBackupImporter.DatabaseDowngradeException import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider import org.thoughtcrime.securesms.database.DatabaseFactory -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.loki.utilities.setUpActionBarSessionLogo import org.thoughtcrime.securesms.loki.utilities.show import org.thoughtcrime.securesms.notifications.NotificationChannels diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt index bbe7bbe8e4..7527b68c4f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/JoinPublicChatActivity.kt @@ -10,7 +10,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.view.inputmethod.InputMethodManager -import android.widget.GridLayout import android.widget.Toast import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory import androidx.core.view.isVisible @@ -29,7 +28,7 @@ import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.DistributionTypes import org.session.libsession.messaging.threads.recipients.Recipient import org.session.libsession.utilities.GroupUtil -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.BaseActionBarActivity import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.thoughtcrime.securesms.conversation.ConversationActivity diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt index 2d6854f774..b9d8a9b0eb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/activities/LinkDeviceActivity.kt @@ -30,7 +30,7 @@ import org.session.libsignal.libsignal.util.KeyHelper import org.session.libsignal.service.loki.MnemonicCodec import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.Hex -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.BaseActionBarActivity import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragment diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt index 86970cbcdc..c6cd6f6a4d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt @@ -14,7 +14,7 @@ import org.session.libsession.messaging.sending_receiving.pollers.OpenGroupPolle import org.session.libsession.messaging.sending_receiving.pollers.OpenGroupV2Poller import org.session.libsession.snode.SnodeAPI import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.database.DatabaseFactory import java.util.concurrent.TimeUnit diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt index 905a58461b..40b99df2e5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/api/LokiPushNotificationManager.kt @@ -7,7 +7,7 @@ import org.session.libsession.messaging.sending_receiving.notifications.PushNoti import org.session.libsession.snode.OnionRequestAPI import org.thoughtcrime.securesms.database.DatabaseFactory import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.JsonUtil import org.session.libsignal.service.loki.utilities.retryIfNeeded diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt index dc97760758..6c1a96d1de 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PrepareAttachmentAudioExtrasJob.kt @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.loki.api import android.media.MediaDataSource import android.os.Build -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import androidx.annotation.RequiresApi import org.greenrobot.eventbus.EventBus import org.session.libsession.messaging.utilities.Data 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 2badd9c6d9..7880efbc55 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.libsession.messaging.open_groups.OpenGroup -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.loki.utilities.OpenGroupUtilities /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PushNotificationService.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PushNotificationService.kt index ebe9baf29c..d274a1ba62 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/PushNotificationService.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/api/PushNotificationService.kt @@ -9,7 +9,7 @@ import org.session.libsession.messaging.jobs.MessageReceiveJob import org.session.libsession.messaging.utilities.MessageWrapper import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.utilities.Base64 -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.notifications.NotificationChannels class PushNotificationService : FirebaseMessagingService() { 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 bc53e1534d..fac748efc4 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 @@ -13,7 +13,7 @@ import org.session.libsignal.service.loki.utilities.PublicKeyValidation import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.service.loki.utilities.toHexString import org.session.libsignal.utilities.Hex -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.database.Database import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper import org.thoughtcrime.securesms.loki.utilities.* 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 cea0f52d9f..1d2cb01442 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,7 +3,7 @@ package org.thoughtcrime.securesms.loki.database import android.content.ContentValues import android.content.Context import android.database.sqlite.SQLiteDatabase -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsession.messaging.threads.Address import org.thoughtcrime.securesms.database.Database import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper 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 c5e5e102ce..55409e1a5e 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 @@ -5,7 +5,7 @@ import android.content.Context import net.sqlcipher.Cursor import org.session.libsession.messaging.jobs.* import org.session.libsession.messaging.utilities.Data -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.database.Database import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper import org.thoughtcrime.securesms.jobmanager.impl.JsonDataSerializer diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt index 3c7e2bdc76..063dbc30c3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ContactSelectionListFragment.kt @@ -12,7 +12,7 @@ import android.view.ViewGroup import kotlinx.android.synthetic.main.contact_selection_list_fragment.* import network.loki.messenger.R import org.thoughtcrime.securesms.contacts.ContactsCursorLoader -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.mms.GlideApp import org.session.libsession.messaging.threads.recipients.Recipient diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt index 855ca52240..c3070a16e4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/utilities/IP2Country.kt @@ -5,7 +5,7 @@ import android.content.Context import android.content.Intent import android.content.IntentFilter import androidx.localbroadcastmanager.content.LocalBroadcastManager -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import com.opencsv.CSVReader import org.session.libsession.snode.OnionRequestAPI import org.session.libsignal.utilities.ThreadUtils diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/MessageAudioView.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/views/MessageAudioView.kt index 9c79d2dc3c..76f5dee9c4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/MessageAudioView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/views/MessageAudioView.kt @@ -25,10 +25,9 @@ import org.thoughtcrime.securesms.ApplicationContext import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment import org.thoughtcrime.securesms.audio.AudioSlidePlayer import org.thoughtcrime.securesms.components.AnimatingToggle -import org.thoughtcrime.securesms.database.AttachmentDatabase import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.events.PartProgressEvent -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.loki.api.PrepareAttachmentAudioExtrasJob import org.thoughtcrime.securesms.loki.utilities.getColorWithID import org.thoughtcrime.securesms.mms.AudioSlide diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt index e1a26f1669..32736ad7fb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/loki/views/OpenGroupInvitationView.kt @@ -1,8 +1,6 @@ package org.thoughtcrime.securesms.loki.views import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color import android.util.AttributeSet import android.view.View import android.widget.* @@ -11,10 +9,8 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import network.loki.messenger.R -import org.session.libsession.utilities.GroupUtil import org.session.libsession.utilities.OpenGroupUrlParser -import org.session.libsignal.utilities.logging.Log -import org.thoughtcrime.securesms.groups.GroupManager +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.loki.protocol.MultiDeviceProtocol import org.thoughtcrime.securesms.loki.utilities.OpenGroupUtilities diff --git a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java index cee13fb9df..1cc6e0bbd2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/longmessage/LongMessageRepository.java @@ -11,7 +11,7 @@ import org.thoughtcrime.securesms.database.MmsDatabase; import org.thoughtcrime.securesms.database.SmsDatabase; import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.MmsMessageRecord; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.PartAuthority; import org.thoughtcrime.securesms.mms.TextSlide; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Controller.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Controller.java index 5517f86bed..2c14ed8d5c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Controller.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Controller.java @@ -5,7 +5,7 @@ import android.hardware.Camera; import androidx.annotation.NonNull; import android.view.Surface; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.Collections; import java.util.Comparator; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java index d0daa6a1ec..ee11c12bc5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/Camera1Fragment.java @@ -35,7 +35,7 @@ import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.transition.Transition; import network.loki.messenger.R; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.GlideApp; import org.session.libsession.utilities.ServiceUtil; import org.thoughtcrime.securesms.util.Stopwatch; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java index 381d28c8b7..191eca74ea 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java @@ -23,7 +23,7 @@ import androidx.lifecycle.ViewModelProvider; import org.session.libsession.utilities.MediaTypes; import org.session.libsignal.libsignal.util.guava.Optional; import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.providers.BlobProvider; import org.thoughtcrime.securesms.scribbles.ImageEditorFragment; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java index 1685459cc9..34b4c6c0e0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendFragment.java @@ -38,7 +38,7 @@ import org.thoughtcrime.securesms.components.emoji.EmojiToggle; import org.thoughtcrime.securesms.components.emoji.MediaKeyboard; import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher; import org.thoughtcrime.securesms.imageeditor.model.EditorModel; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mediapreview.MediaRailAdapter; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.providers.BlobProvider; @@ -52,8 +52,8 @@ import org.session.libsignal.libsignal.util.guava.Optional; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.views.Stub; -import org.session.libsignal.utilities.concurrent.ListenableFuture; -import org.session.libsignal.utilities.concurrent.SettableFuture; +import org.session.libsignal.utilities.ListenableFuture; +import org.session.libsignal.utilities.SettableFuture; import java.io.ByteArrayOutputStream; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java index 268741be1d..5e4ee5f3e7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendVideoFragment.java @@ -10,7 +10,7 @@ import android.view.View; import android.view.ViewGroup; import network.loki.messenger.R; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.VideoSlide; import org.thoughtcrime.securesms.video.VideoPlayer; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java index a0d8b40c79..89b0f4aa9e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java @@ -12,7 +12,7 @@ import android.text.TextUtils; import com.annimon.stream.Stream; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.MediaConstraints; import org.thoughtcrime.securesms.providers.BlobProvider; import org.thoughtcrime.securesms.util.MediaUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java index 123f3bc5e1..efad3ef832 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentManager.java @@ -42,13 +42,13 @@ import org.thoughtcrime.securesms.loki.views.MessageAudioView; import org.thoughtcrime.securesms.components.DocumentView; import org.thoughtcrime.securesms.components.RemovableEditableMediaView; import org.thoughtcrime.securesms.components.ThumbnailView; -import org.session.libsignal.utilities.externalstorage.NoExternalStorageException; +import org.session.libsignal.utilities.NoExternalStorageException; import org.thoughtcrime.securesms.giph.ui.GiphyActivity; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mediasend.MediaSendActivity; import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.providers.BlobProvider; -import org.session.libsignal.utilities.externalstorage.ExternalStorageUtil; +import org.session.libsignal.utilities.ExternalStorageUtil; import org.thoughtcrime.securesms.util.FileProviderUtil; import org.thoughtcrime.securesms.util.MediaUtil; import org.session.libsignal.libsignal.util.guava.Optional; @@ -58,9 +58,9 @@ import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.utilities.ThemeUtil; import org.session.libsession.utilities.ViewUtil; import org.session.libsession.utilities.views.Stub; -import org.session.libsignal.utilities.concurrent.ListenableFuture; -import org.session.libsignal.utilities.concurrent.ListenableFuture.Listener; -import org.session.libsignal.utilities.concurrent.SettableFuture; +import org.session.libsignal.utilities.ListenableFuture; +import org.session.libsignal.utilities.ListenableFuture.Listener; +import org.session.libsignal.utilities.SettableFuture; import java.io.File; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java index 2a018a442c..85f826d3b7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/AttachmentStreamLocalUriFetcher.java @@ -6,7 +6,7 @@ import com.bumptech.glide.Priority; import com.bumptech.glide.load.DataSource; import com.bumptech.glide.load.data.DataFetcher; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsignal.libsignal.InvalidMessageException; import org.session.libsignal.libsignal.util.guava.Optional; import org.session.libsignal.service.api.crypto.AttachmentCipherInputStream; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java index e9f16b9bbb..1264363093 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/DecryptableStreamLocalUriFetcher.java @@ -4,7 +4,7 @@ import android.content.ContentResolver; import android.content.Context; import android.graphics.Bitmap; import android.net.Uri; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import com.bumptech.glide.load.data.StreamLocalUriFetcher; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java b/app/src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java index 4021fc8eda..7e1c0b871d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/DocumentSlide.java @@ -7,7 +7,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; -import org.session.libsignal.utilities.externalstorage.ExternalStorageUtil; +import org.session.libsignal.utilities.ExternalStorageUtil; public class DocumentSlide extends Slide { diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java b/app/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java index fe823042ed..f1d5a5ec57 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/MediaConstraints.java @@ -6,7 +6,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.session.libsession.utilities.MediaTypes; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import android.util.Pair; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/QuoteId.java b/app/src/main/java/org/thoughtcrime/securesms/mms/QuoteId.java index 1bafc5d7cc..39f4a71faa 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/mms/QuoteId.java +++ b/app/src/main/java/org/thoughtcrime/securesms/mms/QuoteId.java @@ -7,7 +7,7 @@ import org.json.JSONException; import org.json.JSONObject; import org.session.libsession.messaging.threads.Address; import org.thoughtcrime.securesms.database.model.MessageRecord; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; /** * Represents the information required to find the {@link MessageRecord} pointed to by a quote. diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java b/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java index 654e997aaf..5319cc6bfc 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java +++ b/app/src/main/java/org/thoughtcrime/securesms/net/ChunkedDataFetcher.java @@ -6,7 +6,7 @@ import android.text.TextUtils; import com.annimon.stream.Stream; import com.bumptech.glide.util.ContentLengthInputStream; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.concurrent.SignalExecutors; import org.session.libsignal.libsignal.util.Pair; diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java b/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java index 721006dcbd..983a3374ef 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java +++ b/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySafetyInterceptor.java @@ -4,7 +4,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import org.thoughtcrime.securesms.linkpreview.LinkPreviewUtil; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySelector.java b/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySelector.java index 01298ad698..e4e57d01de 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySelector.java +++ b/app/src/main/java/org/thoughtcrime/securesms/net/ContentProxySelector.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.net; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import network.loki.messenger.BuildConfig; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java index 4548a6c776..ffe6df439e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoHeardReceiver.java @@ -27,7 +27,7 @@ import androidx.core.app.NotificationManagerCompat; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.LinkedList; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java index 4aacc56cac..e0d600e99d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/AndroidAutoReplyReceiver.java @@ -35,7 +35,7 @@ import org.thoughtcrime.securesms.mms.MmsException; import org.session.libsession.messaging.messages.signal.OutgoingMediaMessage; import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.messages.signal.OutgoingTextMessage; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.Collections; import java.util.List; 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 cf96ace8ce..000327b351 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java @@ -45,7 +45,7 @@ import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.utilities.ServiceUtil; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsignal.service.internal.util.Util; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.contactshare.ContactUtil; import org.thoughtcrime.securesms.conversation.ConversationActivity; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java index 042f106c55..8483694af3 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java @@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MessagingDatabase.ExpirationInfo; import org.thoughtcrime.securesms.database.MessagingDatabase.MarkedMessageInfo; import org.thoughtcrime.securesms.database.MessagingDatabase.SyncMessageId; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol; import org.thoughtcrime.securesms.service.ExpiringMessageManager; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java index ab73ee285d..335e857c2b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationChannels.java @@ -29,7 +29,7 @@ import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.threads.recipients.Recipient.*; import org.session.libsession.utilities.ServiceUtil; import org.session.libsession.utilities.TextSecurePreferences; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.ArrayList; import java.util.Arrays; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java index 0ec5814640..dc000650d5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationState.java @@ -9,7 +9,7 @@ import androidx.annotation.Nullable; import org.thoughtcrime.securesms.conversation.ConversationActivity; import org.thoughtcrime.securesms.conversation.ConversationPopupActivity; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.messaging.threads.recipients.Recipient.*; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java index f49f5893e8..d6100876bd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java @@ -28,7 +28,7 @@ import androidx.core.app.RemoteInput; import org.session.libsession.messaging.messages.signal.OutgoingTextMessage; import org.session.libsession.messaging.messages.visible.VisibleMessage; import org.session.libsession.messaging.sending_receiving.MessageSender; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.ApplicationContext; import org.session.libsession.messaging.threads.Address; import org.thoughtcrime.securesms.database.DatabaseFactory; 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 0a0bce0059..c777d507d9 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/SingleRecipientNotificationBuilder.java @@ -28,7 +28,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy; import org.session.libsession.messaging.avatars.ContactColors; import org.session.libsession.messaging.avatars.ContactPhoto; import org.session.libsession.messaging.avatars.GeneratedContactPhoto; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.loki.utilities.AvatarPlaceholderGenerator; import org.thoughtcrime.securesms.loki.utilities.NotificationUtilities; import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader; diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java index f00087a73d..b7d013d6e7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java @@ -10,7 +10,7 @@ import androidx.preference.EditTextPreference; import androidx.preference.Preference; import org.session.libsession.utilities.TextSecurePreferences; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.permissions.Permissions; import org.thoughtcrime.securesms.util.Trimmer; diff --git a/app/src/main/java/org/thoughtcrime/securesms/providers/BlobProvider.java b/app/src/main/java/org/thoughtcrime/securesms/providers/BlobProvider.java index e8a01008c5..6d900a5b37 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/providers/BlobProvider.java +++ b/app/src/main/java/org/thoughtcrime/securesms/providers/BlobProvider.java @@ -13,7 +13,7 @@ import org.thoughtcrime.securesms.crypto.AttachmentSecret; import org.thoughtcrime.securesms.crypto.AttachmentSecretProvider; import org.thoughtcrime.securesms.crypto.ModernDecryptingPartInputStream; import org.thoughtcrime.securesms.crypto.ModernEncryptingPartOutputStream; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.concurrent.SignalExecutors; diff --git a/app/src/main/java/org/thoughtcrime/securesms/providers/PartProvider.java b/app/src/main/java/org/thoughtcrime/securesms/providers/PartProvider.java index a2d574b127..f49802073a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/providers/PartProvider.java +++ b/app/src/main/java/org/thoughtcrime/securesms/providers/PartProvider.java @@ -28,7 +28,7 @@ import android.os.ParcelFileDescriptor; import android.provider.OpenableColumns; import androidx.annotation.NonNull; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.messaging.sending_receiving.attachments.AttachmentId; import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment; diff --git a/app/src/main/java/org/thoughtcrime/securesms/qr/ScanningThread.java b/app/src/main/java/org/thoughtcrime/securesms/qr/ScanningThread.java index 57af8ff7ad..4e86941c5b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/qr/ScanningThread.java +++ b/app/src/main/java/org/thoughtcrime/securesms/qr/ScanningThread.java @@ -16,7 +16,7 @@ import com.google.zxing.qrcode.QRCodeReader; import org.thoughtcrime.securesms.components.camera.CameraView; import org.thoughtcrime.securesms.components.camera.CameraView.PreviewFrame; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.utilities.Util; import java.util.HashMap; diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java index be079a806b..39b75c7a82 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/ImageEditorFragment.java @@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.imageeditor.Renderer; import org.thoughtcrime.securesms.imageeditor.model.EditorElement; import org.thoughtcrime.securesms.imageeditor.model.EditorModel; import org.thoughtcrime.securesms.imageeditor.renderers.TextRenderer; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mediasend.MediaSendPageFragment; import org.thoughtcrime.securesms.mms.MediaConstraints; import org.thoughtcrime.securesms.mms.PushMediaConstraints; diff --git a/app/src/main/java/org/thoughtcrime/securesms/scribbles/StickerLoader.java b/app/src/main/java/org/thoughtcrime/securesms/scribbles/StickerLoader.java index 94152dd0db..39d5238b23 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/scribbles/StickerLoader.java +++ b/app/src/main/java/org/thoughtcrime/securesms/scribbles/StickerLoader.java @@ -19,7 +19,7 @@ package org.thoughtcrime.securesms.scribbles; import android.content.Context; import androidx.annotation.NonNull; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.util.AsyncLoader; diff --git a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java index 53497db6a1..6ff68b87ee 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/search/SearchRepository.java @@ -15,7 +15,7 @@ import org.thoughtcrime.securesms.database.MmsSmsColumns; import org.thoughtcrime.securesms.database.SearchDatabase; import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.database.model.ThreadRecord; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.messaging.threads.recipients.Recipient; import org.thoughtcrime.securesms.search.model.MessageResult; import org.thoughtcrime.securesms.search.model.SearchResult; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java b/app/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java index 21c1adcff9..7fe08f764c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/DirectShareService.java @@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.ShareActivity; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.database.model.ThreadRecord; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.GlideApp; import org.session.libsession.messaging.threads.recipients.Recipient; import org.thoughtcrime.securesms.util.BitmapUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java index 05fed4b9d8..bf2cf9d77f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/ExpiringMessageManager.java @@ -13,7 +13,7 @@ import org.session.libsession.utilities.SSKEnvironment; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsignal.libsignal.util.guava.Optional; import org.session.libsignal.service.api.messages.SignalServiceGroup; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.MmsDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java b/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java index 4c942e341b..02db92fc90 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/GenericForegroundService.java @@ -12,7 +12,7 @@ import androidx.annotation.Nullable; import androidx.core.app.NotificationCompat; import androidx.core.content.ContextCompat; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.loki.activities.HomeActivity; import org.thoughtcrime.securesms.notifications.NotificationChannels; import org.session.libsignal.libsignal.util.guava.Preconditions; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java index e204c3f503..c4507cd766 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/KeyCachingService.java @@ -36,7 +36,7 @@ import androidx.core.app.NotificationCompat; import org.thoughtcrime.securesms.ApplicationContext; import org.thoughtcrime.securesms.DatabaseUpgradeActivity; import org.thoughtcrime.securesms.DummyActivity; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.loki.activities.HomeActivity; import org.thoughtcrime.securesms.notifications.NotificationChannels; import org.session.libsession.utilities.ServiceUtil; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java index 90303be722..4091d953af 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/PersistentAlarmManagerListener.java @@ -6,7 +6,7 @@ import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; public abstract class PersistentAlarmManagerListener extends BroadcastReceiver { diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/PersistentConnectionBootListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/PersistentConnectionBootListener.java index 47de3311ec..38fbf886ba 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/PersistentConnectionBootListener.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/PersistentConnectionBootListener.java @@ -4,7 +4,7 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; public class PersistentConnectionBootListener extends BroadcastReceiver { diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java b/app/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java index ada9bb2513..89f218faf6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/QuickResponseService.java @@ -10,10 +10,8 @@ import network.loki.messenger.R; import org.session.libsession.messaging.messages.visible.VisibleMessage; import org.session.libsession.messaging.threads.Address; -import org.session.libsignal.utilities.logging.Log; -import org.session.libsession.messaging.threads.recipients.Recipient; +import org.session.libsignal.utilities.Log; import org.session.libsession.messaging.sending_receiving.MessageSender; -import org.session.libsession.messaging.messages.signal.OutgoingTextMessage; import org.thoughtcrime.securesms.util.Rfc5724Uri; import java.net.URISyntaxException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java index 19ff039eb0..323617d81d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkReadyListener.java @@ -12,7 +12,7 @@ import android.net.Uri; import androidx.annotation.Nullable; import androidx.core.app.NotificationCompat; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import network.loki.messenger.R; import org.thoughtcrime.securesms.notifications.NotificationChannels; diff --git a/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java b/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java index 2f15f84118..187713df95 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java +++ b/app/src/main/java/org/thoughtcrime/securesms/service/UpdateApkRefreshListener.java @@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.service; import android.content.Context; import android.content.Intent; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.ApplicationContext; import network.loki.messenger.BuildConfig; diff --git a/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/ReadReceiptManager.kt b/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/ReadReceiptManager.kt index 729f7c3b4d..d5adfe9f15 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/ReadReceiptManager.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/ReadReceiptManager.kt @@ -4,7 +4,7 @@ import android.content.Context import org.session.libsession.messaging.threads.Address import org.session.libsession.utilities.SSKEnvironment import org.session.libsession.utilities.TextSecurePreferences -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.database.MessagingDatabase.SyncMessageId diff --git a/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/TypingStatusRepository.java b/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/TypingStatusRepository.java index 40ee73983a..1bb1b52434 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/TypingStatusRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/sskenvironment/TypingStatusRepository.java @@ -15,7 +15,7 @@ import org.session.libsession.messaging.threads.recipients.Recipient; import org.session.libsession.utilities.SSKEnvironment; import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.ArrayList; import java.util.Collections; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java index 5a58739aca..13cdcc6d6a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/AttachmentUtil.java @@ -16,7 +16,7 @@ import org.session.libsession.utilities.ServiceUtil; import org.session.libsession.utilities.TextSecurePreferences; import org.thoughtcrime.securesms.database.DatabaseFactory; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.Collections; import java.util.Set; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt index 236b37a8a2..6b3d1fabce 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/BackupUtil.kt @@ -15,7 +15,7 @@ import network.loki.messenger.R import org.greenrobot.eventbus.EventBus import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.libsignal.util.ByteUtil -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.backup.BackupEvent import org.thoughtcrime.securesms.backup.BackupPassphrase import org.thoughtcrime.securesms.backup.BackupProtos.SharedPreference diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java index 94c63ceaa0..3bb0d2db21 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/BitmapUtil.java @@ -19,7 +19,7 @@ import android.util.Pair; import com.bumptech.glide.load.engine.DiskCacheStrategy; import org.session.libsession.utilities.MediaTypes; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.GlideApp; import org.thoughtcrime.securesms.mms.MediaConstraints; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java b/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java index 7f8c44c498..cb822f1eeb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/DateUtils.java @@ -24,7 +24,7 @@ import androidx.annotation.Nullable; import android.os.Build; import android.text.format.DateFormat; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.text.ParseException; import java.text.SimpleDateFormat; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java index 3c55996d64..5c4894c12b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/MediaUtil.java @@ -17,7 +17,7 @@ import com.bumptech.glide.load.resource.gif.GifDrawable; import org.session.libsession.messaging.sending_receiving.attachments.Attachment; import org.session.libsession.utilities.MediaTypes; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.AudioSlide; import org.thoughtcrime.securesms.mms.DecryptableStreamUriLoader.DecryptableUri; import org.thoughtcrime.securesms.mms.DocumentSlide; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/ResUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/ResUtil.java index 7ea1762068..dff1a419de 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/ResUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/ResUtil.java @@ -31,7 +31,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; public class ResUtil { private static final String TAG = ResUtil.class.getSimpleName(); 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 e42ae3c3d3..59658f12a0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.kt @@ -15,8 +15,8 @@ import android.widget.Toast import androidx.appcompat.app.AlertDialog import network.loki.messenger.R import org.session.libsession.utilities.task.ProgressDialogAsyncTask -import org.session.libsignal.utilities.externalstorage.ExternalStorageUtil -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.ExternalStorageUtil +import org.session.libsignal.utilities.Log import org.thoughtcrime.securesms.mms.PartAuthority import java.io.File import java.io.FileOutputStream diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SingleLiveEvent.java b/app/src/main/java/org/thoughtcrime/securesms/util/SingleLiveEvent.java index 711a8b9ffb..97b52c9b9f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SingleLiveEvent.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SingleLiveEvent.java @@ -23,7 +23,7 @@ import androidx.annotation.MainThread; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java b/app/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java index 9107e99555..5bac6ec95c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SmsCharacterCalculator.java @@ -17,7 +17,7 @@ package org.thoughtcrime.securesms.util; import android.telephony.SmsMessage; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; public class SmsCharacterCalculator extends CharacterCalculator { diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java b/app/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java index fad0d63892..cac53899fb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/Stopwatch.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.util; import androidx.annotation.NonNull; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.LinkedList; import java.util.List; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/StreamUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/StreamUtil.java index 32c381c00a..1f32748155 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/StreamUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/StreamUtil.java @@ -2,7 +2,7 @@ package org.thoughtcrime.securesms.util; import androidx.annotation.Nullable; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.io.ByteArrayOutputStream; import java.io.Closeable; diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/WakeLockUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/WakeLockUtil.java index c3e7654c88..bba19f1fc2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/WakeLockUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/WakeLockUtil.java @@ -6,7 +6,7 @@ import android.os.PowerManager.WakeLock; import androidx.annotation.NonNull; import org.session.libsession.utilities.ServiceUtil; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; public class WakeLockUtil { diff --git a/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java b/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java index bac240616c..08d3a52a2f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java +++ b/app/src/main/java/org/thoughtcrime/securesms/video/VideoPlayer.java @@ -49,7 +49,7 @@ import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter; import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; import org.thoughtcrime.securesms.attachments.AttachmentServer; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.thoughtcrime.securesms.mms.PartAuthority; import org.thoughtcrime.securesms.mms.VideoSlide; import org.session.libsession.utilities.ViewUtil; diff --git a/app/src/test/java/org/thoughtcrime/securesms/BaseUnitTest.java b/app/src/test/java/org/thoughtcrime/securesms/BaseUnitTest.java index c49b4ed98d..8a309b530a 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/BaseUnitTest.java +++ b/app/src/test/java/org/thoughtcrime/securesms/BaseUnitTest.java @@ -6,7 +6,7 @@ import android.os.Handler; import android.os.Looper; import android.preference.PreferenceManager; import android.text.TextUtils; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.junit.Before; import org.junit.runner.RunWith; diff --git a/app/src/test/java/org/thoughtcrime/securesms/logging/LogTest.java b/app/src/test/java/org/thoughtcrime/securesms/logging/LogTest.java index ea1dd3a588..c4b525b37f 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/logging/LogTest.java +++ b/app/src/test/java/org/thoughtcrime/securesms/logging/LogTest.java @@ -1,7 +1,7 @@ package org.thoughtcrime.securesms.logging; import org.junit.Test; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import static org.junit.Assert.assertEquals; diff --git a/libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java b/libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java index 3140ba2bdf..1f1517e841 100644 --- a/libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java +++ b/libsession/src/main/java/org/session/libsession/database/documents/IdentityKeyMismatch.java @@ -1,6 +1,6 @@ package org.session.libsession.database.documents; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt index b4a1861875..a1b33b60b8 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPI.kt @@ -5,7 +5,7 @@ import nl.komponents.kovenant.functional.map import okhttp3.Request import org.session.libsession.messaging.utilities.DotNetAPI import org.session.libsession.snode.OnionRequestAPI -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.JsonUtil import org.session.libsignal.service.loki.LokiAPIDatabaseProtocol diff --git a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPIV2.kt b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPIV2.kt index 89bea6bc88..619b78aced 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPIV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/file_server/FileServerAPIV2.kt @@ -11,7 +11,7 @@ import org.session.libsession.snode.OnionRequestAPI import org.session.libsignal.service.loki.HTTP import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.JsonUtil -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log object FileServerAPIV2 { diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt index d4ee80a47d..0a6666230f 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentDownloadJob.kt @@ -10,7 +10,7 @@ import org.session.libsession.messaging.utilities.DotNetAPI import org.session.libsession.utilities.DownloadUtilities import org.session.libsignal.service.api.crypto.AttachmentCipherInputStream import org.session.libsignal.utilities.Base64 -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.io.File import java.io.FileInputStream diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt index 4f76bb9b9b..ae81540052 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/AttachmentUploadJob.kt @@ -4,7 +4,6 @@ import com.esotericsoftware.kryo.Kryo import com.esotericsoftware.kryo.io.Input import com.esotericsoftware.kryo.io.Output import nl.komponents.kovenant.Promise -import okhttp3.MultipartBody import okio.Buffer import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.file_server.FileServerAPI @@ -22,8 +21,7 @@ import org.session.libsignal.service.internal.push.http.AttachmentCipherOutputSt import org.session.libsignal.service.internal.push.http.DigestingRequestBody import org.session.libsignal.service.internal.util.Util import org.session.libsignal.service.loki.PlaintextOutputStreamFactory -import org.session.libsignal.utilities.logging.Log -import java.util.* +import org.session.libsignal.utilities.Log class AttachmentUploadJob(val attachmentID: Long, val threadID: String, val message: Message, val messageSendJobID: String) : Job { override var delegate: JobDelegate? = null diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt index 1fdf100a3f..147a9f1078 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/JobQueue.kt @@ -4,7 +4,7 @@ import kotlinx.coroutines.* import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.Channel.Factory.UNLIMITED import org.session.libsession.messaging.MessagingModuleConfiguration -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.lang.IllegalStateException import java.util.* import java.util.concurrent.ConcurrentHashMap diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt index 256091ada4..7910861d83 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageReceiveJob.kt @@ -5,7 +5,7 @@ import nl.komponents.kovenant.deferred import org.session.libsession.messaging.sending_receiving.MessageReceiver import org.session.libsession.messaging.sending_receiving.handle import org.session.libsession.messaging.utilities.Data -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log class MessageReceiveJob(val data: ByteArray, val isBackgroundPoll: Boolean, val openGroupMessageServerID: Long? = null, val openGroupID: String? = null) : Job { override var delegate: JobDelegate? = null diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt index 2989155314..71a28ffdb4 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/MessageSendJob.kt @@ -10,7 +10,7 @@ import org.session.libsession.messaging.messages.Message import org.session.libsession.messaging.messages.visible.VisibleMessage import org.session.libsession.messaging.sending_receiving.MessageSender import org.session.libsession.messaging.utilities.Data -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log class MessageSendJob(val message: Message, val destination: Destination) : Job { diff --git a/libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt b/libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt index 0445eaf8f5..f1dd2fe091 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/jobs/NotifyPNServerJob.kt @@ -13,7 +13,7 @@ import org.session.libsession.messaging.utilities.Data import org.session.libsession.snode.SnodeMessage import org.session.libsession.snode.OnionRequestAPI -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.JsonUtil import org.session.libsignal.service.loki.utilities.retryIfNeeded diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt index 0d2403cd24..38e505c3e8 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt @@ -13,7 +13,7 @@ import org.session.libsignal.service.internal.push.SignalServiceProtos.DataMessa import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.service.loki.utilities.toHexString import org.session.libsignal.utilities.Hex -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log class ClosedGroupControlMessage() : ControlMessage() { var kind: Kind? = null diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/DataExtractionNotification.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/DataExtractionNotification.kt index 90cc803713..a58cb8166b 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/DataExtractionNotification.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/DataExtractionNotification.kt @@ -1,7 +1,7 @@ package org.session.libsession.messaging.messages.control import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log class DataExtractionNotification() : ControlMessage() { var kind: Kind? = null diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt index 9aa777782a..5ce55ed832 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ExpirationTimerUpdate.kt @@ -2,7 +2,7 @@ package org.session.libsession.messaging.messages.control import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.messages.visible.VisibleMessage -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.service.internal.push.SignalServiceProtos class ExpirationTimerUpdate() : ControlMessage() { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ReadReceipt.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ReadReceipt.kt index 1f4bc84e3e..d27dc1f732 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ReadReceipt.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ReadReceipt.kt @@ -1,7 +1,7 @@ package org.session.libsession.messaging.messages.control import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log class ReadReceipt() : ControlMessage() { var timestamps: List? = null diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/TypingIndicator.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/TypingIndicator.kt index a06f821cb8..649a93308e 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/TypingIndicator.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/TypingIndicator.kt @@ -1,7 +1,7 @@ package org.session.libsession.messaging.messages.control import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log class TypingIndicator() : ControlMessage() { var kind: Kind? = null diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/LinkPreview.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/LinkPreview.kt index 10c41b18b6..91c68779c6 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/LinkPreview.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/LinkPreview.kt @@ -2,7 +2,7 @@ package org.session.libsession.messaging.messages.visible import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview as SignalLinkPreiview -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.service.internal.push.SignalServiceProtos class LinkPreview() { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt index 8c521df067..f26ce81dde 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/OpenGroupInvitation.kt @@ -1,7 +1,7 @@ package org.session.libsession.messaging.messages.visible import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log class OpenGroupInvitation() { var url: String? = null diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt index 98cb5ecafb..bc79381ebc 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Profile.kt @@ -1,7 +1,7 @@ package org.session.libsession.messaging.messages.visible import com.google.protobuf.ByteString -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.service.internal.push.SignalServiceProtos class Profile() { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt index 376f52fd25..69f2300a01 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/Quote.kt @@ -4,7 +4,7 @@ import com.goterl.lazycode.lazysodium.BuildConfig import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.sending_receiving.attachments.DatabaseAttachment import org.session.libsession.messaging.sending_receiving.quotes.QuoteModel as SignalQuote -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.service.internal.push.SignalServiceProtos class Quote() { diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt index 864a919bd1..298ccdf006 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/messages/visible/VisibleMessage.kt @@ -8,7 +8,7 @@ import org.session.libsession.messaging.threads.Address import org.session.libsession.messaging.threads.recipients.Recipient import org.session.libsession.utilities.GroupUtil import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsession.messaging.sending_receiving.attachments.Attachment as SignalAttachment class VisibleMessage : Message() { diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPI.kt index 0aba366d9f..4911598221 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPI.kt @@ -1,6 +1,5 @@ package org.session.libsession.messaging.open_groups -import nl.komponents.kovenant.Kovenant import nl.komponents.kovenant.Promise import nl.komponents.kovenant.deferred import nl.komponents.kovenant.functional.map @@ -12,9 +11,8 @@ import org.session.libsession.utilities.DownloadUtilities import org.session.libsignal.service.loki.utilities.retryIfNeeded import org.session.libsignal.utilities.* import org.session.libsignal.utilities.Base64 -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.io.ByteArrayOutputStream -import java.io.IOException import java.text.SimpleDateFormat import java.util.* diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt index f2f5d62551..2bdbd9daf6 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupAPIV2.kt @@ -22,7 +22,7 @@ import org.session.libsignal.service.loki.utilities.toHexString import org.session.libsignal.utilities.Base64.* import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.JsonUtil -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.whispersystems.curve25519.Curve25519 import java.util.* diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessage.kt index 492cb4f7c7..5ccf65377a 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessage.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessage.kt @@ -4,7 +4,7 @@ import org.session.libsession.messaging.MessagingModuleConfiguration import org.session.libsession.messaging.messages.visible.VisibleMessage import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.Hex -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.whispersystems.curve25519.Curve25519 data class OpenGroupMessage( diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt index 1b75c1224b..49fa9c76b5 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupMessageV2.kt @@ -5,7 +5,7 @@ import org.session.libsignal.service.internal.push.PushTransportDetails import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.Base64.decode -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.whispersystems.curve25519.Curve25519 data class OpenGroupMessageV2( diff --git a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupV2.kt b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupV2.kt index 1e766a42ed..6eb964e9ef 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupV2.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/open_groups/OpenGroupV2.kt @@ -1,7 +1,7 @@ package org.session.libsession.messaging.open_groups import org.session.libsignal.utilities.JsonUtil -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.util.* data class OpenGroupV2( diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageEncrypter.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageEncrypter.kt index 287fa0cef4..1745e2edee 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageEncrypter.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageEncrypter.kt @@ -11,7 +11,7 @@ import org.session.libsession.utilities.KeyPairUtilities import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.Hex -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log object MessageEncrypter { diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt index 4477633c16..483c3b98a2 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSender.kt @@ -25,7 +25,7 @@ import org.session.libsignal.service.internal.push.PushTransportDetails import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey import org.session.libsignal.utilities.Base64 -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.lang.IllegalStateException import org.session.libsession.messaging.sending_receiving.attachments.Attachment as SignalAttachment import org.session.libsession.messaging.sending_receiving.link_preview.LinkPreview as SignalLinkPreview diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt index f42127762c..e677a2534b 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/MessageSenderClosedGroupHandler.kt @@ -21,7 +21,7 @@ import org.session.libsignal.service.loki.utilities.hexEncodedPublicKey import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.utilities.Hex import org.session.libsignal.utilities.ThreadUtils -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.util.* import java.util.concurrent.ConcurrentHashMap diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt index 57c06af221..7ec058a64f 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt @@ -7,7 +7,6 @@ import org.session.libsession.messaging.jobs.JobQueue import org.session.libsession.messaging.messages.Message import org.session.libsession.messaging.messages.control.* import org.session.libsession.messaging.messages.visible.Attachment -import org.session.libsession.messaging.messages.visible.OpenGroupInvitation import org.session.libsession.messaging.messages.visible.VisibleMessage import org.session.libsession.messaging.sending_receiving.attachments.PointerAttachment import org.session.libsession.messaging.sending_receiving.data_extraction.DataExtractionNotificationInfoMessage @@ -30,7 +29,7 @@ import org.session.libsignal.service.internal.push.SignalServiceProtos import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.service.loki.utilities.toHexString import org.session.libsignal.utilities.Base64 -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.security.MessageDigest import java.util.* import kotlin.collections.ArrayList diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/PushNotificationAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/PushNotificationAPI.kt index 76a93ac344..f10343be17 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/PushNotificationAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/notifications/PushNotificationAPI.kt @@ -10,7 +10,7 @@ import org.session.libsession.snode.OnionRequestAPI import org.session.libsession.utilities.TextSecurePreferences import org.session.libsignal.service.loki.utilities.retryIfNeeded import org.session.libsignal.utilities.JsonUtil -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log @SuppressLint("StaticFieldLeak") object PushNotificationAPI { diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPoller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPoller.kt index b9093e94cd..09c698691d 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPoller.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/ClosedGroupPoller.kt @@ -9,7 +9,7 @@ import org.session.libsession.messaging.jobs.JobQueue import org.session.libsession.messaging.jobs.MessageReceiveJob import org.session.libsession.snode.SnodeAPI import org.session.libsignal.service.loki.utilities.getRandomElementOrNull -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.successBackground class ClosedGroupPoller { diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt index 309bfa20bb..9c3b3f582f 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupPoller.kt @@ -12,7 +12,7 @@ import org.session.libsession.messaging.open_groups.OpenGroupMessage import org.session.libsession.messaging.threads.Address import org.session.libsession.utilities.GroupUtil import org.session.libsignal.service.internal.push.SignalServiceProtos.* -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.successBackground import java.util.* import java.util.concurrent.ScheduledExecutorService diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt index 439b1c3400..ab84252805 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/OpenGroupV2Poller.kt @@ -10,7 +10,7 @@ import org.session.libsession.messaging.open_groups.OpenGroupV2 import org.session.libsession.messaging.threads.Address import org.session.libsession.utilities.GroupUtil import org.session.libsignal.service.internal.push.SignalServiceProtos -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.successBackground import java.util.concurrent.ScheduledExecutorService import java.util.concurrent.ScheduledFuture diff --git a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt index 805bac8a8c..f1298d2699 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/sending_receiving/pollers/Poller.kt @@ -8,7 +8,7 @@ import org.session.libsession.messaging.jobs.MessageReceiveJob import org.session.libsession.snode.SnodeAPI import org.session.libsession.snode.SnodeModule import org.session.libsignal.service.loki.Snode -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.security.SecureRandom import java.util.* diff --git a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java b/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java index 9a85c75c7c..1d18543c86 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java +++ b/libsession/src/main/java/org/session/libsession/messaging/threads/recipients/Recipient.java @@ -36,7 +36,7 @@ import org.session.libsession.messaging.threads.recipients.RecipientProvider.Rec import org.session.libsession.utilities.TextSecurePreferences; import org.session.libsession.utilities.Util; import org.session.libsession.utilities.color.MaterialColor; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsignal.libsignal.util.guava.Optional; import org.session.libsession.messaging.avatars.ContactColors; import org.session.libsession.messaging.avatars.ContactPhoto; diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt index c3ad4c368b..2f5b16048a 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/DotNetAPI.kt @@ -12,7 +12,6 @@ import org.session.libsession.messaging.file_server.FileServerAPI import org.session.libsignal.utilities.DiffieHellman import org.session.libsignal.service.api.crypto.ProfileCipherOutputStream -import org.session.libsignal.service.api.messages.SignalServiceAttachment import org.session.libsignal.service.api.push.exceptions.NonSuccessfulResponseCodeException import org.session.libsignal.service.api.push.exceptions.PushNetworkException import org.session.libsignal.service.api.util.StreamDetails @@ -26,10 +25,7 @@ import org.session.libsignal.service.loki.HTTP import org.session.libsignal.service.loki.utilities.* import org.session.libsignal.utilities.* import org.session.libsignal.utilities.Base64 -import org.session.libsignal.utilities.logging.Log -import java.io.File -import java.io.FileOutputStream -import java.io.OutputStream +import org.session.libsignal.utilities.Log import java.util.* /** diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt index 767e4beffe..f90381b2f7 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/MessageWrapper.kt @@ -1,8 +1,7 @@ package org.session.libsession.messaging.utilities import com.google.protobuf.ByteString -import org.session.libsignal.metadata.SignalProtos -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope import org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketMessage import org.session.libsignal.service.internal.websocket.WebSocketProtos.WebSocketRequestMessage diff --git a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt index 062576ea6c..e5063bd69f 100644 --- a/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt +++ b/libsession/src/main/java/org/session/libsession/messaging/utilities/UpdateMessageData.kt @@ -5,7 +5,7 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo import com.fasterxml.jackson.core.JsonParseException import org.session.libsignal.service.api.messages.SignalServiceGroup import org.session.libsignal.utilities.JsonUtil -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.util.* // class used to save update messages details diff --git a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt index c3e454e6bc..b983815a85 100644 --- a/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt +++ b/libsession/src/main/java/org/session/libsession/snode/OnionRequestAPI.kt @@ -8,7 +8,7 @@ import nl.komponents.kovenant.functional.map import okhttp3.Request import org.session.libsession.messaging.file_server.FileServerAPI import org.session.libsession.utilities.AESGCM -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Base64 import org.session.libsignal.utilities.* import org.session.libsignal.service.loki.Snode diff --git a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt index ab73604385..b52cb9cd6b 100644 --- a/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt +++ b/libsession/src/main/java/org/session/libsession/snode/SnodeAPI.kt @@ -17,7 +17,7 @@ import org.session.libsignal.service.loki.utilities.prettifiedDescription import org.session.libsignal.service.loki.utilities.removing05PrefixIfNeeded import org.session.libsignal.service.loki.utilities.retryIfNeeded import org.session.libsignal.utilities.* -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.security.SecureRandom object SnodeAPI { diff --git a/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt b/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt index fc2375c1c8..6067cef770 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/DownloadUtilities.kt @@ -5,7 +5,7 @@ import okhttp3.Request import org.session.libsession.messaging.file_server.FileServerAPI import org.session.libsession.messaging.file_server.FileServerAPIV2 import org.session.libsession.snode.OnionRequestAPI -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.service.api.messages.SignalServiceAttachment import org.session.libsignal.service.api.push.exceptions.NonSuccessfulResponseCodeException import org.session.libsignal.service.api.push.exceptions.PushNetworkException diff --git a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt index ea7de544be..bf67c45e9b 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/TextSecurePreferences.kt @@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.asSharedFlow import org.session.libsession.R import org.session.libsession.utilities.preferences.NotificationPrivacyPreference -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import java.io.IOException import java.util.* diff --git a/libsession/src/main/java/org/session/libsession/utilities/ThemeUtil.java b/libsession/src/main/java/org/session/libsession/utilities/ThemeUtil.java index 6aaad6a050..cf9eb05d08 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/ThemeUtil.java +++ b/libsession/src/main/java/org/session/libsession/utilities/ThemeUtil.java @@ -13,7 +13,7 @@ import androidx.annotation.NonNull; import androidx.annotation.StyleRes; import androidx.appcompat.view.ContextThemeWrapper; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import org.session.libsession.R; diff --git a/libsession/src/main/java/org/session/libsession/utilities/Util.kt b/libsession/src/main/java/org/session/libsession/utilities/Util.kt index 4f52b9c46c..14a2cc9001 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/Util.kt +++ b/libsession/src/main/java/org/session/libsession/utilities/Util.kt @@ -11,7 +11,7 @@ import android.text.Spannable import android.text.SpannableString import android.text.TextUtils import android.text.style.StyleSpan -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.Base64 import java.io.* import java.nio.charset.StandardCharsets diff --git a/libsession/src/main/java/org/session/libsession/utilities/ViewUtil.java b/libsession/src/main/java/org/session/libsession/utilities/ViewUtil.java index c962ebe53b..202e184ef4 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/ViewUtil.java +++ b/libsession/src/main/java/org/session/libsession/utilities/ViewUtil.java @@ -16,13 +16,11 @@ */ package org.session.libsession.utilities; -import android.annotation.SuppressLint; import android.app.Activity; import android.content.Context; import android.graphics.drawable.Drawable; import android.os.Build.VERSION; import android.os.Build.VERSION_CODES; -import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -30,7 +28,6 @@ import android.view.ViewStub; import android.view.animation.AlphaAnimation; import android.view.animation.Animation; import android.widget.LinearLayout.LayoutParams; -import android.widget.TextView; import androidx.annotation.IdRes; import androidx.annotation.LayoutRes; @@ -39,8 +36,8 @@ import androidx.annotation.Nullable; import androidx.core.view.ViewCompat; import androidx.interpolator.view.animation.FastOutSlowInInterpolator; -import org.session.libsignal.utilities.concurrent.ListenableFuture; -import org.session.libsignal.utilities.concurrent.SettableFuture; +import org.session.libsignal.utilities.ListenableFuture; +import org.session.libsignal.utilities.SettableFuture; import org.session.libsession.utilities.views.Stub; public class ViewUtil { diff --git a/libsession/src/main/java/org/session/libsession/utilities/concurrent/AssertedSuccessListener.java b/libsession/src/main/java/org/session/libsession/utilities/concurrent/AssertedSuccessListener.java index a23a81c412..391f53d027 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/concurrent/AssertedSuccessListener.java +++ b/libsession/src/main/java/org/session/libsession/utilities/concurrent/AssertedSuccessListener.java @@ -1,6 +1,6 @@ package org.session.libsession.utilities.concurrent; -import org.session.libsignal.utilities.concurrent.ListenableFuture.Listener; +import org.session.libsignal.utilities.ListenableFuture.Listener; import java.util.concurrent.ExecutionException; diff --git a/libsession/src/main/java/org/session/libsession/utilities/dynamiclanguage/DynamicLanguageActivityHelper.java b/libsession/src/main/java/org/session/libsession/utilities/dynamiclanguage/DynamicLanguageActivityHelper.java index 3e79329050..935b139481 100644 --- a/libsession/src/main/java/org/session/libsession/utilities/dynamiclanguage/DynamicLanguageActivityHelper.java +++ b/libsession/src/main/java/org/session/libsession/utilities/dynamiclanguage/DynamicLanguageActivityHelper.java @@ -5,7 +5,7 @@ import android.app.Activity; import androidx.annotation.MainThread; import androidx.core.os.ConfigurationCompat; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; import java.util.Locale; diff --git a/libsignal/src/main/AndroidManifest.xml b/libsignal/src/main/AndroidManifest.xml index a49ba19ba5..ff0be1b305 100644 --- a/libsignal/src/main/AndroidManifest.xml +++ b/libsignal/src/main/AndroidManifest.xml @@ -1,5 +1,2 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java index 88236d64fe..816fd8b04b 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java +++ b/libsignal/src/main/java/org/session/libsignal/service/api/messages/SignalServiceEnvelope.java @@ -8,26 +8,8 @@ package org.session.libsignal.service.api.messages; import com.google.protobuf.ByteString; -import org.session.libsignal.libsignal.InvalidVersionException; -import org.session.libsignal.utilities.logging.Log; import org.session.libsignal.service.api.push.SignalServiceAddress; import org.session.libsignal.service.internal.push.SignalServiceProtos.Envelope; -import org.session.libsignal.utilities.Base64; -import org.session.libsignal.utilities.Hex; - -import java.io.IOException; -import java.security.InvalidAlgorithmParameterException; -import java.security.InvalidKeyException; -import java.security.NoSuchAlgorithmException; -import java.util.Arrays; - -import javax.crypto.BadPaddingException; -import javax.crypto.Cipher; -import javax.crypto.IllegalBlockSizeException; -import javax.crypto.Mac; -import javax.crypto.NoSuchPaddingException; -import javax.crypto.spec.IvParameterSpec; -import javax.crypto.spec.SecretKeySpec; /** * This class represents an encrypted Signal Service envelope. diff --git a/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushTransportDetails.java b/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushTransportDetails.java index dda2357cb1..031e7880f1 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushTransportDetails.java +++ b/libsignal/src/main/java/org/session/libsignal/service/internal/push/PushTransportDetails.java @@ -7,7 +7,7 @@ package org.session.libsignal.service.internal.push; -import org.session.libsignal.utilities.logging.Log; +import org.session.libsignal.utilities.Log; public class PushTransportDetails { diff --git a/libsignal/src/main/java/org/session/libsignal/service/loki/HTTP.kt b/libsignal/src/main/java/org/session/libsignal/service/loki/HTTP.kt index 90a20d2282..7aa42fd3a6 100644 --- a/libsignal/src/main/java/org/session/libsignal/service/loki/HTTP.kt +++ b/libsignal/src/main/java/org/session/libsignal/service/loki/HTTP.kt @@ -1,7 +1,7 @@ package org.session.libsignal.service.loki import okhttp3.* -import org.session.libsignal.utilities.logging.Log +import org.session.libsignal.utilities.Log import org.session.libsignal.utilities.JsonUtil import java.lang.IllegalStateException import java.security.SecureRandom diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/externalstorage/ExternalStorageUtil.kt b/libsignal/src/main/java/org/session/libsignal/utilities/ExternalStorageUtil.kt similarity index 97% rename from libsignal/src/main/java/org/session/libsignal/utilities/externalstorage/ExternalStorageUtil.kt rename to libsignal/src/main/java/org/session/libsignal/utilities/ExternalStorageUtil.kt index 4957045a61..a8a8fd662f 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/externalstorage/ExternalStorageUtil.kt +++ b/libsignal/src/main/java/org/session/libsignal/utilities/ExternalStorageUtil.kt @@ -1,4 +1,4 @@ -package org.session.libsignal.utilities.externalstorage +package org.session.libsignal.utilities import android.content.Context import android.net.Uri diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/JsonUtil.java b/libsignal/src/main/java/org/session/libsignal/utilities/JsonUtil.java index 046afeb34f..89af2cee3c 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/JsonUtil.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/JsonUtil.java @@ -1,24 +1,14 @@ package org.session.libsignal.utilities; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.type.ResolvedType; -import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JavaType; -import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.databind.SerializerProvider; import org.json.JSONException; import org.json.JSONObject; -import org.session.libsignal.libsignal.IdentityKey; -import org.session.libsignal.libsignal.InvalidKeyException; -import org.session.libsignal.utilities.logging.Log; import java.io.IOException; import java.io.InputStream; diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/concurrent/ListenableFuture.java b/libsignal/src/main/java/org/session/libsignal/utilities/ListenableFuture.java similarity index 85% rename from libsignal/src/main/java/org/session/libsignal/utilities/concurrent/ListenableFuture.java rename to libsignal/src/main/java/org/session/libsignal/utilities/ListenableFuture.java index d621f9db83..59e04ee99e 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/concurrent/ListenableFuture.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/ListenableFuture.java @@ -1,4 +1,4 @@ -package org.session.libsignal.utilities.concurrent; +package org.session.libsignal.utilities; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/logging/Log.java b/libsignal/src/main/java/org/session/libsignal/utilities/Log.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/utilities/logging/Log.java rename to libsignal/src/main/java/org/session/libsignal/utilities/Log.java index 0f6b74ffb2..f2f7005988 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/logging/Log.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/Log.java @@ -1,4 +1,4 @@ -package org.session.libsignal.utilities.logging; +package org.session.libsignal.utilities; import androidx.annotation.MainThread; diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/externalstorage/NoExternalStorageException.java b/libsignal/src/main/java/org/session/libsignal/utilities/NoExternalStorageException.java similarity index 95% rename from libsignal/src/main/java/org/session/libsignal/utilities/externalstorage/NoExternalStorageException.java rename to libsignal/src/main/java/org/session/libsignal/utilities/NoExternalStorageException.java index 7f0de9510a..d57ae0b4ec 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/externalstorage/NoExternalStorageException.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/NoExternalStorageException.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.session.libsignal.utilities.externalstorage; +package org.session.libsignal.utilities; public class NoExternalStorageException extends Exception { diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/PromiseUtilities.kt b/libsignal/src/main/java/org/session/libsignal/utilities/PromiseUtilities.kt index 530d432d57..d6361289c5 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/PromiseUtilities.kt +++ b/libsignal/src/main/java/org/session/libsignal/utilities/PromiseUtilities.kt @@ -3,7 +3,6 @@ package org.session.libsignal.utilities import nl.komponents.kovenant.Promise import nl.komponents.kovenant.deferred -import org.session.libsignal.utilities.logging.Log import java.util.concurrent.TimeoutException fun Promise.get(defaultValue: V): V { diff --git a/libsignal/src/main/java/org/session/libsignal/utilities/concurrent/SettableFuture.java b/libsignal/src/main/java/org/session/libsignal/utilities/SettableFuture.java similarity index 98% rename from libsignal/src/main/java/org/session/libsignal/utilities/concurrent/SettableFuture.java rename to libsignal/src/main/java/org/session/libsignal/utilities/SettableFuture.java index 070abb556e..ca540da41d 100644 --- a/libsignal/src/main/java/org/session/libsignal/utilities/concurrent/SettableFuture.java +++ b/libsignal/src/main/java/org/session/libsignal/utilities/SettableFuture.java @@ -1,4 +1,4 @@ -package org.session.libsignal.utilities.concurrent; +package org.session.libsignal.utilities; import java.util.LinkedList; import java.util.List;