From dc790560fdfd64e8ac60fcc553728a9470801c48 Mon Sep 17 00:00:00 2001 From: Niels Andriesse Date: Fri, 9 Jul 2021 13:56:38 +1000 Subject: [PATCH] Clean & debug --- app/src/main/AndroidManifest.xml | 12 +-- .../securesms/ApplicationContext.java | 2 +- .../components/TypingStatusSender.java | 2 +- .../securesms/database/Storage.kt | 2 +- .../securesms/database/ThreadDatabase.java | 2 +- .../CreatePrivateChatActivity.kt | 6 +- .../ClosedGroupEditingOptionsBottomSheet.kt | 2 +- .../groups/EditClosedGroupActivity.kt | 1 - .../groups/JoinPublicChatActivity.kt | 6 +- .../ConversationOptionsBottomSheet.kt | 2 +- .../securesms/home/HomeActivity.kt | 4 +- .../UserDetailsBottomSheet.kt | 3 +- .../DeviceEditingOptionsBottomSheet.kt | 24 ------ .../BackgroundPollWorker.kt | 2 +- .../notifications/DefaultMessageNotifier.java | 2 +- .../notifications/MarkReadReceiver.java | 2 +- .../onboarding/LinkDeviceActivity.kt | 4 +- .../ChangeUiModeDialog.kt | 2 +- .../ClearAllDataDialog.kt | 2 +- .../securesms/preferences/QRCodeActivity.kt | 4 +- .../dialogs => preferences}/SeedDialog.kt | 2 +- .../securesms/preferences/SettingsActivity.kt | 3 - .../fragments => util}/ScanQRCodeFragment.kt | 2 +- .../ScanQRCodePlaceholderFragment.kt | 2 +- .../ScanQRCodeWrapperFragment.kt | 3 +- .../protocol => util}/SessionMetaProtocol.kt | 4 +- .../res/layout/open_group_invitation_view.xml | 74 ------------------- 27 files changed, 37 insertions(+), 139 deletions(-) rename app/src/main/java/org/thoughtcrime/securesms/{loki/activities => dms}/CreatePrivateChatActivity.kt (97%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/dialogs => groups}/ClosedGroupEditingOptionsBottomSheet.kt (94%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/dialogs => home}/ConversationOptionsBottomSheet.kt (97%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/dialogs => home}/UserDetailsBottomSheet.kt (97%) delete mode 100644 app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/DeviceEditingOptionsBottomSheet.kt rename app/src/main/java/org/thoughtcrime/securesms/{loki/api => notifications}/BackgroundPollWorker.kt (98%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/dialogs => preferences}/ChangeUiModeDialog.kt (96%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/dialogs => preferences}/ClearAllDataDialog.kt (97%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/dialogs => preferences}/SeedDialog.kt (97%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/fragments => util}/ScanQRCodeFragment.kt (97%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/fragments => util}/ScanQRCodePlaceholderFragment.kt (94%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/fragments => util}/ScanQRCodeWrapperFragment.kt (96%) rename app/src/main/java/org/thoughtcrime/securesms/{loki/protocol => util}/SessionMetaProtocol.kt (94%) delete mode 100644 app/src/main/res/layout/open_group_invitation_view.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d508694ca2..6eae3a6927 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -106,7 +106,7 @@ android:windowSoftInputMode="adjustResize" android:theme="@style/Theme.Session.DayNight.FlatActionBar" /> @@ -132,23 +132,23 @@ android:name="org.thoughtcrime.securesms.home.PathActivity" android:screenOrientation="portrait" /> @@ -411,7 +411,7 @@ diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java index 9dab6f1367..6ea6795f12 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java @@ -59,7 +59,7 @@ import org.thoughtcrime.securesms.logging.AndroidLogger; import org.thoughtcrime.securesms.logging.PersistentLogger; import org.thoughtcrime.securesms.logging.UncaughtExceptionLogger; import org.thoughtcrime.securesms.home.HomeActivity; -import org.thoughtcrime.securesms.loki.api.BackgroundPollWorker; +import org.thoughtcrime.securesms.notifications.BackgroundPollWorker; import org.thoughtcrime.securesms.notifications.LokiPushNotificationManager; import org.thoughtcrime.securesms.groups.OpenGroupManager; import org.thoughtcrime.securesms.database.LokiAPIDatabase; diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java b/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java index 027a319651..b1ef0f9f72 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java +++ b/app/src/main/java/org/thoughtcrime/securesms/components/TypingStatusSender.java @@ -8,7 +8,7 @@ import org.session.libsession.messaging.messages.control.TypingIndicator; import org.session.libsession.messaging.sending_receiving.MessageSender; import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.ThreadDatabase; -import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol; +import org.thoughtcrime.securesms.util.SessionMetaProtocol; import org.session.libsession.utilities.recipients.Recipient; import org.session.libsession.utilities.Util; diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt index 552b631089..ee33b2dfcb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/database/Storage.kt @@ -30,7 +30,7 @@ import org.thoughtcrime.securesms.crypto.IdentityKeyUtil import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper import org.thoughtcrime.securesms.jobs.RetrieveProfileAvatarJob import org.thoughtcrime.securesms.groups.OpenGroupManager -import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol +import org.thoughtcrime.securesms.util.SessionMetaProtocol import org.thoughtcrime.securesms.mms.PartAuthority class Storage(context: Context, helper: SQLCipherOpenHelper) : Database(context, helper), StorageProtocol { diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java index 5643340ec9..16f1f64d4a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java +++ b/app/src/main/java/org/thoughtcrime/securesms/database/ThreadDatabase.java @@ -49,7 +49,7 @@ import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord; import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.MmsMessageRecord; import org.thoughtcrime.securesms.database.model.ThreadRecord; -import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol; +import org.thoughtcrime.securesms.util.SessionMetaProtocol; import org.thoughtcrime.securesms.mms.Slide; import org.thoughtcrime.securesms.mms.SlideDeck; diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/dms/CreatePrivateChatActivity.kt similarity index 97% rename from app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt rename to app/src/main/java/org/thoughtcrime/securesms/dms/CreatePrivateChatActivity.kt index eeb9ae833b..152dafaafd 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/activities/CreatePrivateChatActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/dms/CreatePrivateChatActivity.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.activities +package org.thoughtcrime.securesms.dms import android.animation.Animator import android.animation.AnimatorListenerAdapter @@ -32,8 +32,8 @@ import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2 import org.thoughtcrime.securesms.database.DatabaseFactory -import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragment -import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragmentDelegate +import org.thoughtcrime.securesms.util.ScanQRCodeWrapperFragment +import org.thoughtcrime.securesms.util.ScanQRCodeWrapperFragmentDelegate class CreatePrivateChatActivity : PassphraseRequiredActionBarActivity(), ScanQRCodeWrapperFragmentDelegate { private val adapter = CreatePrivateChatActivityAdapter(this) diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/ClosedGroupEditingOptionsBottomSheet.kt similarity index 94% rename from app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt rename to app/src/main/java/org/thoughtcrime/securesms/groups/ClosedGroupEditingOptionsBottomSheet.kt index b2f62cc37f..f5a75041a5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClosedGroupEditingOptionsBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ClosedGroupEditingOptionsBottomSheet.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.dialogs +package org.thoughtcrime.securesms.groups import android.os.Bundle import com.google.android.material.bottomsheet.BottomSheetDialogFragment diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupActivity.kt index ebd23da151..6f53644190 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/EditClosedGroupActivity.kt @@ -24,7 +24,6 @@ import org.session.libsession.messaging.sending_receiving.groupSizeLimit import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.session.libsession.utilities.Address import org.thoughtcrime.securesms.database.DatabaseFactory -import org.thoughtcrime.securesms.loki.dialogs.ClosedGroupEditingOptionsBottomSheet import org.thoughtcrime.securesms.util.fadeIn import org.thoughtcrime.securesms.util.fadeOut import org.thoughtcrime.securesms.mms.GlideApp diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/JoinPublicChatActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/groups/JoinPublicChatActivity.kt index 6a8a98b606..5d6d559a89 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/groups/JoinPublicChatActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/groups/JoinPublicChatActivity.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.activities +package org.thoughtcrime.securesms.groups import android.animation.Animator import android.animation.AnimatorListenerAdapter @@ -35,8 +35,8 @@ import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2 import org.thoughtcrime.securesms.groups.DefaultGroupsViewModel import org.thoughtcrime.securesms.groups.GroupManager import org.thoughtcrime.securesms.groups.OpenGroupManager -import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragment -import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragmentDelegate +import org.thoughtcrime.securesms.util.ScanQRCodeWrapperFragment +import org.thoughtcrime.securesms.util.ScanQRCodeWrapperFragmentDelegate import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities import org.thoughtcrime.securesms.util.State import java.util.* diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationOptionsBottomSheet.kt similarity index 97% rename from app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt rename to app/src/main/java/org/thoughtcrime/securesms/home/ConversationOptionsBottomSheet.kt index 9c7b51f31b..4664ea09c4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ConversationOptionsBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/home/ConversationOptionsBottomSheet.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.dialogs +package org.thoughtcrime.securesms.home import android.os.Bundle import com.google.android.material.bottomsheet.BottomSheetDialogFragment diff --git a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt index e804e439c7..608091b05f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/home/HomeActivity.kt @@ -40,10 +40,10 @@ import org.thoughtcrime.securesms.conversation.v2.ConversationActivityV2 import org.thoughtcrime.securesms.crypto.IdentityKeyUtil import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.database.model.ThreadRecord +import org.thoughtcrime.securesms.dms.CreatePrivateChatActivity import org.thoughtcrime.securesms.groups.CreateClosedGroupActivity -import org.thoughtcrime.securesms.loki.activities.* +import org.thoughtcrime.securesms.groups.JoinPublicChatActivity import org.thoughtcrime.securesms.groups.OpenGroupManager -import org.thoughtcrime.securesms.loki.dialogs.* import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities import org.thoughtcrime.securesms.util.* import org.thoughtcrime.securesms.onboarding.SeedReminderViewDelegate diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt similarity index 97% rename from app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt rename to app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt index c020fc3aee..147216ec6a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/UserDetailsBottomSheet.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/home/UserDetailsBottomSheet.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.dialogs +package org.thoughtcrime.securesms.home import android.annotation.SuppressLint import android.content.ClipData @@ -17,7 +17,6 @@ import network.loki.messenger.R import org.session.libsession.messaging.contacts.Contact import org.session.libsession.utilities.Address import org.session.libsession.utilities.recipients.Recipient -import org.session.libsession.utilities.SSKEnvironment import org.thoughtcrime.securesms.database.DatabaseFactory import org.thoughtcrime.securesms.mms.GlideApp diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/DeviceEditingOptionsBottomSheet.kt b/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/DeviceEditingOptionsBottomSheet.kt deleted file mode 100644 index 527f88d1e5..0000000000 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/DeviceEditingOptionsBottomSheet.kt +++ /dev/null @@ -1,24 +0,0 @@ -package org.thoughtcrime.securesms.loki.dialogs - -import android.os.Bundle -import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import kotlinx.android.synthetic.main.fragment_device_list_bottom_sheet.* -import network.loki.messenger.R - -public class DeviceEditingOptionsBottomSheet : BottomSheetDialogFragment() { - var onEditTapped: (() -> Unit)? = null - var onUnlinkTapped: (() -> Unit)? = null - - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - return inflater.inflate(R.layout.fragment_device_list_bottom_sheet, container, false) - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - editDisplayNameText.setOnClickListener { onEditTapped?.invoke() } - unlinkDeviceText.setOnClickListener { onUnlinkTapped?.invoke() } - } -} \ No newline at end of file diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt b/app/src/main/java/org/thoughtcrime/securesms/notifications/BackgroundPollWorker.kt similarity index 98% rename from app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt rename to app/src/main/java/org/thoughtcrime/securesms/notifications/BackgroundPollWorker.kt index d070c25f2f..1674caf629 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/api/BackgroundPollWorker.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/BackgroundPollWorker.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.api +package org.thoughtcrime.securesms.notifications import android.content.BroadcastReceiver import android.content.Context 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 446d87a327..c5bf55d800 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/DefaultMessageNotifier.java @@ -57,7 +57,7 @@ import org.thoughtcrime.securesms.database.ThreadDatabase; import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord; import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.MmsMessageRecord; -import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol; +import org.thoughtcrime.securesms.util.SessionMetaProtocol; import org.thoughtcrime.securesms.conversation.v2.utilities.MentionUtilities; import org.thoughtcrime.securesms.mms.SlideDeck; import org.thoughtcrime.securesms.service.KeyCachingService; 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 c12a3f196b..068cbac3e4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java @@ -21,7 +21,7 @@ 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.Log; -import org.thoughtcrime.securesms.loki.protocol.SessionMetaProtocol; +import org.thoughtcrime.securesms.util.SessionMetaProtocol; import org.thoughtcrime.securesms.service.ExpiringMessageManager; import java.util.LinkedList; diff --git a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceActivity.kt index 94e9626b9e..24701e461c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/onboarding/LinkDeviceActivity.kt @@ -30,8 +30,8 @@ import org.session.libsignal.utilities.hexEncodedPublicKey import org.thoughtcrime.securesms.ApplicationContext import org.thoughtcrime.securesms.BaseActionBarActivity import org.thoughtcrime.securesms.crypto.KeyPairUtilities -import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragment -import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragmentDelegate +import org.thoughtcrime.securesms.util.ScanQRCodeWrapperFragment +import org.thoughtcrime.securesms.util.ScanQRCodeWrapperFragmentDelegate import org.thoughtcrime.securesms.crypto.MnemonicUtilities import org.thoughtcrime.securesms.util.push import org.thoughtcrime.securesms.util.setUpActionBarSessionLogo diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ChangeUiModeDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/ChangeUiModeDialog.kt similarity index 96% rename from app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ChangeUiModeDialog.kt rename to app/src/main/java/org/thoughtcrime/securesms/preferences/ChangeUiModeDialog.kt index 875f914127..594d1b47f7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ChangeUiModeDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/ChangeUiModeDialog.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.dialogs +package org.thoughtcrime.securesms.preferences import android.app.Dialog import android.os.Bundle diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt similarity index 97% rename from app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt rename to app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt index e1a5271acf..239b42c644 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/ClearAllDataDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/ClearAllDataDialog.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.dialogs +package org.thoughtcrime.securesms.preferences import android.view.LayoutInflater import androidx.appcompat.app.AlertDialog diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/QRCodeActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/QRCodeActivity.kt index cace00bac4..07a1d60590 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/QRCodeActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/QRCodeActivity.kt @@ -17,8 +17,8 @@ import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.session.libsession.utilities.Address import org.thoughtcrime.securesms.database.DatabaseFactory -import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragment -import org.thoughtcrime.securesms.loki.fragments.ScanQRCodeWrapperFragmentDelegate +import org.thoughtcrime.securesms.util.ScanQRCodeWrapperFragment +import org.thoughtcrime.securesms.util.ScanQRCodeWrapperFragmentDelegate import org.thoughtcrime.securesms.util.QRCodeUtilities import org.thoughtcrime.securesms.util.toPx import org.session.libsession.utilities.recipients.Recipient diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt similarity index 97% rename from app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt rename to app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt index 236821eaf3..19fffc343f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/dialogs/SeedDialog.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SeedDialog.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.dialogs +package org.thoughtcrime.securesms.preferences import android.content.ClipData import android.content.ClipboardManager diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt index b4715d25f4..5bd91655b7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/SettingsActivity.kt @@ -33,9 +33,6 @@ import org.session.libsession.utilities.SSKEnvironment.ProfileManagerProtocol import org.session.libsession.utilities.TextSecurePreferences import org.thoughtcrime.securesms.PassphraseRequiredActionBarActivity import org.thoughtcrime.securesms.avatar.AvatarSelection -import org.thoughtcrime.securesms.loki.dialogs.ChangeUiModeDialog -import org.thoughtcrime.securesms.loki.dialogs.ClearAllDataDialog -import org.thoughtcrime.securesms.loki.dialogs.SeedDialog import org.thoughtcrime.securesms.util.ConfigurationMessageUtilities import org.thoughtcrime.securesms.util.UiModeUtilities import org.thoughtcrime.securesms.util.push diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ScanQRCodeFragment.kt similarity index 97% rename from app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeFragment.kt rename to app/src/main/java/org/thoughtcrime/securesms/util/ScanQRCodeFragment.kt index d0c6af135e..9eecc15b75 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/ScanQRCodeFragment.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.fragments +package org.thoughtcrime.securesms.util import android.content.res.Configuration import android.os.Bundle diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodePlaceholderFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ScanQRCodePlaceholderFragment.kt similarity index 94% rename from app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodePlaceholderFragment.kt rename to app/src/main/java/org/thoughtcrime/securesms/util/ScanQRCodePlaceholderFragment.kt index 13e46b6fe1..5b36de7aea 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodePlaceholderFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/ScanQRCodePlaceholderFragment.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.fragments +package org.thoughtcrime.securesms.util import android.os.Bundle import androidx.fragment.app.Fragment diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeWrapperFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/util/ScanQRCodeWrapperFragment.kt similarity index 96% rename from app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeWrapperFragment.kt rename to app/src/main/java/org/thoughtcrime/securesms/util/ScanQRCodeWrapperFragment.kt index 52414bef9c..6913e3cb8a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/fragments/ScanQRCodeWrapperFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/ScanQRCodeWrapperFragment.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.fragments +package org.thoughtcrime.securesms.util import android.Manifest import android.content.pm.PackageManager @@ -11,6 +11,7 @@ import androidx.fragment.app.Fragment import com.tbruyelle.rxpermissions2.RxPermissions import network.loki.messenger.R import org.thoughtcrime.securesms.qr.ScanListener +import org.thoughtcrime.securesms.util.ScanQRCodeFragment class ScanQRCodeWrapperFragment : Fragment(), ScanQRCodePlaceholderFragmentDelegate, ScanListener { diff --git a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt b/app/src/main/java/org/thoughtcrime/securesms/util/SessionMetaProtocol.kt similarity index 94% rename from app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt rename to app/src/main/java/org/thoughtcrime/securesms/util/SessionMetaProtocol.kt index 1f8bdca7ad..fcfa1d082b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/loki/protocol/SessionMetaProtocol.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SessionMetaProtocol.kt @@ -1,4 +1,4 @@ -package org.thoughtcrime.securesms.loki.protocol +package org.thoughtcrime.securesms.util import org.session.libsession.utilities.Address import org.session.libsession.utilities.recipients.Recipient @@ -22,7 +22,7 @@ object SessionMetaProtocol { } fun removeTimestamps(timestamps: Set) { - this.timestamps.removeAll(timestamps) + SessionMetaProtocol.timestamps.removeAll(timestamps) } @JvmStatic diff --git a/app/src/main/res/layout/open_group_invitation_view.xml b/app/src/main/res/layout/open_group_invitation_view.xml deleted file mode 100644 index 2a360a4a62..0000000000 --- a/app/src/main/res/layout/open_group_invitation_view.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file