From 9261c34213d2611c83ff5bd6dec1154786b424bc Mon Sep 17 00:00:00 2001 From: Nicholas Tinsley Date: Thu, 5 Sep 2024 15:25:32 -0400 Subject: [PATCH] Clean up registration java packages hierarchy. --- .../thoughtcrime/securesms/testing/SignalActivityRule.kt | 6 +++--- .../org/thoughtcrime/securesms/ApplicationContext.java | 2 +- .../backup/v2/ui/subscription/RemoteRestoreViewModel.kt | 2 +- .../app/changenumber/ChangeNumberEnterCodeFragment.kt | 2 +- .../settings/app/changenumber/ChangeNumberViewModel.kt | 4 ++-- .../securesms/contacts/sync/ContactDiscovery.kt | 2 +- .../org/thoughtcrime/securesms/gcm/FcmReceiveService.java | 2 +- .../thoughtcrime/securesms/lock/v2/BaseSvrPinFragment.java | 2 +- .../securesms/lock/v2/ConfirmSvrPinFragment.kt | 2 +- .../securesms/pin/PinRestoreEntryFragment.java | 2 +- .../securesms/profiles/edit/EditSelfProfileRepository.java | 2 +- .../registration/data/LocalRegistrationMetadataUtil.kt | 1 - .../securesms/registration/{ => data}/RegistrationData.kt | 3 +-- .../securesms/registration/data/RegistrationRepository.kt | 3 +-- .../registration/{ => fcm}/PushChallengeRequest.java | 7 ++++++- .../securesms/registration/{ => sms}/ReceivedSmsEvent.java | 7 ++++++- .../registration/{ => sms}/SmsRetrieverReceiver.java | 7 ++++++- .../securesms/registration/ui/RegistrationActivity.kt | 2 +- .../securesms/registration/ui/RegistrationViewModel.kt | 4 ++-- .../registration/ui/entercode/EnterCodeFragment.kt | 2 +- .../registration/ui/restore/RemoteRestoreActivity.kt | 2 +- .../registration/{ => util}/RegistrationUtil.java | 7 ++++++- .../restorelocalbackup/RestoreLocalBackupViewModel.kt | 2 +- .../registration/{ => fcm}/PushChallengeRequestTest.java | 7 ++++++- 24 files changed, 52 insertions(+), 30 deletions(-) rename app/src/main/java/org/thoughtcrime/securesms/registration/{ => data}/RegistrationData.kt (80%) rename app/src/main/java/org/thoughtcrime/securesms/registration/{ => fcm}/PushChallengeRequest.java (96%) rename app/src/main/java/org/thoughtcrime/securesms/registration/{ => sms}/ReceivedSmsEvent.java (67%) rename app/src/main/java/org/thoughtcrime/securesms/registration/{ => sms}/SmsRetrieverReceiver.java (94%) rename app/src/main/java/org/thoughtcrime/securesms/registration/{ => util}/RegistrationUtil.java (93%) rename app/src/test/java/org/thoughtcrime/securesms/registration/{ => fcm}/PushChallengeRequestTest.java (96%) diff --git a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt index 7d129c3364..c2b21082f3 100644 --- a/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt +++ b/app/src/androidTest/java/org/thoughtcrime/securesms/testing/SignalActivityRule.kt @@ -25,10 +25,10 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.profiles.ProfileName import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId -import org.thoughtcrime.securesms.registration.RegistrationData -import org.thoughtcrime.securesms.registration.RegistrationRepository -import org.thoughtcrime.securesms.registration.RegistrationUtil import org.thoughtcrime.securesms.registration.VerifyResponse +import org.thoughtcrime.securesms.registration.data.RegistrationData +import org.thoughtcrime.securesms.registration.data.RegistrationRepository +import org.thoughtcrime.securesms.registration.util.RegistrationUtil import org.thoughtcrime.securesms.testing.GroupTestingUtils.asMember import org.thoughtcrime.securesms.util.Util import org.whispersystems.signalservice.api.profiles.SignalServiceProfile diff --git a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java index b3af81182a..dba002e80f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java +++ b/app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java @@ -84,7 +84,7 @@ import org.thoughtcrime.securesms.mms.SignalGlideModule; import org.thoughtcrime.securesms.providers.BlobProvider; import org.thoughtcrime.securesms.ratelimit.RateLimitUtil; import org.thoughtcrime.securesms.recipients.Recipient; -import org.thoughtcrime.securesms.registration.RegistrationUtil; +import org.thoughtcrime.securesms.registration.util.RegistrationUtil; import org.thoughtcrime.securesms.ringrtc.RingRtcLogger; import org.thoughtcrime.securesms.service.AnalyzeDatabaseAlarmListener; import org.thoughtcrime.securesms.service.DirectoryRefreshListener; diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/RemoteRestoreViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/RemoteRestoreViewModel.kt index ba8d637f04..660e07b68a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/RemoteRestoreViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/subscription/RemoteRestoreViewModel.kt @@ -25,7 +25,7 @@ import org.thoughtcrime.securesms.jobs.BackupRestoreMediaJob import org.thoughtcrime.securesms.jobs.SyncArchivedMediaJob import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.recipients.Recipient -import org.thoughtcrime.securesms.registration.RegistrationUtil +import org.thoughtcrime.securesms.registration.util.RegistrationUtil import java.io.InputStream import kotlin.time.Duration.Companion.seconds diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterCodeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterCodeFragment.kt index 585e732248..d51698656d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterCodeFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberEnterCodeFragment.kt @@ -23,13 +23,13 @@ import org.thoughtcrime.securesms.components.ViewBinderDelegate import org.thoughtcrime.securesms.components.settings.app.changenumber.ChangeNumberUtil.changeNumberSuccess import org.thoughtcrime.securesms.databinding.FragmentChangeNumberEnterCodeBinding import org.thoughtcrime.securesms.keyvalue.SignalStore -import org.thoughtcrime.securesms.registration.ReceivedSmsEvent import org.thoughtcrime.securesms.registration.data.RegistrationRepository import org.thoughtcrime.securesms.registration.data.network.RegistrationResult import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult import org.thoughtcrime.securesms.registration.fragments.ContactSupportBottomSheetFragment import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate import org.thoughtcrime.securesms.registration.fragments.SignalStrengthPhoneStateListener +import org.thoughtcrime.securesms.registration.sms.ReceivedSmsEvent import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener import org.thoughtcrime.securesms.util.navigation.safeNavigate import org.thoughtcrime.securesms.util.visible diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt index 5ac565db4d..352a151572 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/app/changenumber/ChangeNumberViewModel.kt @@ -22,12 +22,12 @@ import org.signal.core.util.concurrent.SignalExecutors import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.keyvalue.SignalStore -import org.thoughtcrime.securesms.registration.RegistrationData -import org.thoughtcrime.securesms.registration.SmsRetrieverReceiver +import org.thoughtcrime.securesms.registration.data.RegistrationData import org.thoughtcrime.securesms.registration.data.RegistrationRepository import org.thoughtcrime.securesms.registration.data.network.Challenge import org.thoughtcrime.securesms.registration.data.network.RegistrationSessionCreationResult import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult +import org.thoughtcrime.securesms.registration.sms.SmsRetrieverReceiver import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel import org.thoughtcrime.securesms.registration.viewmodel.NumberViewState import org.thoughtcrime.securesms.registration.viewmodel.SvrAuthCredentialSet diff --git a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt index 9413c8d2ae..7c9be332b2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/contacts/sync/ContactDiscovery.kt @@ -23,7 +23,7 @@ import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter import org.thoughtcrime.securesms.profiles.ProfileName import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId -import org.thoughtcrime.securesms.registration.RegistrationUtil +import org.thoughtcrime.securesms.registration.util.RegistrationUtil import org.thoughtcrime.securesms.storage.StorageSyncHelper import org.thoughtcrime.securesms.util.TextSecurePreferences import org.thoughtcrime.securesms.util.Util diff --git a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java index 5d56adaa7d..e406a0a0b5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java +++ b/app/src/main/java/org/thoughtcrime/securesms/gcm/FcmReceiveService.java @@ -14,7 +14,7 @@ import org.thoughtcrime.securesms.dependencies.AppDependencies; import org.thoughtcrime.securesms.jobs.FcmRefreshJob; import org.thoughtcrime.securesms.jobs.SubmitRateLimitPushChallengeJob; import org.thoughtcrime.securesms.keyvalue.SignalStore; -import org.thoughtcrime.securesms.registration.PushChallengeRequest; +import org.thoughtcrime.securesms.registration.fcm.PushChallengeRequest; import org.thoughtcrime.securesms.util.NetworkUtil; import org.thoughtcrime.securesms.util.SignalLocalMetrics; diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseSvrPinFragment.java b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseSvrPinFragment.java index 401d2cccc9..158df96247 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseSvrPinFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseSvrPinFragment.java @@ -27,7 +27,7 @@ import org.thoughtcrime.securesms.PassphraseRequiredActivity; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.pin.PinOptOutDialog; -import org.thoughtcrime.securesms.registration.RegistrationUtil; +import org.thoughtcrime.securesms.registration.util.RegistrationUtil; import org.thoughtcrime.securesms.util.CommunicationActions; import org.thoughtcrime.securesms.util.text.AfterTextChanged; import org.thoughtcrime.securesms.util.views.CircularProgressMaterialButton; diff --git a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmSvrPinFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmSvrPinFragment.kt index be7f4fabb8..384a2042a8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmSvrPinFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/ConfirmSvrPinFragment.kt @@ -12,7 +12,7 @@ import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.dependencies.AppDependencies import org.thoughtcrime.securesms.lock.v2.ConfirmSvrPinViewModel.SaveAnimation import org.thoughtcrime.securesms.megaphone.Megaphones -import org.thoughtcrime.securesms.registration.RegistrationUtil +import org.thoughtcrime.securesms.registration.util.RegistrationUtil import org.thoughtcrime.securesms.storage.StorageSyncHelper import org.thoughtcrime.securesms.util.SpanUtil diff --git a/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreEntryFragment.java b/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreEntryFragment.java index 36404904b2..3f561a6ba6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreEntryFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/pin/PinRestoreEntryFragment.java @@ -35,7 +35,7 @@ import org.thoughtcrime.securesms.lock.v2.SvrConstants; import org.thoughtcrime.securesms.profiles.AvatarHelper; import org.thoughtcrime.securesms.profiles.edit.CreateProfileActivity; import org.thoughtcrime.securesms.recipients.Recipient; -import org.thoughtcrime.securesms.registration.RegistrationUtil; +import org.thoughtcrime.securesms.registration.util.RegistrationUtil; import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate; import org.thoughtcrime.securesms.restore.RestoreActivity; import org.thoughtcrime.securesms.util.CommunicationActions; diff --git a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditSelfProfileRepository.java b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditSelfProfileRepository.java index 92fcb38d37..031fddc2c0 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditSelfProfileRepository.java +++ b/app/src/main/java/org/thoughtcrime/securesms/profiles/edit/EditSelfProfileRepository.java @@ -24,7 +24,7 @@ import org.thoughtcrime.securesms.profiles.ProfileName; import org.thoughtcrime.securesms.profiles.SystemProfileUtil; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; -import org.thoughtcrime.securesms.registration.RegistrationUtil; +import org.thoughtcrime.securesms.registration.util.RegistrationUtil; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/data/LocalRegistrationMetadataUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/LocalRegistrationMetadataUtil.kt index 571f28b02d..b005bf239a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/data/LocalRegistrationMetadataUtil.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/LocalRegistrationMetadataUtil.kt @@ -10,7 +10,6 @@ import org.signal.libsignal.protocol.IdentityKeyPair import org.signal.libsignal.protocol.state.KyberPreKeyRecord import org.signal.libsignal.protocol.state.SignedPreKeyRecord import org.thoughtcrime.securesms.database.model.databaseprotos.LocalRegistrationMetadata -import org.thoughtcrime.securesms.registration.RegistrationData import org.whispersystems.signalservice.api.account.PreKeyCollection /** diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationData.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/RegistrationData.kt similarity index 80% rename from app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationData.kt rename to app/src/main/java/org/thoughtcrime/securesms/registration/data/RegistrationData.kt index a1f6ede3a6..cd3fe9cd66 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationData.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/RegistrationData.kt @@ -1,8 +1,7 @@ -package org.thoughtcrime.securesms.registration +package org.thoughtcrime.securesms.registration.data import org.signal.libsignal.zkgroup.profiles.ProfileKey -// TODO [regv2]: fold sessionId into this? data class RegistrationData( val code: String, val e164: String, diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/data/RegistrationRepository.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/data/RegistrationRepository.kt index e429aa9e58..1c5c2483cf 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/data/RegistrationRepository.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/data/RegistrationRepository.kt @@ -43,8 +43,6 @@ import org.thoughtcrime.securesms.pin.SvrWrongPinException import org.thoughtcrime.securesms.push.AccountManagerFactory import org.thoughtcrime.securesms.recipients.Recipient import org.thoughtcrime.securesms.recipients.RecipientId -import org.thoughtcrime.securesms.registration.PushChallengeRequest -import org.thoughtcrime.securesms.registration.RegistrationData import org.thoughtcrime.securesms.registration.data.LocalRegistrationMetadataUtil.getAciIdentityKeyPair import org.thoughtcrime.securesms.registration.data.LocalRegistrationMetadataUtil.getAciPreKeyCollection import org.thoughtcrime.securesms.registration.data.LocalRegistrationMetadataUtil.getPniIdentityKeyPair @@ -55,6 +53,7 @@ import org.thoughtcrime.securesms.registration.data.network.RegistrationSessionC import org.thoughtcrime.securesms.registration.data.network.RegistrationSessionCreationResult import org.thoughtcrime.securesms.registration.data.network.RegistrationSessionResult import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult +import org.thoughtcrime.securesms.registration.fcm.PushChallengeRequest import org.thoughtcrime.securesms.registration.viewmodel.SvrAuthCredentialSet import org.thoughtcrime.securesms.service.DirectoryRefreshListener import org.thoughtcrime.securesms.service.RotateSignedPreKeyListener diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/PushChallengeRequest.java b/app/src/main/java/org/thoughtcrime/securesms/registration/fcm/PushChallengeRequest.java similarity index 96% rename from app/src/main/java/org/thoughtcrime/securesms/registration/PushChallengeRequest.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/fcm/PushChallengeRequest.java index 9f26cc1460..3c97e8c0db 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/PushChallengeRequest.java +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/fcm/PushChallengeRequest.java @@ -1,4 +1,9 @@ -package org.thoughtcrime.securesms.registration; +/* + * Copyright 2024 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.thoughtcrime.securesms.registration.fcm; import androidx.annotation.NonNull; import androidx.annotation.WorkerThread; diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ReceivedSmsEvent.java b/app/src/main/java/org/thoughtcrime/securesms/registration/sms/ReceivedSmsEvent.java similarity index 67% rename from app/src/main/java/org/thoughtcrime/securesms/registration/ReceivedSmsEvent.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/sms/ReceivedSmsEvent.java index 6f7227c815..d966bb0ac4 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ReceivedSmsEvent.java +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/sms/ReceivedSmsEvent.java @@ -1,4 +1,9 @@ -package org.thoughtcrime.securesms.registration; +/* + * Copyright 2024 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.thoughtcrime.securesms.registration.sms; import androidx.annotation.NonNull; diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/SmsRetrieverReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/registration/sms/SmsRetrieverReceiver.java similarity index 94% rename from app/src/main/java/org/thoughtcrime/securesms/registration/SmsRetrieverReceiver.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/sms/SmsRetrieverReceiver.java index 53d78b742b..876eb5ccf8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/SmsRetrieverReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/sms/SmsRetrieverReceiver.java @@ -1,4 +1,9 @@ -package org.thoughtcrime.securesms.registration; +/* + * Copyright 2024 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.thoughtcrime.securesms.registration.sms; import android.app.Application; import android.content.BroadcastReceiver; diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationActivity.kt index 0558cad930..c474c74548 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationActivity.kt @@ -22,7 +22,7 @@ import org.thoughtcrime.securesms.pin.PinRestoreActivity import org.thoughtcrime.securesms.profiles.AvatarHelper import org.thoughtcrime.securesms.profiles.edit.CreateProfileActivity import org.thoughtcrime.securesms.recipients.Recipient -import org.thoughtcrime.securesms.registration.SmsRetrieverReceiver +import org.thoughtcrime.securesms.registration.sms.SmsRetrieverReceiver import org.thoughtcrime.securesms.registration.ui.restore.RemoteRestoreActivity import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme import org.thoughtcrime.securesms.util.RemoteConfig diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt index b221cfd13a..f75dfafd6a 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/RegistrationViewModel.kt @@ -33,9 +33,8 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.permissions.Permissions import org.thoughtcrime.securesms.pin.SvrRepository import org.thoughtcrime.securesms.pin.SvrWrongPinException -import org.thoughtcrime.securesms.registration.RegistrationData -import org.thoughtcrime.securesms.registration.RegistrationUtil import org.thoughtcrime.securesms.registration.data.LocalRegistrationMetadataUtil +import org.thoughtcrime.securesms.registration.data.RegistrationData import org.thoughtcrime.securesms.registration.data.RegistrationRepository import org.thoughtcrime.securesms.registration.data.network.BackupAuthCheckResult import org.thoughtcrime.securesms.registration.data.network.Challenge @@ -59,6 +58,7 @@ import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequ import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.Success import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.TokenNotAccepted import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult.UnknownError +import org.thoughtcrime.securesms.registration.util.RegistrationUtil import org.thoughtcrime.securesms.registration.viewmodel.SvrAuthCredentialSet import org.thoughtcrime.securesms.util.RemoteConfig import org.thoughtcrime.securesms.util.Util diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/entercode/EnterCodeFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/entercode/EnterCodeFragment.kt index 88283c9eed..ef7d93ac7b 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/entercode/EnterCodeFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/entercode/EnterCodeFragment.kt @@ -25,13 +25,13 @@ import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.components.ViewBinderDelegate import org.thoughtcrime.securesms.conversation.v2.registerForLifecycle import org.thoughtcrime.securesms.databinding.FragmentRegistrationEnterCodeBinding -import org.thoughtcrime.securesms.registration.ReceivedSmsEvent import org.thoughtcrime.securesms.registration.data.network.RegisterAccountResult import org.thoughtcrime.securesms.registration.data.network.RegistrationResult import org.thoughtcrime.securesms.registration.data.network.VerificationCodeRequestResult import org.thoughtcrime.securesms.registration.fragments.ContactSupportBottomSheetFragment import org.thoughtcrime.securesms.registration.fragments.RegistrationViewDelegate.setDebugLogSubmitMultiTapView import org.thoughtcrime.securesms.registration.fragments.SignalStrengthPhoneStateListener +import org.thoughtcrime.securesms.registration.sms.ReceivedSmsEvent import org.thoughtcrime.securesms.registration.ui.RegistrationCheckpoint import org.thoughtcrime.securesms.registration.ui.RegistrationViewModel import org.thoughtcrime.securesms.util.concurrent.AssertedSuccessListener diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreActivity.kt index a1053a918c..d2a91540b8 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreActivity.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/ui/restore/RemoteRestoreActivity.kt @@ -63,7 +63,7 @@ import org.thoughtcrime.securesms.keyvalue.SignalStore import org.thoughtcrime.securesms.profiles.AvatarHelper import org.thoughtcrime.securesms.profiles.edit.CreateProfileActivity import org.thoughtcrime.securesms.recipients.Recipient -import org.thoughtcrime.securesms.registration.RegistrationUtil +import org.thoughtcrime.securesms.registration.util.RegistrationUtil import org.thoughtcrime.securesms.restore.transferorrestore.TransferOrRestoreMoreOptionsDialog import org.thoughtcrime.securesms.util.DateUtils import org.thoughtcrime.securesms.util.Util diff --git a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationUtil.java b/app/src/main/java/org/thoughtcrime/securesms/registration/util/RegistrationUtil.java similarity index 93% rename from app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationUtil.java rename to app/src/main/java/org/thoughtcrime/securesms/registration/util/RegistrationUtil.java index a519e3094b..1775f34a7d 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/registration/RegistrationUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/registration/util/RegistrationUtil.java @@ -1,4 +1,9 @@ -package org.thoughtcrime.securesms.registration; +/* + * Copyright 2024 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.thoughtcrime.securesms.registration.util; import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.dependencies.AppDependencies; diff --git a/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupViewModel.kt index 54e147528e..aa2fd31ba6 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupViewModel.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/restore/restorelocalbackup/RestoreLocalBackupViewModel.kt @@ -17,8 +17,8 @@ import kotlinx.coroutines.launch import org.signal.core.util.logging.Log import org.thoughtcrime.securesms.backup.BackupEvent import org.thoughtcrime.securesms.keyvalue.SignalStore -import org.thoughtcrime.securesms.registration.RegistrationUtil import org.thoughtcrime.securesms.registration.data.RegistrationRepository +import org.thoughtcrime.securesms.registration.util.RegistrationUtil import org.thoughtcrime.securesms.restore.RestoreRepository /** diff --git a/app/src/test/java/org/thoughtcrime/securesms/registration/PushChallengeRequestTest.java b/app/src/test/java/org/thoughtcrime/securesms/registration/fcm/PushChallengeRequestTest.java similarity index 96% rename from app/src/test/java/org/thoughtcrime/securesms/registration/PushChallengeRequestTest.java rename to app/src/test/java/org/thoughtcrime/securesms/registration/fcm/PushChallengeRequestTest.java index 78ff7f1a2e..8af17977f5 100644 --- a/app/src/test/java/org/thoughtcrime/securesms/registration/PushChallengeRequestTest.java +++ b/app/src/test/java/org/thoughtcrime/securesms/registration/fcm/PushChallengeRequestTest.java @@ -1,4 +1,9 @@ -package org.thoughtcrime.securesms.registration; +/* + * Copyright 2024 Signal Messenger, LLC + * SPDX-License-Identifier: AGPL-3.0-only + */ + +package org.thoughtcrime.securesms.registration.fcm; import android.app.Application; import android.os.AsyncTask;