diff options
Diffstat (limited to 'app/src')
| -rw-r--r-- | app/src/free/java/app/passwordstore/autofill/oreo/ui/AutofillSmsActivity.kt (renamed from app/src/free/java/dev/msfjarvis/aps/autofill/oreo/ui/AutofillSmsActivity.kt) | 2 | ||||
| -rw-r--r-- | app/src/main/AndroidManifest.xml | 54 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/Application.kt (renamed from app/src/main/java/dev/msfjarvis/aps/Application.kt) | 22 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/data/crypto/CryptoRepository.kt (renamed from app/src/main/java/dev/msfjarvis/aps/data/crypto/CryptoRepository.kt) | 8 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/data/password/FieldItem.kt (renamed from app/src/main/java/dev/msfjarvis/aps/data/password/FieldItem.kt) | 4 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/data/password/PasswordItem.kt (renamed from app/src/main/java/dev/msfjarvis/aps/data/password/PasswordItem.kt) | 8 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt (renamed from app/src/main/java/dev/msfjarvis/aps/data/repo/PasswordRepository.kt) | 14 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/injection/context/ContextModule.kt (renamed from app/src/main/java/dev/msfjarvis/aps/injection/context/ContextModule.kt) | 4 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/injection/context/FilesDirPath.kt (renamed from app/src/main/java/dev/msfjarvis/aps/injection/context/FilesDirPath.kt) | 2 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/injection/coroutines/DispatcherModule.kt (renamed from app/src/main/java/dev/msfjarvis/aps/injection/coroutines/DispatcherModule.kt) | 6 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/injection/crypto/CryptoHandlerModule.kt (renamed from app/src/main/java/dev/msfjarvis/aps/injection/crypto/CryptoHandlerModule.kt) | 4 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/injection/crypto/KeyManagerModule.kt (renamed from app/src/main/java/dev/msfjarvis/aps/injection/crypto/KeyManagerModule.kt) | 6 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/injection/prefs/GitPreferences.kt (renamed from app/src/main/java/dev/msfjarvis/aps/injection/prefs/GitPreferences.kt) | 2 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/injection/prefs/PasswordGeneratorPreferences.kt (renamed from app/src/main/java/dev/msfjarvis/aps/injection/prefs/PasswordGeneratorPreferences.kt) | 2 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/injection/prefs/PreferenceModule.kt (renamed from app/src/main/java/dev/msfjarvis/aps/injection/prefs/PreferenceModule.kt) | 4 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/injection/prefs/ProxyPreferences.kt (renamed from app/src/main/java/dev/msfjarvis/aps/injection/prefs/ProxyPreferences.kt) | 2 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/injection/prefs/SettingsPreferences.kt (renamed from app/src/main/java/dev/msfjarvis/aps/injection/prefs/SettingsPreferences.kt) | 2 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/injection/pwgen/DicewareModule.kt (renamed from app/src/main/java/dev/msfjarvis/aps/injection/pwgen/DicewareModule.kt) | 10 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/injection/totp/TotpModule.kt (renamed from app/src/main/java/dev/msfjarvis/aps/injection/totp/TotpModule.kt) | 6 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/adapters/FieldItemAdapter.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/adapters/FieldItemAdapter.kt) | 10 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/adapters/PasswordItemRecyclerAdapter.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/adapters/PasswordItemRecyclerAdapter.kt) | 10 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/autofill/AutofillDecryptActivity.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillDecryptActivity.kt) | 18 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/autofill/AutofillDecryptActivityV2.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillDecryptActivityV2.kt) | 20 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/autofill/AutofillFilterView.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillFilterView.kt) | 34 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/autofill/AutofillPublisherChangedActivity.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillPublisherChangedActivity.kt) | 18 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/autofill/AutofillSaveActivity.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillSaveActivity.kt) | 32 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/autofill/PasswordViewHolder.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/autofill/PasswordViewHolder.kt) | 4 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/crypto/BasePgpActivity.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/crypto/BasePgpActivity.kt) | 26 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/crypto/DecryptActivity.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt) | 18 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/crypto/DecryptActivityV2.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivityV2.kt) | 22 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/crypto/GetKeyIdsActivity.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/crypto/GetKeyIdsActivity.kt) | 2 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/crypto/PasswordCreationActivity.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt) | 40 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/crypto/PasswordCreationActivityV2.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivityV2.kt) | 38 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/crypto/PasswordDialog.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordDialog.kt) | 10 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/dialogs/BasicBottomSheet.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/dialogs/BasicBottomSheet.kt) | 8 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/dialogs/DicewarePasswordGeneratorDialogFragment.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/dialogs/DicewarePasswordGeneratorDialogFragment.kt) | 18 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/dialogs/FolderCreationDialogFragment.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/dialogs/FolderCreationDialogFragment.kt) | 14 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/dialogs/ItemCreationBottomSheet.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/dialogs/ItemCreationBottomSheet.kt) | 12 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/dialogs/OtpImportDialogFragment.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/dialogs/OtpImportDialogFragment.kt) | 6 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/dialogs/PasswordGeneratorDialogFragment.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/dialogs/PasswordGeneratorDialogFragment.kt) | 20 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/folderselect/SelectFolderActivity.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderActivity.kt) | 10 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/folderselect/SelectFolderFragment.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderFragment.kt) | 18 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/git/base/BaseGitActivity.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt) | 30 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/git/config/GitConfigActivity.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt) | 14 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/git/config/GitServerConfigActivity.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt) | 22 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/git/log/GitLogActivity.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogActivity.kt) | 8 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/git/log/GitLogAdapter.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogAdapter.kt) | 8 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/main/LaunchActivity.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/main/LaunchActivity.kt) | 22 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/onboarding/activity/OnboardingActivity.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/onboarding/activity/OnboardingActivity.kt) | 4 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/onboarding/fragments/CloneFragment.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/CloneFragment.kt) | 22 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/onboarding/fragments/KeySelectionFragment.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/KeySelectionFragment.kt) | 24 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/onboarding/fragments/WelcomeFragment.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/WelcomeFragment.kt) | 12 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/passwords/PasswordFragment.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordFragment.kt) | 44 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/passwords/PasswordStore.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt) | 58 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/pgp/PGPKeyImportActivity.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/pgp/PGPKeyImportActivity.kt) | 10 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/proxy/ProxySelectorActivity.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/proxy/ProxySelectorActivity.kt) | 18 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/settings/AutofillSettings.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/settings/AutofillSettings.kt) | 12 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/settings/GeneralSettings.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/settings/GeneralSettings.kt) | 12 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/settings/MiscSettings.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/settings/MiscSettings.kt) | 10 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/settings/PGPSettings.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/settings/PGPSettings.kt) | 8 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/settings/PasswordSettings.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/settings/PasswordSettings.kt) | 6 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/settings/RepositorySettings.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/settings/RepositorySettings.kt) | 36 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/settings/SettingsActivity.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/settings/SettingsActivity.kt) | 8 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/settings/SettingsProvider.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/settings/SettingsProvider.kt) | 2 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/sshkeygen/ShowSshKeyFragment.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/ShowSshKeyFragment.kt) | 6 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/sshkeygen/SshKeyGenActivity.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/SshKeyGenActivity.kt) | 18 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/sshkeygen/SshKeyImportActivity.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/SshKeyImportActivity.kt) | 6 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/ui/util/OnOffItemAnimator.kt (renamed from app/src/main/java/dev/msfjarvis/aps/ui/util/OnOffItemAnimator.kt) | 2 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/auth/BiometricAuthenticator.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/auth/BiometricAuthenticator.kt) | 4 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/autofill/Api30AutofillResponseBuilder.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/autofill/Api30AutofillResponseBuilder.kt) | 18 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/autofill/AutofillMatcher.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillMatcher.kt) | 4 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/autofill/AutofillPreferences.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillPreferences.kt) | 12 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/autofill/AutofillResponseBuilder.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillResponseBuilder.kt) | 18 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/autofill/AutofillViewUtils.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillViewUtils.kt) | 8 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/crypto/GpgIdentifier.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/crypto/GpgIdentifier.kt) | 2 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/extensions/AndroidExtensions.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/extensions/AndroidExtensions.kt) | 10 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/extensions/Extensions.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/extensions/Extensions.kt) | 4 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/extensions/FragmentExtensions.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/extensions/FragmentExtensions.kt) | 4 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/extensions/FragmentViewBindingDelegate.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/extensions/FragmentViewBindingDelegate.kt) | 2 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/features/Feature.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/features/Feature.kt) | 2 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/features/Features.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/features/Features.kt) | 4 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/git/ErrorMessages.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/git/ErrorMessages.kt) | 6 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/git/GitCommandExecutor.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/git/GitCommandExecutor.kt) | 16 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/git/GitCommit.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/git/GitCommit.kt) | 2 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/git/GitLogModel.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/git/GitLogModel.kt) | 12 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/git/operation/BreakOutOfDetached.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/git/operation/BreakOutOfDetached.kt) | 8 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/git/operation/CloneOperation.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/git/operation/CloneOperation.kt) | 4 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/git/operation/CredentialFinder.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/git/operation/CredentialFinder.kt) | 12 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/git/operation/GcOperation.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/git/operation/GcOperation.kt) | 4 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/git/operation/GitOperation.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/git/operation/GitOperation.kt) | 28 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/git/operation/PullOperation.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/git/operation/PullOperation.kt) | 4 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/git/operation/PushOperation.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/git/operation/PushOperation.kt) | 4 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/git/operation/ResetToRemoteOperation.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/git/operation/ResetToRemoteOperation.kt) | 4 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/git/operation/SyncOperation.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/git/operation/SyncOperation.kt) | 4 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/git/sshj/ContinuationContainerActivity.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/git/sshj/ContinuationContainerActivity.kt) | 2 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/git/sshj/OpenKeychainKeyProvider.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainKeyProvider.kt) | 8 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt) | 2 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/git/sshj/SshKey.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshKey.kt) | 16 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/git/sshj/SshjConfig.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshjConfig.kt) | 2 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/git/sshj/SshjSessionFactory.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshjSessionFactory.kt) | 6 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/proxy/ProxyUtils.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/proxy/ProxyUtils.kt) | 4 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/services/ClipboardService.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/services/ClipboardService.kt) | 10 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/services/OreoAutofillService.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/services/OreoAutofillService.kt) | 20 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/services/PasswordExportService.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/services/PasswordExportService.kt) | 6 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/settings/GitSettings.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/settings/GitSettings.kt) | 14 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/settings/Migrations.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt) | 6 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/settings/PasswordSortOrder.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/settings/PasswordSortOrder.kt) | 10 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/settings/PreferenceKeys.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/settings/PreferenceKeys.kt) | 2 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/shortcuts/ShortcutHandler.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/shortcuts/ShortcutHandler.kt) | 6 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/totp/UriTotpFinder.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/totp/UriTotpFinder.kt) | 2 | ||||
| -rw-r--r-- | app/src/main/java/app/passwordstore/util/viewmodel/SearchableRepositoryViewModel.kt (renamed from app/src/main/java/dev/msfjarvis/aps/util/viewmodel/SearchableRepositoryViewModel.kt) | 18 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_git_clone.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_git_config.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_git_log.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_onboarding.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_oreo_autofill_filter.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_oreo_autofill_publisher_changed.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/decrypt_layout.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/password_creation_activity.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/layout/password_recycler_view.xml | 2 | ||||
| -rw-r--r-- | app/src/main/res/menu/pgp_handler_select_folder.xml | 2 | ||||
| -rw-r--r-- | app/src/nonFree/java/app/passwordstore/autofill/oreo/ui/AutofillSmsActivity.kt (renamed from app/src/nonFree/java/dev/msfjarvis/aps/autofill/oreo/ui/AutofillSmsActivity.kt) | 8 | ||||
| -rw-r--r-- | app/src/nonFree/res/layout/activity_oreo_autofill_sms.xml | 2 | ||||
| -rw-r--r-- | app/src/test/java/app/passwordstore/util/crypto/GpgIdentifierTest.kt (renamed from app/src/test/java/dev/msfjarvis/aps/util/crypto/GpgIdentifierTest.kt) | 2 | ||||
| -rw-r--r-- | app/src/test/java/app/passwordstore/util/settings/MigrationsTest.kt (renamed from app/src/test/java/dev/msfjarvis/aps/util/settings/MigrationsTest.kt) | 4 | ||||
| -rw-r--r-- | app/src/test/java/app/passwordstore/util/totp/UriTotpFinderTest.kt (renamed from app/src/test/java/dev/msfjarvis/aps/util/totp/UriTotpFinderTest.kt) | 2 | ||||
| -rw-r--r-- | app/src/test/java/app/passwordstore/util/viewmodel/StrictDomainRegexTest.kt (renamed from app/src/test/java/dev/msfjarvis/aps/util/viewmodel/StrictDomainRegexTest.kt) | 2 |
127 files changed, 683 insertions, 683 deletions
diff --git a/app/src/free/java/dev/msfjarvis/aps/autofill/oreo/ui/AutofillSmsActivity.kt b/app/src/free/java/app/passwordstore/autofill/oreo/ui/AutofillSmsActivity.kt index 0faf3d67..19ebfe55 100644 --- a/app/src/free/java/dev/msfjarvis/aps/autofill/oreo/ui/AutofillSmsActivity.kt +++ b/app/src/free/java/app/passwordstore/autofill/oreo/ui/AutofillSmsActivity.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.autofill.oreo.ui +package app.passwordstore.autofill.oreo.ui import android.content.Context import android.content.IntentSender diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index aed314aa..1d78e734 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,7 +22,7 @@ android:required="false" /> <application - android:name="dev.msfjarvis.aps.Application" + android:name=".Application" android:allowBackup="false" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="@xml/backup_content" @@ -34,26 +34,26 @@ tools:targetApi="s"> <activity - android:name="dev.msfjarvis.aps.ui.passwords.PasswordStore" + android:name=".ui.passwords.PasswordStore" android:configChanges="orientation|screenSize" android:exported="false" /> <activity - android:name="dev.msfjarvis.aps.ui.onboarding.activity.OnboardingActivity" + android:name=".ui.onboarding.activity.OnboardingActivity" android:configChanges="orientation|screenSize" android:exported="false" /> <activity - android:name="dev.msfjarvis.aps.ui.proxy.ProxySelectorActivity" + android:name=".ui.proxy.ProxySelectorActivity" android:exported="false" android:windowSoftInputMode="adjustResize" /> <activity - android:name="dev.msfjarvis.aps.ui.crypto.DecryptActivityV2" + android:name=".ui.crypto.DecryptActivityV2" android:exported="true" /> <activity - android:name="dev.msfjarvis.aps.ui.main.LaunchActivity" + android:name=".ui.main.LaunchActivity" android:configChanges="orientation|screenSize" android:exported="true" android:theme="@style/NoBackgroundThemeM3"> @@ -73,60 +73,60 @@ tools:node="replace" /> <activity - android:name="dev.msfjarvis.aps.ui.git.config.GitServerConfigActivity" + android:name=".ui.git.config.GitServerConfigActivity" android:exported="false" android:label="@string/title_activity_git_clone" android:windowSoftInputMode="adjustResize" /> <activity - android:name="dev.msfjarvis.aps.ui.git.config.GitConfigActivity" + android:name=".ui.git.config.GitConfigActivity" android:exported="false" android:label="@string/title_activity_git_config" android:windowSoftInputMode="adjustResize" /> <activity - android:name="dev.msfjarvis.aps.ui.git.log.GitLogActivity" + android:name=".ui.git.log.GitLogActivity" android:exported="false" android:label="@string/title_activity_git_log" /> <activity - android:name="dev.msfjarvis.aps.ui.settings.SettingsActivity" + android:name=".ui.settings.SettingsActivity" android:exported="false" android:label="@string/action_settings" android:parentActivityName=".ui.passwords.PasswordStore" /> <activity - android:name="dev.msfjarvis.aps.ui.crypto.PasswordCreationActivity" + android:name=".ui.crypto.PasswordCreationActivity" android:exported="false" android:label="@string/new_password_title" android:windowSoftInputMode="adjustResize" /> <activity - android:name="dev.msfjarvis.aps.ui.crypto.PasswordCreationActivityV2" + android:name=".ui.crypto.PasswordCreationActivityV2" android:exported="false" android:label="@string/new_password_title" android:windowSoftInputMode="adjustResize" /> <activity - android:name="dev.msfjarvis.aps.ui.crypto.DecryptActivity" + android:name=".ui.crypto.DecryptActivity" android:exported="false" android:windowSoftInputMode="adjustResize" /> <activity - android:name="dev.msfjarvis.aps.ui.crypto.GetKeyIdsActivity" + android:name=".ui.crypto.GetKeyIdsActivity" android:exported="false" android:theme="@style/NoBackgroundThemeM3" /> <service - android:name="dev.msfjarvis.aps.util.services.ClipboardService" + android:name=".util.services.ClipboardService" android:exported="false" android:process=":clipboard_service_process" /> <service - android:name="dev.msfjarvis.aps.util.services.PasswordExportService" + android:name=".util.services.PasswordExportService" android:exported="false" android:process=":password_export_service_process" /> <service - android:name="dev.msfjarvis.aps.util.services.OreoAutofillService" + android:name=".util.services.OreoAutofillService" android:exported="true" android:permission="android.permission.BIND_AUTOFILL_SERVICE"> <intent-filter> @@ -138,50 +138,50 @@ </service> <activity - android:name="dev.msfjarvis.aps.ui.folderselect.SelectFolderActivity" + android:name=".ui.folderselect.SelectFolderActivity" android:exported="false" /> <activity - android:name="dev.msfjarvis.aps.ui.sshkeygen.SshKeyImportActivity" + android:name=".ui.sshkeygen.SshKeyImportActivity" android:exported="false" android:theme="@style/NoBackgroundThemeM3" android:windowSoftInputMode="adjustResize" /> <activity - android:name="dev.msfjarvis.aps.ui.sshkeygen.SshKeyGenActivity" + android:name=".ui.sshkeygen.SshKeyGenActivity" android:exported="false" android:label="@string/pref_ssh_keygen_title" android:windowSoftInputMode="adjustResize" /> <activity - android:name="dev.msfjarvis.aps.ui.autofill.AutofillDecryptActivity" + android:name=".ui.autofill.AutofillDecryptActivity" android:exported="false" android:theme="@style/NoBackgroundThemeM3" /> <activity - android:name="dev.msfjarvis.aps.ui.autofill.AutofillDecryptActivityV2" + android:name=".ui.autofill.AutofillDecryptActivityV2" android:exported="false" android:theme="@style/NoBackgroundThemeM3" /> <activity - android:name="dev.msfjarvis.aps.ui.autofill.AutofillFilterView" + android:name=".ui.autofill.AutofillFilterView" android:configChanges="orientation|keyboardHidden" android:exported="false" android:theme="@style/DialogLikeThemeM3" android:windowSoftInputMode="adjustNothing" /> <activity - android:name="dev.msfjarvis.aps.ui.autofill.AutofillSaveActivity" + android:name=".ui.autofill.AutofillSaveActivity" android:exported="false" android:theme="@style/NoBackgroundThemeM3" /> <activity - android:name="dev.msfjarvis.aps.autofill.oreo.ui.AutofillSmsActivity" + android:name=".autofill.oreo.ui.AutofillSmsActivity" android:configChanges="orientation" android:exported="false" android:theme="@style/DialogLikeThemeM3" android:windowSoftInputMode="adjustNothing" /> <activity - android:name="dev.msfjarvis.aps.ui.autofill.AutofillPublisherChangedActivity" + android:name=".ui.autofill.AutofillPublisherChangedActivity" android:configChanges="orientation|keyboardHidden" android:exported="false" android:theme="@style/DialogLikeThemeM3" android:windowSoftInputMode="adjustNothing" /> <activity - android:name="dev.msfjarvis.aps.ui.pgp.PGPKeyImportActivity" + android:name=".ui.pgp.PGPKeyImportActivity" android:theme="@style/NoBackgroundThemeM3" /> </application> diff --git a/app/src/main/java/dev/msfjarvis/aps/Application.kt b/app/src/main/java/app/passwordstore/Application.kt index 6aa6e53b..05bffbfb 100644 --- a/app/src/main/java/dev/msfjarvis/aps/Application.kt +++ b/app/src/main/java/app/passwordstore/Application.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps +package app.passwordstore import android.content.SharedPreferences import androidx.appcompat.app.AppCompatDelegate @@ -10,18 +10,18 @@ import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_AUTO_BATTERY import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_NO import androidx.appcompat.app.AppCompatDelegate.MODE_NIGHT_YES +import app.passwordstore.injection.context.FilesDirPath +import app.passwordstore.injection.prefs.SettingsPreferences +import app.passwordstore.util.extensions.getString +import app.passwordstore.util.features.Feature +import app.passwordstore.util.features.Features +import app.passwordstore.util.git.sshj.setUpBouncyCastleForSshj +import app.passwordstore.util.proxy.ProxyUtils +import app.passwordstore.util.settings.GitSettings +import app.passwordstore.util.settings.PreferenceKeys +import app.passwordstore.util.settings.runMigrations import com.google.android.material.color.DynamicColors import dagger.hilt.android.HiltAndroidApp -import dev.msfjarvis.aps.injection.context.FilesDirPath -import dev.msfjarvis.aps.injection.prefs.SettingsPreferences -import dev.msfjarvis.aps.util.extensions.getString -import dev.msfjarvis.aps.util.features.Feature -import dev.msfjarvis.aps.util.features.Features -import dev.msfjarvis.aps.util.git.sshj.setUpBouncyCastleForSshj -import dev.msfjarvis.aps.util.proxy.ProxyUtils -import dev.msfjarvis.aps.util.settings.GitSettings -import dev.msfjarvis.aps.util.settings.PreferenceKeys -import dev.msfjarvis.aps.util.settings.runMigrations import io.sentry.Sentry import io.sentry.protocol.User import javax.inject.Inject diff --git a/app/src/main/java/dev/msfjarvis/aps/data/crypto/CryptoRepository.kt b/app/src/main/java/app/passwordstore/data/crypto/CryptoRepository.kt index 0e262e7a..6c214fd1 100644 --- a/app/src/main/java/dev/msfjarvis/aps/data/crypto/CryptoRepository.kt +++ b/app/src/main/java/app/passwordstore/data/crypto/CryptoRepository.kt @@ -3,12 +3,12 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.data.crypto +package app.passwordstore.data.crypto +import app.passwordstore.crypto.PGPKeyManager +import app.passwordstore.crypto.PGPainlessCryptoHandler +import app.passwordstore.util.extensions.isOk import com.github.michaelbull.result.unwrap -import dev.msfjarvis.aps.crypto.PGPKeyManager -import dev.msfjarvis.aps.crypto.PGPainlessCryptoHandler -import dev.msfjarvis.aps.util.extensions.isOk import java.io.ByteArrayInputStream import java.io.ByteArrayOutputStream import javax.inject.Inject diff --git a/app/src/main/java/dev/msfjarvis/aps/data/password/FieldItem.kt b/app/src/main/java/app/passwordstore/data/password/FieldItem.kt index e7c88ef1..49ed4c82 100644 --- a/app/src/main/java/dev/msfjarvis/aps/data/password/FieldItem.kt +++ b/app/src/main/java/app/passwordstore/data/password/FieldItem.kt @@ -3,9 +3,9 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.data.password +package app.passwordstore.data.password -import dev.msfjarvis.aps.data.passfile.Totp +import app.passwordstore.data.passfile.Totp import kotlin.time.ExperimentalTime @OptIn(ExperimentalTime::class) diff --git a/app/src/main/java/dev/msfjarvis/aps/data/password/PasswordItem.kt b/app/src/main/java/app/passwordstore/data/password/PasswordItem.kt index 82b0dc35..77497671 100644 --- a/app/src/main/java/dev/msfjarvis/aps/data/password/PasswordItem.kt +++ b/app/src/main/java/app/passwordstore/data/password/PasswordItem.kt @@ -2,13 +2,13 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.data.password +package app.passwordstore.data.password import android.content.Context import android.content.Intent -import dev.msfjarvis.aps.data.repo.PasswordRepository -import dev.msfjarvis.aps.ui.crypto.BasePgpActivity -import dev.msfjarvis.aps.ui.main.LaunchActivity +import app.passwordstore.data.repo.PasswordRepository +import app.passwordstore.ui.crypto.BasePgpActivity +import app.passwordstore.ui.main.LaunchActivity import java.io.File data class PasswordItem( diff --git a/app/src/main/java/dev/msfjarvis/aps/data/repo/PasswordRepository.kt b/app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt index f675e80a..b42b7892 100644 --- a/app/src/main/java/dev/msfjarvis/aps/data/repo/PasswordRepository.kt +++ b/app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt @@ -2,18 +2,18 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.data.repo +package app.passwordstore.data.repo import androidx.core.content.edit +import app.passwordstore.Application +import app.passwordstore.data.password.PasswordItem +import app.passwordstore.util.extensions.sharedPrefs +import app.passwordstore.util.extensions.unsafeLazy +import app.passwordstore.util.settings.PasswordSortOrder +import app.passwordstore.util.settings.PreferenceKeys import com.github.michaelbull.result.getOrElse import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.runCatching -import dev.msfjarvis.aps.Application -import dev.msfjarvis.aps.data.password.PasswordItem -import dev.msfjarvis.aps.util.extensions.sharedPrefs -import dev.msfjarvis.aps.util.extensions.unsafeLazy -import dev.msfjarvis.aps.util.settings.PasswordSortOrder -import dev.msfjarvis.aps.util.settings.PreferenceKeys import java.io.File import org.eclipse.jgit.api.Git import org.eclipse.jgit.lib.Repository diff --git a/app/src/main/java/dev/msfjarvis/aps/injection/context/ContextModule.kt b/app/src/main/java/app/passwordstore/injection/context/ContextModule.kt index 41e59bf9..d8f28494 100644 --- a/app/src/main/java/dev/msfjarvis/aps/injection/context/ContextModule.kt +++ b/app/src/main/java/app/passwordstore/injection/context/ContextModule.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.aps.injection.context +package app.passwordstore.injection.context import android.content.Context import dagger.Module @@ -13,7 +13,7 @@ class ContextModule { /** * We inject [Context.getFilesDir] to break the dependency on [Context], allowing tests to run on - * the JVM. The principle here is identical to why [dev.msfjarvis.aps.util.totp.TotpFinder] + * the JVM. The principle here is identical to why [app.passwordstore.util.totp.TotpFinder] * exists. * * @param context [ApplicationContext] diff --git a/app/src/main/java/dev/msfjarvis/aps/injection/context/FilesDirPath.kt b/app/src/main/java/app/passwordstore/injection/context/FilesDirPath.kt index f6419354..15da4edb 100644 --- a/app/src/main/java/dev/msfjarvis/aps/injection/context/FilesDirPath.kt +++ b/app/src/main/java/app/passwordstore/injection/context/FilesDirPath.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.aps.injection.context +package app.passwordstore.injection.context import android.content.Context import javax.inject.Qualifier diff --git a/app/src/main/java/dev/msfjarvis/aps/injection/coroutines/DispatcherModule.kt b/app/src/main/java/app/passwordstore/injection/coroutines/DispatcherModule.kt index bf84fc27..3539845f 100644 --- a/app/src/main/java/dev/msfjarvis/aps/injection/coroutines/DispatcherModule.kt +++ b/app/src/main/java/app/passwordstore/injection/coroutines/DispatcherModule.kt @@ -3,14 +3,14 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.injection.coroutines +package app.passwordstore.injection.coroutines +import app.passwordstore.util.coroutines.DefaultDispatcherProvider +import app.passwordstore.util.coroutines.DispatcherProvider import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import dev.msfjarvis.aps.util.coroutines.DefaultDispatcherProvider -import dev.msfjarvis.aps.util.coroutines.DispatcherProvider @Module @InstallIn(SingletonComponent::class) diff --git a/app/src/main/java/dev/msfjarvis/aps/injection/crypto/CryptoHandlerModule.kt b/app/src/main/java/app/passwordstore/injection/crypto/CryptoHandlerModule.kt index ef6a11ce..5a863d8d 100644 --- a/app/src/main/java/dev/msfjarvis/aps/injection/crypto/CryptoHandlerModule.kt +++ b/app/src/main/java/app/passwordstore/injection/crypto/CryptoHandlerModule.kt @@ -3,13 +3,13 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.injection.crypto +package app.passwordstore.injection.crypto +import app.passwordstore.crypto.PGPainlessCryptoHandler import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.components.SingletonComponent -import dev.msfjarvis.aps.crypto.PGPainlessCryptoHandler @Module @InstallIn(SingletonComponent::class) diff --git a/app/src/main/java/dev/msfjarvis/aps/injection/crypto/KeyManagerModule.kt b/app/src/main/java/app/passwordstore/injection/crypto/KeyManagerModule.kt index a1119a1c..69174394 100644 --- a/app/src/main/java/dev/msfjarvis/aps/injection/crypto/KeyManagerModule.kt +++ b/app/src/main/java/app/passwordstore/injection/crypto/KeyManagerModule.kt @@ -3,16 +3,16 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.injection.crypto +package app.passwordstore.injection.crypto import android.content.Context +import app.passwordstore.crypto.PGPKeyManager +import app.passwordstore.util.coroutines.DispatcherProvider import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import dev.msfjarvis.aps.crypto.PGPKeyManager -import dev.msfjarvis.aps.util.coroutines.DispatcherProvider import javax.inject.Qualifier @Module diff --git a/app/src/main/java/dev/msfjarvis/aps/injection/prefs/GitPreferences.kt b/app/src/main/java/app/passwordstore/injection/prefs/GitPreferences.kt index 2947a64d..c1bf271c 100644 --- a/app/src/main/java/dev/msfjarvis/aps/injection/prefs/GitPreferences.kt +++ b/app/src/main/java/app/passwordstore/injection/prefs/GitPreferences.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.aps.injection.prefs +package app.passwordstore.injection.prefs import android.content.SharedPreferences import javax.inject.Qualifier diff --git a/app/src/main/java/dev/msfjarvis/aps/injection/prefs/PasswordGeneratorPreferences.kt b/app/src/main/java/app/passwordstore/injection/prefs/PasswordGeneratorPreferences.kt index 14b3a6f2..832c3f04 100644 --- a/app/src/main/java/dev/msfjarvis/aps/injection/prefs/PasswordGeneratorPreferences.kt +++ b/app/src/main/java/app/passwordstore/injection/prefs/PasswordGeneratorPreferences.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.injection.prefs +package app.passwordstore.injection.prefs import javax.inject.Qualifier diff --git a/app/src/main/java/dev/msfjarvis/aps/injection/prefs/PreferenceModule.kt b/app/src/main/java/app/passwordstore/injection/prefs/PreferenceModule.kt index e68a998f..072bf031 100644 --- a/app/src/main/java/dev/msfjarvis/aps/injection/prefs/PreferenceModule.kt +++ b/app/src/main/java/app/passwordstore/injection/prefs/PreferenceModule.kt @@ -1,17 +1,17 @@ -package dev.msfjarvis.aps.injection.prefs +package app.passwordstore.injection.prefs import android.content.Context import android.content.Context.MODE_PRIVATE import android.content.SharedPreferences import androidx.security.crypto.EncryptedSharedPreferences import androidx.security.crypto.MasterKey +import app.passwordstore.BuildConfig import dagger.Module import dagger.Provides import dagger.Reusable import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import dev.msfjarvis.aps.BuildConfig @Module @InstallIn(SingletonComponent::class) diff --git a/app/src/main/java/dev/msfjarvis/aps/injection/prefs/ProxyPreferences.kt b/app/src/main/java/app/passwordstore/injection/prefs/ProxyPreferences.kt index 5fa99140..cedb9a29 100644 --- a/app/src/main/java/dev/msfjarvis/aps/injection/prefs/ProxyPreferences.kt +++ b/app/src/main/java/app/passwordstore/injection/prefs/ProxyPreferences.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.aps.injection.prefs +package app.passwordstore.injection.prefs import android.content.SharedPreferences import javax.inject.Qualifier diff --git a/app/src/main/java/dev/msfjarvis/aps/injection/prefs/SettingsPreferences.kt b/app/src/main/java/app/passwordstore/injection/prefs/SettingsPreferences.kt index 7bca03c8..aeeec8eb 100644 --- a/app/src/main/java/dev/msfjarvis/aps/injection/prefs/SettingsPreferences.kt +++ b/app/src/main/java/app/passwordstore/injection/prefs/SettingsPreferences.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.aps.injection.prefs +package app.passwordstore.injection.prefs import javax.inject.Qualifier diff --git a/app/src/main/java/dev/msfjarvis/aps/injection/pwgen/DicewareModule.kt b/app/src/main/java/app/passwordstore/injection/pwgen/DicewareModule.kt index 8aed12de..78bad768 100644 --- a/app/src/main/java/dev/msfjarvis/aps/injection/pwgen/DicewareModule.kt +++ b/app/src/main/java/app/passwordstore/injection/pwgen/DicewareModule.kt @@ -3,17 +3,17 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.injection.pwgen +package app.passwordstore.injection.pwgen import android.content.Context +import app.passwordstore.passgen.diceware.DicewarePassphraseGenerator +import app.passwordstore.passgen.diceware.Die +import app.passwordstore.passgen.diceware.RandomIntGenerator import dagger.Module import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.components.FragmentComponent import dagger.hilt.android.qualifiers.ApplicationContext -import dev.msfjarvis.aps.passgen.diceware.DicewarePassphraseGenerator -import dev.msfjarvis.aps.passgen.diceware.Die -import dev.msfjarvis.aps.passgen.diceware.RandomIntGenerator import java.io.InputStream import java.security.SecureRandom import javax.inject.Qualifier @@ -47,7 +47,7 @@ object DicewareModule { @[Provides WordlistQualifier] fun provideDefaultWordList(@ApplicationContext context: Context): InputStream { return context.resources.openRawResource( - dev.msfjarvis.aps.passgen.diceware.R.raw.diceware_wordlist + app.passwordstore.passgen.diceware.R.raw.diceware_wordlist ) } } diff --git a/app/src/main/java/dev/msfjarvis/aps/injection/totp/TotpModule.kt b/app/src/main/java/app/passwordstore/injection/totp/TotpModule.kt index 859559cd..ed9435ed 100644 --- a/app/src/main/java/dev/msfjarvis/aps/injection/totp/TotpModule.kt +++ b/app/src/main/java/app/passwordstore/injection/totp/TotpModule.kt @@ -3,14 +3,14 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.injection.totp +package app.passwordstore.injection.totp +import app.passwordstore.util.totp.TotpFinder +import app.passwordstore.util.totp.UriTotpFinder import dagger.Binds import dagger.Module import dagger.hilt.InstallIn import dagger.hilt.android.components.ActivityComponent -import dev.msfjarvis.aps.util.totp.TotpFinder -import dev.msfjarvis.aps.util.totp.UriTotpFinder @Module @InstallIn(ActivityComponent::class) diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/adapters/FieldItemAdapter.kt b/app/src/main/java/app/passwordstore/ui/adapters/FieldItemAdapter.kt index ea96f961..590bb5c2 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/adapters/FieldItemAdapter.kt +++ b/app/src/main/java/app/passwordstore/ui/adapters/FieldItemAdapter.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.adapters +package app.passwordstore.ui.adapters import android.text.method.PasswordTransformationMethod import android.view.LayoutInflater @@ -11,11 +11,11 @@ import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat import androidx.recyclerview.widget.RecyclerView +import app.passwordstore.R +import app.passwordstore.data.passfile.Totp +import app.passwordstore.data.password.FieldItem +import app.passwordstore.databinding.ItemFieldBinding import com.google.android.material.textfield.TextInputLayout -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.passfile.Totp -import dev.msfjarvis.aps.data.password.FieldItem -import dev.msfjarvis.aps.databinding.ItemFieldBinding class FieldItemAdapter( private var fieldItemList: List<FieldItem>, diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/adapters/PasswordItemRecyclerAdapter.kt b/app/src/main/java/app/passwordstore/ui/adapters/PasswordItemRecyclerAdapter.kt index be0267c4..cb5409c5 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/adapters/PasswordItemRecyclerAdapter.kt +++ b/app/src/main/java/app/passwordstore/ui/adapters/PasswordItemRecyclerAdapter.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.adapters +package app.passwordstore.ui.adapters import android.text.SpannableString import android.text.style.RelativeSizeSpan @@ -13,10 +13,10 @@ import androidx.appcompat.widget.AppCompatTextView import androidx.recyclerview.selection.ItemDetailsLookup import androidx.recyclerview.selection.Selection import androidx.recyclerview.widget.RecyclerView -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.password.PasswordItem -import dev.msfjarvis.aps.util.viewmodel.SearchableRepositoryAdapter -import dev.msfjarvis.aps.util.viewmodel.stableId +import app.passwordstore.R +import app.passwordstore.data.password.PasswordItem +import app.passwordstore.util.viewmodel.SearchableRepositoryAdapter +import app.passwordstore.util.viewmodel.stableId import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillDecryptActivity.kt b/app/src/main/java/app/passwordstore/ui/autofill/AutofillDecryptActivity.kt index b5052049..1017d3a9 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillDecryptActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/autofill/AutofillDecryptActivity.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.autofill +package app.passwordstore.ui.autofill import android.app.PendingIntent import android.content.Context @@ -17,6 +17,12 @@ import androidx.activity.result.contract.ActivityResultContracts.StartIntentSend import androidx.annotation.RequiresApi import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope +import app.passwordstore.data.passfile.PasswordEntry +import app.passwordstore.util.autofill.AutofillPreferences +import app.passwordstore.util.autofill.AutofillResponseBuilder +import app.passwordstore.util.autofill.DirectoryStructure +import app.passwordstore.util.extensions.OPENPGP_PROVIDER +import app.passwordstore.util.extensions.asLog import com.github.androidpasswordstore.autofillparser.AutofillAction import com.github.androidpasswordstore.autofillparser.Credentials import com.github.michaelbull.result.getOrElse @@ -24,12 +30,6 @@ import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.onSuccess import com.github.michaelbull.result.runCatching import dagger.hilt.android.AndroidEntryPoint -import dev.msfjarvis.aps.data.passfile.PasswordEntry -import dev.msfjarvis.aps.util.autofill.AutofillPreferences -import dev.msfjarvis.aps.util.autofill.AutofillResponseBuilder -import dev.msfjarvis.aps.util.autofill.DirectoryStructure -import dev.msfjarvis.aps.util.extensions.OPENPGP_PROVIDER -import dev.msfjarvis.aps.util.extensions.asLog import java.io.ByteArrayOutputStream import java.io.File import java.io.InputStream @@ -55,8 +55,8 @@ class AutofillDecryptActivity : AppCompatActivity() { companion object { - private const val EXTRA_FILE_PATH = "dev.msfjarvis.aps.autofill.oreo.EXTRA_FILE_PATH" - private const val EXTRA_SEARCH_ACTION = "dev.msfjarvis.aps.autofill.oreo.EXTRA_SEARCH_ACTION" + private const val EXTRA_FILE_PATH = "app.passwordstore.autofill.oreo.EXTRA_FILE_PATH" + private const val EXTRA_SEARCH_ACTION = "app.passwordstore.autofill.oreo.EXTRA_SEARCH_ACTION" private var decryptFileRequestCode = 1 diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillDecryptActivityV2.kt b/app/src/main/java/app/passwordstore/ui/autofill/AutofillDecryptActivityV2.kt index 4fd8f026..35d6ca44 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillDecryptActivityV2.kt +++ b/app/src/main/java/app/passwordstore/ui/autofill/AutofillDecryptActivityV2.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.autofill +package app.passwordstore.ui.autofill import android.app.PendingIntent import android.content.Context @@ -14,6 +14,13 @@ import android.view.autofill.AutofillManager import androidx.annotation.RequiresApi import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope +import app.passwordstore.data.crypto.CryptoRepository +import app.passwordstore.data.passfile.PasswordEntry +import app.passwordstore.ui.crypto.PasswordDialog +import app.passwordstore.util.autofill.AutofillPreferences +import app.passwordstore.util.autofill.AutofillResponseBuilder +import app.passwordstore.util.autofill.DirectoryStructure +import app.passwordstore.util.extensions.asLog import com.github.androidpasswordstore.autofillparser.AutofillAction import com.github.androidpasswordstore.autofillparser.Credentials import com.github.michaelbull.result.getOrElse @@ -21,13 +28,6 @@ import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.onSuccess import com.github.michaelbull.result.runCatching import dagger.hilt.android.AndroidEntryPoint -import dev.msfjarvis.aps.data.crypto.CryptoRepository -import dev.msfjarvis.aps.data.passfile.PasswordEntry -import dev.msfjarvis.aps.ui.crypto.PasswordDialog -import dev.msfjarvis.aps.util.autofill.AutofillPreferences -import dev.msfjarvis.aps.util.autofill.AutofillResponseBuilder -import dev.msfjarvis.aps.util.autofill.DirectoryStructure -import dev.msfjarvis.aps.util.extensions.asLog import java.io.ByteArrayOutputStream import java.io.File import javax.inject.Inject @@ -44,8 +44,8 @@ class AutofillDecryptActivityV2 : AppCompatActivity() { companion object { - private const val EXTRA_FILE_PATH = "dev.msfjarvis.aps.autofill.oreo.EXTRA_FILE_PATH" - private const val EXTRA_SEARCH_ACTION = "dev.msfjarvis.aps.autofill.oreo.EXTRA_SEARCH_ACTION" + private const val EXTRA_FILE_PATH = "app.passwordstore.autofill.oreo.EXTRA_FILE_PATH" + private const val EXTRA_SEARCH_ACTION = "app.passwordstore.autofill.oreo.EXTRA_SEARCH_ACTION" private var decryptFileRequestCode = 1 diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillFilterView.kt b/app/src/main/java/app/passwordstore/ui/autofill/AutofillFilterView.kt index 89f1a733..869904c1 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillFilterView.kt +++ b/app/src/main/java/app/passwordstore/ui/autofill/AutofillFilterView.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.autofill +package app.passwordstore.ui.autofill import android.annotation.TargetApi import android.app.PendingIntent @@ -24,22 +24,22 @@ import androidx.core.widget.addTextChangedListener import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager +import app.passwordstore.R +import app.passwordstore.data.password.PasswordItem +import app.passwordstore.databinding.ActivityOreoAutofillFilterBinding +import app.passwordstore.util.autofill.AutofillMatcher +import app.passwordstore.util.autofill.AutofillPreferences +import app.passwordstore.util.autofill.DirectoryStructure +import app.passwordstore.util.extensions.viewBinding +import app.passwordstore.util.features.Feature +import app.passwordstore.util.features.Features +import app.passwordstore.util.viewmodel.FilterMode +import app.passwordstore.util.viewmodel.ListMode +import app.passwordstore.util.viewmodel.SearchMode +import app.passwordstore.util.viewmodel.SearchableRepositoryAdapter +import app.passwordstore.util.viewmodel.SearchableRepositoryViewModel import com.github.androidpasswordstore.autofillparser.FormOrigin import dagger.hilt.android.AndroidEntryPoint -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.password.PasswordItem -import dev.msfjarvis.aps.databinding.ActivityOreoAutofillFilterBinding -import dev.msfjarvis.aps.util.autofill.AutofillMatcher -import dev.msfjarvis.aps.util.autofill.AutofillPreferences -import dev.msfjarvis.aps.util.autofill.DirectoryStructure -import dev.msfjarvis.aps.util.extensions.viewBinding -import dev.msfjarvis.aps.util.features.Feature -import dev.msfjarvis.aps.util.features.Features -import dev.msfjarvis.aps.util.viewmodel.FilterMode -import dev.msfjarvis.aps.util.viewmodel.ListMode -import dev.msfjarvis.aps.util.viewmodel.SearchMode -import dev.msfjarvis.aps.util.viewmodel.SearchableRepositoryAdapter -import dev.msfjarvis.aps.util.viewmodel.SearchableRepositoryViewModel import javax.inject.Inject import logcat.LogPriority.ERROR import logcat.logcat @@ -54,9 +54,9 @@ class AutofillFilterView : AppCompatActivity() { private const val WIDTH_PERCENTAGE = 0.75 private const val EXTRA_FORM_ORIGIN_WEB = - "dev.msfjarvis.aps.autofill.oreo.ui.EXTRA_FORM_ORIGIN_WEB" + "app.passwordstore.autofill.oreo.ui.EXTRA_FORM_ORIGIN_WEB" private const val EXTRA_FORM_ORIGIN_APP = - "dev.msfjarvis.aps.autofill.oreo.ui.EXTRA_FORM_ORIGIN_APP" + "app.passwordstore.autofill.oreo.ui.EXTRA_FORM_ORIGIN_APP" private var matchAndDecryptFileRequestCode = 1 fun makeMatchAndDecryptFileIntentSender( diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillPublisherChangedActivity.kt b/app/src/main/java/app/passwordstore/ui/autofill/AutofillPublisherChangedActivity.kt index 85911815..dd54b8eb 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillPublisherChangedActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/autofill/AutofillPublisherChangedActivity.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.autofill +package app.passwordstore.ui.autofill import android.annotation.TargetApi import android.app.PendingIntent @@ -17,16 +17,16 @@ import android.text.format.DateUtils import android.view.View import android.view.autofill.AutofillManager import androidx.appcompat.app.AppCompatActivity +import app.passwordstore.R +import app.passwordstore.databinding.ActivityOreoAutofillPublisherChangedBinding +import app.passwordstore.util.autofill.AutofillMatcher +import app.passwordstore.util.autofill.AutofillPublisherChangedException +import app.passwordstore.util.extensions.asLog +import app.passwordstore.util.extensions.viewBinding import com.github.androidpasswordstore.autofillparser.FormOrigin import com.github.androidpasswordstore.autofillparser.computeCertificatesHash import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.runCatching -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.databinding.ActivityOreoAutofillPublisherChangedBinding -import dev.msfjarvis.aps.util.autofill.AutofillMatcher -import dev.msfjarvis.aps.util.autofill.AutofillPublisherChangedException -import dev.msfjarvis.aps.util.extensions.asLog -import dev.msfjarvis.aps.util.extensions.viewBinding import logcat.LogPriority.ERROR import logcat.logcat @@ -35,9 +35,9 @@ class AutofillPublisherChangedActivity : AppCompatActivity() { companion object { - private const val EXTRA_APP_PACKAGE = "dev.msfjarvis.aps.autofill.oreo.ui.EXTRA_APP_PACKAGE" + private const val EXTRA_APP_PACKAGE = "app.passwordstore.autofill.oreo.ui.EXTRA_APP_PACKAGE" private const val EXTRA_FILL_RESPONSE_AFTER_RESET = - "dev.msfjarvis.aps.autofill.oreo.ui.EXTRA_FILL_RESPONSE_AFTER_RESET" + "app.passwordstore.autofill.oreo.ui.EXTRA_FILL_RESPONSE_AFTER_RESET" private var publisherChangedRequestCode = 1 fun makePublisherChangedIntentSender( diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillSaveActivity.kt b/app/src/main/java/app/passwordstore/ui/autofill/AutofillSaveActivity.kt index a963836e..d5cb7e1c 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillSaveActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/autofill/AutofillSaveActivity.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.autofill +package app.passwordstore.ui.autofill import android.app.PendingIntent import android.content.Context @@ -14,19 +14,19 @@ import androidx.activity.result.contract.ActivityResultContracts.StartActivityFo import androidx.annotation.RequiresApi import androidx.appcompat.app.AppCompatActivity import androidx.core.os.bundleOf +import app.passwordstore.data.repo.PasswordRepository +import app.passwordstore.ui.crypto.PasswordCreationActivity +import app.passwordstore.ui.crypto.PasswordCreationActivityV2 +import app.passwordstore.util.autofill.AutofillMatcher +import app.passwordstore.util.autofill.AutofillPreferences +import app.passwordstore.util.autofill.AutofillResponseBuilder +import app.passwordstore.util.extensions.unsafeLazy +import app.passwordstore.util.features.Feature +import app.passwordstore.util.features.Features import com.github.androidpasswordstore.autofillparser.AutofillAction import com.github.androidpasswordstore.autofillparser.Credentials import com.github.androidpasswordstore.autofillparser.FormOrigin import dagger.hilt.android.AndroidEntryPoint -import dev.msfjarvis.aps.data.repo.PasswordRepository -import dev.msfjarvis.aps.ui.crypto.PasswordCreationActivity -import dev.msfjarvis.aps.ui.crypto.PasswordCreationActivityV2 -import dev.msfjarvis.aps.util.autofill.AutofillMatcher -import dev.msfjarvis.aps.util.autofill.AutofillPreferences -import dev.msfjarvis.aps.util.autofill.AutofillResponseBuilder -import dev.msfjarvis.aps.util.extensions.unsafeLazy -import dev.msfjarvis.aps.util.features.Feature -import dev.msfjarvis.aps.util.features.Features import java.io.File import javax.inject.Inject import logcat.LogPriority.ERROR @@ -38,15 +38,15 @@ class AutofillSaveActivity : AppCompatActivity() { companion object { - private const val EXTRA_FOLDER_NAME = "dev.msfjarvis.aps.autofill.oreo.ui.EXTRA_FOLDER_NAME" - private const val EXTRA_PASSWORD = "dev.msfjarvis.aps.autofill.oreo.ui.EXTRA_PASSWORD" - private const val EXTRA_NAME = "dev.msfjarvis.aps.autofill.oreo.ui.EXTRA_NAME" + private const val EXTRA_FOLDER_NAME = "app.passwordstore.autofill.oreo.ui.EXTRA_FOLDER_NAME" + private const val EXTRA_PASSWORD = "app.passwordstore.autofill.oreo.ui.EXTRA_PASSWORD" + private const val EXTRA_NAME = "app.passwordstore.autofill.oreo.ui.EXTRA_NAME" private const val EXTRA_SHOULD_MATCH_APP = - "dev.msfjarvis.aps.autofill.oreo.ui.EXTRA_SHOULD_MATCH_APP" + "app.passwordstore.autofill.oreo.ui.EXTRA_SHOULD_MATCH_APP" private const val EXTRA_SHOULD_MATCH_WEB = - "dev.msfjarvis.aps.autofill.oreo.ui.EXTRA_SHOULD_MATCH_WEB" + "app.passwordstore.autofill.oreo.ui.EXTRA_SHOULD_MATCH_WEB" private const val EXTRA_GENERATE_PASSWORD = - "dev.msfjarvis.aps.autofill.oreo.ui.EXTRA_GENERATE_PASSWORD" + "app.passwordstore.autofill.oreo.ui.EXTRA_GENERATE_PASSWORD" private var saveRequestCode = 1 diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/PasswordViewHolder.kt b/app/src/main/java/app/passwordstore/ui/autofill/PasswordViewHolder.kt index eacd49c3..fdfa0eb0 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/autofill/PasswordViewHolder.kt +++ b/app/src/main/java/app/passwordstore/ui/autofill/PasswordViewHolder.kt @@ -2,12 +2,12 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.autofill +package app.passwordstore.ui.autofill import android.view.View import android.widget.TextView import androidx.recyclerview.widget.RecyclerView -import dev.msfjarvis.aps.R +import app.passwordstore.R class PasswordViewHolder(view: View) : RecyclerView.ViewHolder(view) { diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/BasePgpActivity.kt b/app/src/main/java/app/passwordstore/ui/crypto/BasePgpActivity.kt index 758a927d..8e97b876 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/BasePgpActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/crypto/BasePgpActivity.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.crypto +package app.passwordstore.ui.crypto import android.app.PendingIntent import android.content.ClipData @@ -17,23 +17,23 @@ import android.view.WindowManager import androidx.annotation.CallSuper import androidx.annotation.StringRes import androidx.appcompat.app.AppCompatActivity +import app.passwordstore.R +import app.passwordstore.injection.prefs.SettingsPreferences +import app.passwordstore.util.extensions.OPENPGP_PROVIDER +import app.passwordstore.util.extensions.asLog +import app.passwordstore.util.extensions.clipboard +import app.passwordstore.util.extensions.getString +import app.passwordstore.util.extensions.snackbar +import app.passwordstore.util.extensions.unsafeLazy +import app.passwordstore.util.features.Feature +import app.passwordstore.util.features.Features +import app.passwordstore.util.services.ClipboardService +import app.passwordstore.util.settings.PreferenceKeys import com.github.michaelbull.result.getOr import com.github.michaelbull.result.runCatching import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.snackbar.Snackbar import dagger.hilt.android.AndroidEntryPoint -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.injection.prefs.SettingsPreferences -import dev.msfjarvis.aps.util.extensions.OPENPGP_PROVIDER -import dev.msfjarvis.aps.util.extensions.asLog -import dev.msfjarvis.aps.util.extensions.clipboard -import dev.msfjarvis.aps.util.extensions.getString -import dev.msfjarvis.aps.util.extensions.snackbar -import dev.msfjarvis.aps.util.extensions.unsafeLazy -import dev.msfjarvis.aps.util.features.Feature -import dev.msfjarvis.aps.util.features.Features -import dev.msfjarvis.aps.util.services.ClipboardService -import dev.msfjarvis.aps.util.settings.PreferenceKeys import java.io.File import javax.inject.Inject import logcat.LogPriority.ERROR diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt b/app/src/main/java/app/passwordstore/ui/crypto/DecryptActivity.kt index af9a4ddd..f3fac1f2 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/crypto/DecryptActivity.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.crypto +package app.passwordstore.ui.crypto import android.content.Intent import android.os.Bundle @@ -12,17 +12,17 @@ import android.view.MenuItem import androidx.activity.result.IntentSenderRequest import androidx.activity.result.contract.ActivityResultContracts.StartIntentSenderForResult import androidx.lifecycle.lifecycleScope +import app.passwordstore.R +import app.passwordstore.data.passfile.PasswordEntry +import app.passwordstore.data.password.FieldItem +import app.passwordstore.databinding.DecryptLayoutBinding +import app.passwordstore.ui.adapters.FieldItemAdapter +import app.passwordstore.util.extensions.unsafeLazy +import app.passwordstore.util.extensions.viewBinding +import app.passwordstore.util.settings.PreferenceKeys import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.runCatching import dagger.hilt.android.AndroidEntryPoint -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.passfile.PasswordEntry -import dev.msfjarvis.aps.data.password.FieldItem -import dev.msfjarvis.aps.databinding.DecryptLayoutBinding -import dev.msfjarvis.aps.ui.adapters.FieldItemAdapter -import dev.msfjarvis.aps.util.extensions.unsafeLazy -import dev.msfjarvis.aps.util.extensions.viewBinding -import dev.msfjarvis.aps.util.settings.PreferenceKeys import java.io.ByteArrayOutputStream import java.io.File import javax.inject.Inject diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivityV2.kt b/app/src/main/java/app/passwordstore/ui/crypto/DecryptActivityV2.kt index 424d5c46..fc5cb90b 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivityV2.kt +++ b/app/src/main/java/app/passwordstore/ui/crypto/DecryptActivityV2.kt @@ -3,25 +3,25 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.crypto +package app.passwordstore.ui.crypto import android.content.Intent import android.os.Bundle import android.view.Menu import android.view.MenuItem import androidx.lifecycle.lifecycleScope +import app.passwordstore.R +import app.passwordstore.data.crypto.CryptoRepository +import app.passwordstore.data.passfile.PasswordEntry +import app.passwordstore.data.password.FieldItem +import app.passwordstore.databinding.DecryptLayoutBinding +import app.passwordstore.ui.adapters.FieldItemAdapter +import app.passwordstore.util.extensions.isErr +import app.passwordstore.util.extensions.unsafeLazy +import app.passwordstore.util.extensions.viewBinding +import app.passwordstore.util.settings.PreferenceKeys import com.github.michaelbull.result.runCatching import dagger.hilt.android.AndroidEntryPoint -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.crypto.CryptoRepository -import dev.msfjarvis.aps.data.passfile.PasswordEntry -import dev.msfjarvis.aps.data.password.FieldItem -import dev.msfjarvis.aps.databinding.DecryptLayoutBinding -import dev.msfjarvis.aps.ui.adapters.FieldItemAdapter -import dev.msfjarvis.aps.util.extensions.isErr -import dev.msfjarvis.aps.util.extensions.unsafeLazy -import dev.msfjarvis.aps.util.extensions.viewBinding -import dev.msfjarvis.aps.util.settings.PreferenceKeys import java.io.ByteArrayOutputStream import java.io.File import javax.inject.Inject diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/GetKeyIdsActivity.kt b/app/src/main/java/app/passwordstore/ui/crypto/GetKeyIdsActivity.kt index afd30270..2b25db0b 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/GetKeyIdsActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/crypto/GetKeyIdsActivity.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.crypto +package app.passwordstore.ui.crypto import android.content.Intent import android.os.Bundle diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt b/app/src/main/java/app/passwordstore/ui/crypto/PasswordCreationActivity.kt index b1f11dfa..f432227e 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/crypto/PasswordCreationActivity.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.crypto +package app.passwordstore.ui.crypto import android.content.Context import android.content.Intent @@ -25,6 +25,25 @@ import androidx.core.content.edit import androidx.core.view.isVisible import androidx.core.widget.doAfterTextChanged import androidx.lifecycle.lifecycleScope +import app.passwordstore.R +import app.passwordstore.data.passfile.PasswordEntry +import app.passwordstore.data.repo.PasswordRepository +import app.passwordstore.databinding.PasswordCreationActivityBinding +import app.passwordstore.ui.dialogs.DicewarePasswordGeneratorDialogFragment +import app.passwordstore.ui.dialogs.OtpImportDialogFragment +import app.passwordstore.ui.dialogs.PasswordGeneratorDialogFragment +import app.passwordstore.util.autofill.AutofillPreferences +import app.passwordstore.util.autofill.DirectoryStructure +import app.passwordstore.util.crypto.GpgIdentifier +import app.passwordstore.util.extensions.asLog +import app.passwordstore.util.extensions.base64 +import app.passwordstore.util.extensions.commitChange +import app.passwordstore.util.extensions.getString +import app.passwordstore.util.extensions.isInsideRepository +import app.passwordstore.util.extensions.snackbar +import app.passwordstore.util.extensions.unsafeLazy +import app.passwordstore.util.extensions.viewBinding +import app.passwordstore.util.settings.PreferenceKeys import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.onSuccess import com.github.michaelbull.result.runCatching @@ -38,25 +57,6 @@ import com.google.zxing.integration.android.IntentIntegrator import com.google.zxing.integration.android.IntentIntegrator.QR_CODE import com.google.zxing.qrcode.QRCodeReader import dagger.hilt.android.AndroidEntryPoint -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.passfile.PasswordEntry -import dev.msfjarvis.aps.data.repo.PasswordRepository -import dev.msfjarvis.aps.databinding.PasswordCreationActivityBinding -import dev.msfjarvis.aps.ui.dialogs.DicewarePasswordGeneratorDialogFragment -import dev.msfjarvis.aps.ui.dialogs.OtpImportDialogFragment -import dev.msfjarvis.aps.ui.dialogs.PasswordGeneratorDialogFragment -import dev.msfjarvis.aps.util.autofill.AutofillPreferences -import dev.msfjarvis.aps.util.autofill.DirectoryStructure -import dev.msfjarvis.aps.util.crypto.GpgIdentifier -import dev.msfjarvis.aps.util.extensions.asLog -import dev.msfjarvis.aps.util.extensions.base64 -import dev.msfjarvis.aps.util.extensions.commitChange -import dev.msfjarvis.aps.util.extensions.getString -import dev.msfjarvis.aps.util.extensions.isInsideRepository -import dev.msfjarvis.aps.util.extensions.snackbar -import dev.msfjarvis.aps.util.extensions.unsafeLazy -import dev.msfjarvis.aps.util.extensions.viewBinding -import dev.msfjarvis.aps.util.settings.PreferenceKeys import java.io.ByteArrayInputStream import java.io.ByteArrayOutputStream import java.io.File diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivityV2.kt b/app/src/main/java/app/passwordstore/ui/crypto/PasswordCreationActivityV2.kt index 5792c892..7070ce7b 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivityV2.kt +++ b/app/src/main/java/app/passwordstore/ui/crypto/PasswordCreationActivityV2.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.crypto +package app.passwordstore.ui.crypto import android.content.Context import android.content.Intent @@ -23,6 +23,24 @@ import androidx.core.content.edit import androidx.core.view.isVisible import androidx.core.widget.doAfterTextChanged import androidx.lifecycle.lifecycleScope +import app.passwordstore.R +import app.passwordstore.data.crypto.CryptoRepository +import app.passwordstore.data.passfile.PasswordEntry +import app.passwordstore.databinding.PasswordCreationActivityBinding +import app.passwordstore.ui.dialogs.DicewarePasswordGeneratorDialogFragment +import app.passwordstore.ui.dialogs.OtpImportDialogFragment +import app.passwordstore.ui.dialogs.PasswordGeneratorDialogFragment +import app.passwordstore.util.autofill.AutofillPreferences +import app.passwordstore.util.autofill.DirectoryStructure +import app.passwordstore.util.extensions.asLog +import app.passwordstore.util.extensions.base64 +import app.passwordstore.util.extensions.commitChange +import app.passwordstore.util.extensions.getString +import app.passwordstore.util.extensions.isInsideRepository +import app.passwordstore.util.extensions.snackbar +import app.passwordstore.util.extensions.unsafeLazy +import app.passwordstore.util.extensions.viewBinding +import app.passwordstore.util.settings.PreferenceKeys import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.onSuccess import com.github.michaelbull.result.runCatching @@ -35,24 +53,6 @@ import com.google.zxing.integration.android.IntentIntegrator import com.google.zxing.integration.android.IntentIntegrator.QR_CODE import com.google.zxing.qrcode.QRCodeReader import dagger.hilt.android.AndroidEntryPoint -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.crypto.CryptoRepository -import dev.msfjarvis.aps.data.passfile.PasswordEntry -import dev.msfjarvis.aps.databinding.PasswordCreationActivityBinding -import dev.msfjarvis.aps.ui.dialogs.DicewarePasswordGeneratorDialogFragment -import dev.msfjarvis.aps.ui.dialogs.OtpImportDialogFragment -import dev.msfjarvis.aps.ui.dialogs.PasswordGeneratorDialogFragment -import dev.msfjarvis.aps.util.autofill.AutofillPreferences -import dev.msfjarvis.aps.util.autofill.DirectoryStructure -import dev.msfjarvis.aps.util.extensions.asLog -import dev.msfjarvis.aps.util.extensions.base64 -import dev.msfjarvis.aps.util.extensions.commitChange -import dev.msfjarvis.aps.util.extensions.getString -import dev.msfjarvis.aps.util.extensions.isInsideRepository -import dev.msfjarvis.aps.util.extensions.snackbar -import dev.msfjarvis.aps.util.extensions.unsafeLazy -import dev.msfjarvis.aps.util.extensions.viewBinding -import dev.msfjarvis.aps.util.settings.PreferenceKeys import java.io.ByteArrayOutputStream import java.io.File import java.io.IOException diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordDialog.kt b/app/src/main/java/app/passwordstore/ui/crypto/PasswordDialog.kt index d69a4686..958ce0c1 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordDialog.kt +++ b/app/src/main/java/app/passwordstore/ui/crypto/PasswordDialog.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.crypto +package app.passwordstore.ui.crypto import android.app.Dialog import android.content.DialogInterface @@ -12,11 +12,11 @@ import android.view.KeyEvent import android.view.WindowManager import androidx.core.widget.doOnTextChanged import androidx.fragment.app.DialogFragment +import app.passwordstore.R +import app.passwordstore.databinding.DialogPasswordEntryBinding +import app.passwordstore.util.extensions.finish +import app.passwordstore.util.extensions.unsafeLazy import com.google.android.material.dialog.MaterialAlertDialogBuilder -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.databinding.DialogPasswordEntryBinding -import dev.msfjarvis.aps.util.extensions.finish -import dev.msfjarvis.aps.util.extensions.unsafeLazy import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/BasicBottomSheet.kt b/app/src/main/java/app/passwordstore/ui/dialogs/BasicBottomSheet.kt index 53d9a201..c35985cb 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/BasicBottomSheet.kt +++ b/app/src/main/java/app/passwordstore/ui/dialogs/BasicBottomSheet.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.dialogs +package app.passwordstore.ui.dialogs import android.content.Context import android.os.Bundle @@ -14,12 +14,12 @@ import android.view.ViewTreeObserver import android.widget.FrameLayout import androidx.annotation.StringRes import androidx.core.view.isVisible +import app.passwordstore.R +import app.passwordstore.databinding.BasicBottomSheetBinding +import app.passwordstore.util.extensions.viewBinding import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.databinding.BasicBottomSheetBinding -import dev.msfjarvis.aps.util.extensions.viewBinding /** * [BottomSheetDialogFragment] that exposes a simple [androidx.appcompat.app.AlertDialog] like API diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/DicewarePasswordGeneratorDialogFragment.kt b/app/src/main/java/app/passwordstore/ui/dialogs/DicewarePasswordGeneratorDialogFragment.kt index 22f991c5..bb3b6f6f 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/DicewarePasswordGeneratorDialogFragment.kt +++ b/app/src/main/java/app/passwordstore/ui/dialogs/DicewarePasswordGeneratorDialogFragment.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.dialogs +package app.passwordstore.ui.dialogs import android.app.AlertDialog import android.app.Dialog @@ -15,16 +15,16 @@ import androidx.core.os.bundleOf import androidx.fragment.app.DialogFragment import androidx.fragment.app.setFragmentResult import androidx.lifecycle.lifecycleScope +import app.passwordstore.R +import app.passwordstore.databinding.FragmentPwgenDicewareBinding +import app.passwordstore.injection.prefs.PasswordGeneratorPreferences +import app.passwordstore.passgen.diceware.DicewarePassphraseGenerator +import app.passwordstore.ui.crypto.PasswordCreationActivity +import app.passwordstore.util.extensions.getString +import app.passwordstore.util.settings.PreferenceKeys.DICEWARE_LENGTH +import app.passwordstore.util.settings.PreferenceKeys.DICEWARE_SEPARATOR import com.google.android.material.dialog.MaterialAlertDialogBuilder import dagger.hilt.android.AndroidEntryPoint -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.databinding.FragmentPwgenDicewareBinding -import dev.msfjarvis.aps.injection.prefs.PasswordGeneratorPreferences -import dev.msfjarvis.aps.passgen.diceware.DicewarePassphraseGenerator -import dev.msfjarvis.aps.ui.crypto.PasswordCreationActivity -import dev.msfjarvis.aps.util.extensions.getString -import dev.msfjarvis.aps.util.settings.PreferenceKeys.DICEWARE_LENGTH -import dev.msfjarvis.aps.util.settings.PreferenceKeys.DICEWARE_SEPARATOR import javax.inject.Inject import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.merge diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/FolderCreationDialogFragment.kt b/app/src/main/java/app/passwordstore/ui/dialogs/FolderCreationDialogFragment.kt index 9b7b3e21..78177f10 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/FolderCreationDialogFragment.kt +++ b/app/src/main/java/app/passwordstore/ui/dialogs/FolderCreationDialogFragment.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.dialogs +package app.passwordstore.ui.dialogs import android.app.Dialog import android.content.Intent @@ -14,16 +14,16 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.os.bundleOf import androidx.fragment.app.DialogFragment import androidx.lifecycle.lifecycleScope +import app.passwordstore.R +import app.passwordstore.data.repo.PasswordRepository +import app.passwordstore.ui.crypto.BasePgpActivity +import app.passwordstore.ui.crypto.GetKeyIdsActivity +import app.passwordstore.ui.passwords.PasswordStore +import app.passwordstore.util.extensions.commitChange import com.google.android.material.checkbox.MaterialCheckBox import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.textfield.TextInputEditText import com.google.android.material.textfield.TextInputLayout -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.repo.PasswordRepository -import dev.msfjarvis.aps.ui.crypto.BasePgpActivity -import dev.msfjarvis.aps.ui.crypto.GetKeyIdsActivity -import dev.msfjarvis.aps.ui.passwords.PasswordStore -import dev.msfjarvis.aps.util.extensions.commitChange import java.io.File import kotlinx.coroutines.launch import me.msfjarvis.openpgpktx.util.OpenPgpApi diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/ItemCreationBottomSheet.kt b/app/src/main/java/app/passwordstore/ui/dialogs/ItemCreationBottomSheet.kt index af2a5f19..82228f20 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/ItemCreationBottomSheet.kt +++ b/app/src/main/java/app/passwordstore/ui/dialogs/ItemCreationBottomSheet.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.dialogs +package app.passwordstore.ui.dialogs import android.os.Bundle import android.view.LayoutInflater @@ -12,14 +12,14 @@ import android.view.ViewTreeObserver import android.widget.FrameLayout import androidx.core.os.bundleOf import androidx.fragment.app.setFragmentResult +import app.passwordstore.R +import app.passwordstore.ui.passwords.PasswordFragment.Companion.ACTION_FOLDER +import app.passwordstore.ui.passwords.PasswordFragment.Companion.ACTION_KEY +import app.passwordstore.ui.passwords.PasswordFragment.Companion.ACTION_PASSWORD +import app.passwordstore.ui.passwords.PasswordFragment.Companion.ITEM_CREATION_REQUEST_KEY import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.ui.passwords.PasswordFragment.Companion.ACTION_FOLDER -import dev.msfjarvis.aps.ui.passwords.PasswordFragment.Companion.ACTION_KEY -import dev.msfjarvis.aps.ui.passwords.PasswordFragment.Companion.ACTION_PASSWORD -import dev.msfjarvis.aps.ui.passwords.PasswordFragment.Companion.ITEM_CREATION_REQUEST_KEY class ItemCreationBottomSheet : BottomSheetDialogFragment() { diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/OtpImportDialogFragment.kt b/app/src/main/java/app/passwordstore/ui/dialogs/OtpImportDialogFragment.kt index 1670d263..4d2413d4 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/OtpImportDialogFragment.kt +++ b/app/src/main/java/app/passwordstore/ui/dialogs/OtpImportDialogFragment.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.dialogs +package app.passwordstore.ui.dialogs import android.app.Dialog import android.net.Uri @@ -12,9 +12,9 @@ import android.view.WindowManager import androidx.core.os.bundleOf import androidx.fragment.app.DialogFragment import androidx.fragment.app.setFragmentResult +import app.passwordstore.databinding.FragmentManualOtpEntryBinding +import app.passwordstore.ui.crypto.PasswordCreationActivity import com.google.android.material.dialog.MaterialAlertDialogBuilder -import dev.msfjarvis.aps.databinding.FragmentManualOtpEntryBinding -import dev.msfjarvis.aps.ui.crypto.PasswordCreationActivity class OtpImportDialogFragment : DialogFragment() { diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/PasswordGeneratorDialogFragment.kt b/app/src/main/java/app/passwordstore/ui/dialogs/PasswordGeneratorDialogFragment.kt index e14076b1..06ce2d92 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/dialogs/PasswordGeneratorDialogFragment.kt +++ b/app/src/main/java/app/passwordstore/ui/dialogs/PasswordGeneratorDialogFragment.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.dialogs +package app.passwordstore.ui.dialogs import android.app.AlertDialog import android.app.Dialog @@ -19,18 +19,18 @@ import androidx.core.os.bundleOf import androidx.fragment.app.DialogFragment import androidx.fragment.app.setFragmentResult import androidx.lifecycle.lifecycleScope +import app.passwordstore.R +import app.passwordstore.databinding.FragmentPwgenBinding +import app.passwordstore.passgen.random.MaxIterationsExceededException +import app.passwordstore.passgen.random.NoCharactersIncludedException +import app.passwordstore.passgen.random.PasswordGenerator +import app.passwordstore.passgen.random.PasswordLengthTooShortException +import app.passwordstore.passgen.random.PasswordOption +import app.passwordstore.ui.crypto.PasswordCreationActivity +import app.passwordstore.util.settings.PreferenceKeys import com.github.michaelbull.result.getOrElse import com.github.michaelbull.result.runCatching import com.google.android.material.dialog.MaterialAlertDialogBuilder -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.databinding.FragmentPwgenBinding -import dev.msfjarvis.aps.passgen.random.MaxIterationsExceededException -import dev.msfjarvis.aps.passgen.random.NoCharactersIncludedException -import dev.msfjarvis.aps.passgen.random.PasswordGenerator -import dev.msfjarvis.aps.passgen.random.PasswordLengthTooShortException -import dev.msfjarvis.aps.passgen.random.PasswordOption -import dev.msfjarvis.aps.ui.crypto.PasswordCreationActivity -import dev.msfjarvis.aps.util.settings.PreferenceKeys import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.merge import kotlinx.coroutines.flow.onEach diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderActivity.kt b/app/src/main/java/app/passwordstore/ui/folderselect/SelectFolderActivity.kt index 48ed5b79..009267e2 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/folderselect/SelectFolderActivity.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.folderselect +package app.passwordstore.ui.folderselect import android.os.Bundle import android.view.Menu @@ -10,10 +10,10 @@ import android.view.MenuItem import androidx.appcompat.app.AppCompatActivity import androidx.fragment.app.FragmentManager import androidx.fragment.app.commit -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.repo.PasswordRepository -import dev.msfjarvis.aps.ui.passwords.PASSWORD_FRAGMENT_TAG -import dev.msfjarvis.aps.ui.passwords.PasswordStore +import app.passwordstore.R +import app.passwordstore.data.repo.PasswordRepository +import app.passwordstore.ui.passwords.PASSWORD_FRAGMENT_TAG +import app.passwordstore.ui.passwords.PasswordStore class SelectFolderActivity : AppCompatActivity(R.layout.select_folder_layout) { diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderFragment.kt b/app/src/main/java/app/passwordstore/ui/folderselect/SelectFolderFragment.kt index cae55ba1..577777f7 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderFragment.kt +++ b/app/src/main/java/app/passwordstore/ui/folderselect/SelectFolderFragment.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.folderselect +package app.passwordstore.ui.folderselect import android.content.Context import android.os.Bundle @@ -12,16 +12,16 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager +import app.passwordstore.R +import app.passwordstore.data.password.PasswordItem +import app.passwordstore.databinding.PasswordRecyclerViewBinding +import app.passwordstore.ui.adapters.PasswordItemRecyclerAdapter +import app.passwordstore.ui.passwords.PasswordStore +import app.passwordstore.util.extensions.viewBinding +import app.passwordstore.util.viewmodel.ListMode +import app.passwordstore.util.viewmodel.SearchableRepositoryViewModel import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.runCatching -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.password.PasswordItem -import dev.msfjarvis.aps.databinding.PasswordRecyclerViewBinding -import dev.msfjarvis.aps.ui.adapters.PasswordItemRecyclerAdapter -import dev.msfjarvis.aps.ui.passwords.PasswordStore -import dev.msfjarvis.aps.util.extensions.viewBinding -import dev.msfjarvis.aps.util.viewmodel.ListMode -import dev.msfjarvis.aps.util.viewmodel.SearchableRepositoryViewModel import java.io.File import me.zhanghai.android.fastscroll.FastScrollerBuilder diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt b/app/src/main/java/app/passwordstore/ui/git/base/BaseGitActivity.kt index 614d9a52..fb9cfde3 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/git/base/BaseGitActivity.kt @@ -2,31 +2,31 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.git.base +package app.passwordstore.ui.git.base import android.content.SharedPreferences import androidx.appcompat.app.AppCompatActivity import androidx.core.content.edit +import app.passwordstore.R +import app.passwordstore.injection.prefs.GitPreferences +import app.passwordstore.util.extensions.sharedPrefs +import app.passwordstore.util.git.ErrorMessages +import app.passwordstore.util.git.operation.BreakOutOfDetached +import app.passwordstore.util.git.operation.CloneOperation +import app.passwordstore.util.git.operation.GcOperation +import app.passwordstore.util.git.operation.PullOperation +import app.passwordstore.util.git.operation.PushOperation +import app.passwordstore.util.git.operation.ResetToRemoteOperation +import app.passwordstore.util.git.operation.SyncOperation +import app.passwordstore.util.git.sshj.ContinuationContainerActivity +import app.passwordstore.util.settings.GitSettings +import app.passwordstore.util.settings.PreferenceKeys import com.github.michaelbull.result.Err import com.github.michaelbull.result.Result import com.github.michaelbull.result.andThen import com.github.michaelbull.result.mapError import com.google.android.material.dialog.MaterialAlertDialogBuilder import dagger.hilt.android.AndroidEntryPoint -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.injection.prefs.GitPreferences -import dev.msfjarvis.aps.util.extensions.sharedPrefs -import dev.msfjarvis.aps.util.git.ErrorMessages -import dev.msfjarvis.aps.util.git.operation.BreakOutOfDetached -import dev.msfjarvis.aps.util.git.operation.CloneOperation -import dev.msfjarvis.aps.util.git.operation.GcOperation -import dev.msfjarvis.aps.util.git.operation.PullOperation -import dev.msfjarvis.aps.util.git.operation.PushOperation -import dev.msfjarvis.aps.util.git.operation.ResetToRemoteOperation -import dev.msfjarvis.aps.util.git.operation.SyncOperation -import dev.msfjarvis.aps.util.git.sshj.ContinuationContainerActivity -import dev.msfjarvis.aps.util.settings.GitSettings -import dev.msfjarvis.aps.util.settings.PreferenceKeys import javax.inject.Inject import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt b/app/src/main/java/app/passwordstore/ui/git/config/GitConfigActivity.kt index 03c92313..2b5ecae5 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/git/config/GitConfigActivity.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.git.config +package app.passwordstore.ui.git.config import android.content.Intent import android.os.Bundle @@ -12,18 +12,18 @@ import android.util.Patterns import android.view.MenuItem import androidx.core.os.postDelayed import androidx.lifecycle.lifecycleScope +import app.passwordstore.R +import app.passwordstore.data.repo.PasswordRepository +import app.passwordstore.databinding.ActivityGitConfigBinding +import app.passwordstore.ui.git.base.BaseGitActivity +import app.passwordstore.ui.git.log.GitLogActivity +import app.passwordstore.util.extensions.viewBinding import com.github.michaelbull.result.fold import com.github.michaelbull.result.getOrElse import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.runCatching import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.snackbar.Snackbar -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.repo.PasswordRepository -import dev.msfjarvis.aps.databinding.ActivityGitConfigBinding -import dev.msfjarvis.aps.ui.git.base.BaseGitActivity -import dev.msfjarvis.aps.ui.git.log.GitLogActivity -import dev.msfjarvis.aps.util.extensions.viewBinding import kotlinx.coroutines.launch import logcat.LogPriority.ERROR import logcat.logcat diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt b/app/src/main/java/app/passwordstore/ui/git/config/GitServerConfigActivity.kt index 93f104fb..9cac0fdd 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/git/config/GitServerConfigActivity.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.git.config +package app.passwordstore.ui.git.config import android.content.Context import android.content.Intent @@ -15,21 +15,21 @@ import androidx.core.os.postDelayed import androidx.core.view.isVisible import androidx.core.widget.doOnTextChanged import androidx.lifecycle.lifecycleScope +import app.passwordstore.R +import app.passwordstore.data.repo.PasswordRepository +import app.passwordstore.databinding.ActivityGitCloneBinding +import app.passwordstore.ui.dialogs.BasicBottomSheet +import app.passwordstore.ui.git.base.BaseGitActivity +import app.passwordstore.util.extensions.snackbar +import app.passwordstore.util.extensions.viewBinding +import app.passwordstore.util.settings.AuthMode +import app.passwordstore.util.settings.GitSettings +import app.passwordstore.util.settings.Protocol import com.github.michaelbull.result.fold import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.runCatching import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.snackbar.Snackbar -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.repo.PasswordRepository -import dev.msfjarvis.aps.databinding.ActivityGitCloneBinding -import dev.msfjarvis.aps.ui.dialogs.BasicBottomSheet -import dev.msfjarvis.aps.ui.git.base.BaseGitActivity -import dev.msfjarvis.aps.util.extensions.snackbar -import dev.msfjarvis.aps.util.extensions.viewBinding -import dev.msfjarvis.aps.util.settings.AuthMode -import dev.msfjarvis.aps.util.settings.GitSettings -import dev.msfjarvis.aps.util.settings.Protocol import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogActivity.kt b/app/src/main/java/app/passwordstore/ui/git/log/GitLogActivity.kt index 4265717d..e160f16a 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/git/log/GitLogActivity.kt @@ -3,15 +3,15 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.git.log +package app.passwordstore.ui.git.log import android.os.Bundle import android.view.MenuItem import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager -import dev.msfjarvis.aps.databinding.ActivityGitLogBinding -import dev.msfjarvis.aps.ui.git.base.BaseGitActivity -import dev.msfjarvis.aps.util.extensions.viewBinding +import app.passwordstore.databinding.ActivityGitLogBinding +import app.passwordstore.ui.git.base.BaseGitActivity +import app.passwordstore.util.extensions.viewBinding /** * Displays the repository's git commits in git-log fashion. diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogAdapter.kt b/app/src/main/java/app/passwordstore/ui/git/log/GitLogAdapter.kt index a3080fef..29ffbe9b 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogAdapter.kt +++ b/app/src/main/java/app/passwordstore/ui/git/log/GitLogAdapter.kt @@ -3,14 +3,14 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.git.log +package app.passwordstore.ui.git.log import android.view.LayoutInflater import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView -import dev.msfjarvis.aps.databinding.GitLogRowLayoutBinding -import dev.msfjarvis.aps.util.git.GitCommit -import dev.msfjarvis.aps.util.git.GitLogModel +import app.passwordstore.databinding.GitLogRowLayoutBinding +import app.passwordstore.util.git.GitCommit +import app.passwordstore.util.git.GitLogModel import java.text.DateFormat import java.util.Date import logcat.LogPriority.ERROR diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/main/LaunchActivity.kt b/app/src/main/java/app/passwordstore/ui/main/LaunchActivity.kt index 17005b6a..6b72792a 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/main/LaunchActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/main/LaunchActivity.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.main +package app.passwordstore.ui.main import android.content.Intent import android.os.Bundle @@ -10,17 +10,17 @@ import android.os.Handler import android.os.Looper import androidx.appcompat.app.AppCompatActivity import androidx.core.content.edit +import app.passwordstore.ui.crypto.BasePgpActivity +import app.passwordstore.ui.crypto.DecryptActivity +import app.passwordstore.ui.crypto.DecryptActivityV2 +import app.passwordstore.ui.passwords.PasswordStore +import app.passwordstore.util.auth.BiometricAuthenticator +import app.passwordstore.util.auth.BiometricAuthenticator.Result +import app.passwordstore.util.extensions.sharedPrefs +import app.passwordstore.util.features.Feature +import app.passwordstore.util.features.Features +import app.passwordstore.util.settings.PreferenceKeys import dagger.hilt.android.AndroidEntryPoint -import dev.msfjarvis.aps.ui.crypto.BasePgpActivity -import dev.msfjarvis.aps.ui.crypto.DecryptActivity -import dev.msfjarvis.aps.ui.crypto.DecryptActivityV2 -import dev.msfjarvis.aps.ui.passwords.PasswordStore -import dev.msfjarvis.aps.util.auth.BiometricAuthenticator -import dev.msfjarvis.aps.util.auth.BiometricAuthenticator.Result -import dev.msfjarvis.aps.util.extensions.sharedPrefs -import dev.msfjarvis.aps.util.features.Feature -import dev.msfjarvis.aps.util.features.Features -import dev.msfjarvis.aps.util.settings.PreferenceKeys import javax.inject.Inject @AndroidEntryPoint diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/activity/OnboardingActivity.kt b/app/src/main/java/app/passwordstore/ui/onboarding/activity/OnboardingActivity.kt index 31ca362c..2fe92098 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/activity/OnboardingActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/onboarding/activity/OnboardingActivity.kt @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.onboarding.activity +package app.passwordstore.ui.onboarding.activity import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import dev.msfjarvis.aps.R +import app.passwordstore.R class OnboardingActivity : AppCompatActivity(R.layout.activity_onboarding) { diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/CloneFragment.kt b/app/src/main/java/app/passwordstore/ui/onboarding/fragments/CloneFragment.kt index e3d1df85..6702afc0 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/CloneFragment.kt +++ b/app/src/main/java/app/passwordstore/ui/onboarding/fragments/CloneFragment.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.onboarding.fragments +package app.passwordstore.ui.onboarding.fragments import android.os.Bundle import android.view.View @@ -11,18 +11,18 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity import androidx.core.content.edit import androidx.fragment.app.Fragment +import app.passwordstore.R +import app.passwordstore.data.repo.PasswordRepository +import app.passwordstore.databinding.FragmentCloneBinding +import app.passwordstore.ui.git.config.GitServerConfigActivity +import app.passwordstore.util.extensions.finish +import app.passwordstore.util.extensions.performTransactionWithBackStack +import app.passwordstore.util.extensions.sharedPrefs +import app.passwordstore.util.extensions.unsafeLazy +import app.passwordstore.util.extensions.viewBinding +import app.passwordstore.util.settings.PreferenceKeys import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.runCatching -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.repo.PasswordRepository -import dev.msfjarvis.aps.databinding.FragmentCloneBinding -import dev.msfjarvis.aps.ui.git.config.GitServerConfigActivity -import dev.msfjarvis.aps.util.extensions.finish -import dev.msfjarvis.aps.util.extensions.performTransactionWithBackStack -import dev.msfjarvis.aps.util.extensions.sharedPrefs -import dev.msfjarvis.aps.util.extensions.unsafeLazy -import dev.msfjarvis.aps.util.extensions.viewBinding -import dev.msfjarvis.aps.util.settings.PreferenceKeys import logcat.LogPriority.ERROR import logcat.asLog import logcat.logcat diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/KeySelectionFragment.kt b/app/src/main/java/app/passwordstore/ui/onboarding/fragments/KeySelectionFragment.kt index 7783e1eb..2b32cb61 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/KeySelectionFragment.kt +++ b/app/src/main/java/app/passwordstore/ui/onboarding/fragments/KeySelectionFragment.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.onboarding.fragments +package app.passwordstore.ui.onboarding.fragments import android.content.Intent import android.os.Bundle @@ -13,18 +13,18 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.edit import androidx.fragment.app.Fragment import androidx.lifecycle.lifecycleScope +import app.passwordstore.R +import app.passwordstore.data.repo.PasswordRepository +import app.passwordstore.databinding.FragmentKeySelectionBinding +import app.passwordstore.ui.crypto.GetKeyIdsActivity +import app.passwordstore.util.extensions.commitChange +import app.passwordstore.util.extensions.finish +import app.passwordstore.util.extensions.sharedPrefs +import app.passwordstore.util.extensions.snackbar +import app.passwordstore.util.extensions.unsafeLazy +import app.passwordstore.util.extensions.viewBinding +import app.passwordstore.util.settings.PreferenceKeys import com.google.android.material.snackbar.Snackbar -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.repo.PasswordRepository -import dev.msfjarvis.aps.databinding.FragmentKeySelectionBinding -import dev.msfjarvis.aps.ui.crypto.GetKeyIdsActivity -import dev.msfjarvis.aps.util.extensions.commitChange -import dev.msfjarvis.aps.util.extensions.finish -import dev.msfjarvis.aps.util.extensions.sharedPrefs -import dev.msfjarvis.aps.util.extensions.snackbar -import dev.msfjarvis.aps.util.extensions.unsafeLazy -import dev.msfjarvis.aps.util.extensions.viewBinding -import dev.msfjarvis.aps.util.settings.PreferenceKeys import java.io.File import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/WelcomeFragment.kt b/app/src/main/java/app/passwordstore/ui/onboarding/fragments/WelcomeFragment.kt index ef87741f..4d320ff7 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/WelcomeFragment.kt +++ b/app/src/main/java/app/passwordstore/ui/onboarding/fragments/WelcomeFragment.kt @@ -3,18 +3,18 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.onboarding.fragments +package app.passwordstore.ui.onboarding.fragments import android.content.Intent import android.os.Bundle import android.view.View import androidx.annotation.Keep import androidx.fragment.app.Fragment -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.databinding.FragmentWelcomeBinding -import dev.msfjarvis.aps.ui.settings.SettingsActivity -import dev.msfjarvis.aps.util.extensions.performTransactionWithBackStack -import dev.msfjarvis.aps.util.extensions.viewBinding +import app.passwordstore.R +import app.passwordstore.databinding.FragmentWelcomeBinding +import app.passwordstore.ui.settings.SettingsActivity +import app.passwordstore.util.extensions.performTransactionWithBackStack +import app.passwordstore.util.extensions.viewBinding @Keep class WelcomeFragment : Fragment(R.layout.fragment_welcome) { diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordFragment.kt b/app/src/main/java/app/passwordstore/ui/passwords/PasswordFragment.kt index c70f0b5a..9c7011a4 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordFragment.kt +++ b/app/src/main/java/app/passwordstore/ui/passwords/PasswordFragment.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.passwords +package app.passwordstore.ui.passwords import android.content.Context import android.content.SharedPreferences @@ -21,31 +21,31 @@ import androidx.fragment.app.activityViewModels import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager +import app.passwordstore.R +import app.passwordstore.data.password.PasswordItem +import app.passwordstore.data.repo.PasswordRepository +import app.passwordstore.databinding.PasswordRecyclerViewBinding +import app.passwordstore.injection.prefs.SettingsPreferences +import app.passwordstore.ui.adapters.PasswordItemRecyclerAdapter +import app.passwordstore.ui.dialogs.BasicBottomSheet +import app.passwordstore.ui.dialogs.ItemCreationBottomSheet +import app.passwordstore.ui.git.base.BaseGitActivity +import app.passwordstore.ui.git.config.GitServerConfigActivity +import app.passwordstore.ui.util.OnOffItemAnimator +import app.passwordstore.util.extensions.base64 +import app.passwordstore.util.extensions.getString +import app.passwordstore.util.extensions.sharedPrefs +import app.passwordstore.util.extensions.viewBinding +import app.passwordstore.util.settings.AuthMode +import app.passwordstore.util.settings.GitSettings +import app.passwordstore.util.settings.PasswordSortOrder +import app.passwordstore.util.settings.PreferenceKeys +import app.passwordstore.util.shortcuts.ShortcutHandler +import app.passwordstore.util.viewmodel.SearchableRepositoryViewModel import com.github.michaelbull.result.fold import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.runCatching import dagger.hilt.android.AndroidEntryPoint -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.password.PasswordItem -import dev.msfjarvis.aps.data.repo.PasswordRepository -import dev.msfjarvis.aps.databinding.PasswordRecyclerViewBinding -import dev.msfjarvis.aps.injection.prefs.SettingsPreferences -import dev.msfjarvis.aps.ui.adapters.PasswordItemRecyclerAdapter -import dev.msfjarvis.aps.ui.dialogs.BasicBottomSheet -import dev.msfjarvis.aps.ui.dialogs.ItemCreationBottomSheet -import dev.msfjarvis.aps.ui.git.base.BaseGitActivity -import dev.msfjarvis.aps.ui.git.config.GitServerConfigActivity -import dev.msfjarvis.aps.ui.util.OnOffItemAnimator -import dev.msfjarvis.aps.util.extensions.base64 -import dev.msfjarvis.aps.util.extensions.getString -import dev.msfjarvis.aps.util.extensions.sharedPrefs -import dev.msfjarvis.aps.util.extensions.viewBinding -import dev.msfjarvis.aps.util.settings.AuthMode -import dev.msfjarvis.aps.util.settings.GitSettings -import dev.msfjarvis.aps.util.settings.PasswordSortOrder -import dev.msfjarvis.aps.util.settings.PreferenceKeys -import dev.msfjarvis.aps.util.shortcuts.ShortcutHandler -import dev.msfjarvis.aps.util.viewmodel.SearchableRepositoryViewModel import java.io.File import javax.inject.Inject import kotlinx.coroutines.launch diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt b/app/src/main/java/app/passwordstore/ui/passwords/PasswordStore.kt index 0ee42896..cb77bdb7 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt +++ b/app/src/main/java/app/passwordstore/ui/passwords/PasswordStore.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.passwords +package app.passwordstore.ui.passwords import android.annotation.SuppressLint import android.content.ComponentName @@ -24,40 +24,40 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.commit import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.lifecycleScope +import app.passwordstore.R +import app.passwordstore.data.password.PasswordItem +import app.passwordstore.data.repo.PasswordRepository +import app.passwordstore.ui.crypto.BasePgpActivity +import app.passwordstore.ui.crypto.BasePgpActivity.Companion.getLongName +import app.passwordstore.ui.crypto.DecryptActivity +import app.passwordstore.ui.crypto.DecryptActivityV2 +import app.passwordstore.ui.crypto.PasswordCreationActivity +import app.passwordstore.ui.crypto.PasswordCreationActivityV2 +import app.passwordstore.ui.dialogs.FolderCreationDialogFragment +import app.passwordstore.ui.folderselect.SelectFolderActivity +import app.passwordstore.ui.git.base.BaseGitActivity +import app.passwordstore.ui.onboarding.activity.OnboardingActivity +import app.passwordstore.ui.settings.SettingsActivity +import app.passwordstore.util.autofill.AutofillMatcher +import app.passwordstore.util.extensions.base64 +import app.passwordstore.util.extensions.commitChange +import app.passwordstore.util.extensions.contains +import app.passwordstore.util.extensions.getString +import app.passwordstore.util.extensions.isInsideRepository +import app.passwordstore.util.extensions.listFilesRecursively +import app.passwordstore.util.extensions.sharedPrefs +import app.passwordstore.util.features.Feature +import app.passwordstore.util.features.Features +import app.passwordstore.util.settings.AuthMode +import app.passwordstore.util.settings.PreferenceKeys +import app.passwordstore.util.shortcuts.ShortcutHandler +import app.passwordstore.util.viewmodel.SearchableRepositoryViewModel import com.github.michaelbull.result.fold import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.runCatching import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.textfield.TextInputEditText import dagger.hilt.android.AndroidEntryPoint -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.password.PasswordItem -import dev.msfjarvis.aps.data.repo.PasswordRepository -import dev.msfjarvis.aps.ui.crypto.BasePgpActivity -import dev.msfjarvis.aps.ui.crypto.BasePgpActivity.Companion.getLongName -import dev.msfjarvis.aps.ui.crypto.DecryptActivity -import dev.msfjarvis.aps.ui.crypto.DecryptActivityV2 -import dev.msfjarvis.aps.ui.crypto.PasswordCreationActivity -import dev.msfjarvis.aps.ui.crypto.PasswordCreationActivityV2 -import dev.msfjarvis.aps.ui.dialogs.FolderCreationDialogFragment -import dev.msfjarvis.aps.ui.folderselect.SelectFolderActivity -import dev.msfjarvis.aps.ui.git.base.BaseGitActivity -import dev.msfjarvis.aps.ui.onboarding.activity.OnboardingActivity -import dev.msfjarvis.aps.ui.settings.SettingsActivity -import dev.msfjarvis.aps.util.autofill.AutofillMatcher -import dev.msfjarvis.aps.util.extensions.base64 -import dev.msfjarvis.aps.util.extensions.commitChange -import dev.msfjarvis.aps.util.extensions.contains -import dev.msfjarvis.aps.util.extensions.getString -import dev.msfjarvis.aps.util.extensions.isInsideRepository -import dev.msfjarvis.aps.util.extensions.listFilesRecursively -import dev.msfjarvis.aps.util.extensions.sharedPrefs -import dev.msfjarvis.aps.util.features.Feature -import dev.msfjarvis.aps.util.features.Features -import dev.msfjarvis.aps.util.settings.AuthMode -import dev.msfjarvis.aps.util.settings.PreferenceKeys -import dev.msfjarvis.aps.util.shortcuts.ShortcutHandler -import dev.msfjarvis.aps.util.viewmodel.SearchableRepositoryViewModel import java.io.File import java.lang.Character.UnicodeBlock import javax.inject.Inject diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/pgp/PGPKeyImportActivity.kt b/app/src/main/java/app/passwordstore/ui/pgp/PGPKeyImportActivity.kt index e140ac91..69b40a2e 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/pgp/PGPKeyImportActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/pgp/PGPKeyImportActivity.kt @@ -4,19 +4,19 @@ */ @file:Suppress("BlockingMethodInNonBlockingContext") -package dev.msfjarvis.aps.ui.pgp +package app.passwordstore.ui.pgp import android.os.Bundle import androidx.activity.result.contract.ActivityResultContracts.OpenDocument import androidx.appcompat.app.AppCompatActivity +import app.passwordstore.R +import app.passwordstore.crypto.KeyUtils.tryGetId +import app.passwordstore.crypto.PGPKey +import app.passwordstore.crypto.PGPKeyManager import com.github.michaelbull.result.mapBoth import com.github.michaelbull.result.runCatching import com.google.android.material.dialog.MaterialAlertDialogBuilder import dagger.hilt.android.AndroidEntryPoint -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.crypto.KeyUtils.tryGetId -import dev.msfjarvis.aps.crypto.PGPKey -import dev.msfjarvis.aps.crypto.PGPKeyManager import javax.inject.Inject import kotlinx.coroutines.runBlocking diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/proxy/ProxySelectorActivity.kt b/app/src/main/java/app/passwordstore/ui/proxy/ProxySelectorActivity.kt index 41cab040..9243a7f5 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/proxy/ProxySelectorActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/proxy/ProxySelectorActivity.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.proxy +package app.passwordstore.ui.proxy import android.content.SharedPreferences import android.net.InetAddresses @@ -16,15 +16,15 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.edit import androidx.core.os.postDelayed import androidx.core.widget.doOnTextChanged +import app.passwordstore.R +import app.passwordstore.databinding.ActivityProxySelectorBinding +import app.passwordstore.injection.prefs.ProxyPreferences +import app.passwordstore.util.extensions.getString +import app.passwordstore.util.extensions.viewBinding +import app.passwordstore.util.proxy.ProxyUtils +import app.passwordstore.util.settings.GitSettings +import app.passwordstore.util.settings.PreferenceKeys import dagger.hilt.android.AndroidEntryPoint -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.databinding.ActivityProxySelectorBinding -import dev.msfjarvis.aps.injection.prefs.ProxyPreferences -import dev.msfjarvis.aps.util.extensions.getString -import dev.msfjarvis.aps.util.extensions.viewBinding -import dev.msfjarvis.aps.util.proxy.ProxyUtils -import dev.msfjarvis.aps.util.settings.GitSettings -import dev.msfjarvis.aps.util.settings.PreferenceKeys import javax.inject.Inject private val WEB_ADDRESS_REGEX = Patterns.WEB_URL.toRegex() diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/AutofillSettings.kt b/app/src/main/java/app/passwordstore/ui/settings/AutofillSettings.kt index 80dce577..64ca531b 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/AutofillSettings.kt +++ b/app/src/main/java/app/passwordstore/ui/settings/AutofillSettings.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.settings +package app.passwordstore.ui.settings import android.annotation.SuppressLint import android.content.Intent @@ -15,6 +15,11 @@ import androidx.appcompat.widget.AppCompatTextView import androidx.fragment.app.FragmentActivity import androidx.lifecycle.Lifecycle import androidx.lifecycle.LifecycleEventObserver +import app.passwordstore.BuildConfig +import app.passwordstore.R +import app.passwordstore.util.autofill.DirectoryStructure +import app.passwordstore.util.extensions.autofillManager +import app.passwordstore.util.settings.PreferenceKeys import com.github.androidpasswordstore.autofillparser.BrowserAutofillSupportLevel import com.github.androidpasswordstore.autofillparser.getInstalledBrowsersWithAutofillSupportLevel import com.google.android.material.dialog.MaterialAlertDialogBuilder @@ -25,11 +30,6 @@ import de.Maxr1998.modernpreferences.helpers.singleChoice import de.Maxr1998.modernpreferences.helpers.switch import de.Maxr1998.modernpreferences.preferences.SwitchPreference import de.Maxr1998.modernpreferences.preferences.choice.SelectionItem -import dev.msfjarvis.aps.BuildConfig -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.util.autofill.DirectoryStructure -import dev.msfjarvis.aps.util.extensions.autofillManager -import dev.msfjarvis.aps.util.settings.PreferenceKeys class AutofillSettings(private val activity: FragmentActivity) : SettingsProvider { diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/GeneralSettings.kt b/app/src/main/java/app/passwordstore/ui/settings/GeneralSettings.kt index 21ecd55c..d6520ea3 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/GeneralSettings.kt +++ b/app/src/main/java/app/passwordstore/ui/settings/GeneralSettings.kt @@ -3,23 +3,23 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.settings +package app.passwordstore.ui.settings import android.content.pm.ShortcutManager import android.os.Build import androidx.core.content.edit import androidx.core.content.getSystemService import androidx.fragment.app.FragmentActivity +import app.passwordstore.R +import app.passwordstore.util.auth.BiometricAuthenticator +import app.passwordstore.util.auth.BiometricAuthenticator.Result +import app.passwordstore.util.extensions.sharedPrefs +import app.passwordstore.util.settings.PreferenceKeys import de.Maxr1998.modernpreferences.PreferenceScreen import de.Maxr1998.modernpreferences.helpers.checkBox import de.Maxr1998.modernpreferences.helpers.onClick import de.Maxr1998.modernpreferences.helpers.singleChoice import de.Maxr1998.modernpreferences.preferences.choice.SelectionItem -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.util.auth.BiometricAuthenticator -import dev.msfjarvis.aps.util.auth.BiometricAuthenticator.Result -import dev.msfjarvis.aps.util.extensions.sharedPrefs -import dev.msfjarvis.aps.util.settings.PreferenceKeys class GeneralSettings(private val activity: FragmentActivity) : SettingsProvider { diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/MiscSettings.kt b/app/src/main/java/app/passwordstore/ui/settings/MiscSettings.kt index 5bb50cd8..7bd04eb5 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/MiscSettings.kt +++ b/app/src/main/java/app/passwordstore/ui/settings/MiscSettings.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.settings +package app.passwordstore.ui.settings import android.content.Context import android.content.Intent @@ -12,14 +12,14 @@ import android.os.Build import androidx.activity.result.contract.ActivityResultContracts import androidx.documentfile.provider.DocumentFile import androidx.fragment.app.FragmentActivity +import app.passwordstore.BuildConfig +import app.passwordstore.R +import app.passwordstore.util.services.PasswordExportService +import app.passwordstore.util.settings.PreferenceKeys import de.Maxr1998.modernpreferences.PreferenceScreen import de.Maxr1998.modernpreferences.helpers.checkBox import de.Maxr1998.modernpreferences.helpers.onClick import de.Maxr1998.modernpreferences.helpers.pref -import dev.msfjarvis.aps.BuildConfig -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.util.services.PasswordExportService -import dev.msfjarvis.aps.util.settings.PreferenceKeys class MiscSettings(activity: FragmentActivity) : SettingsProvider { diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/PGPSettings.kt b/app/src/main/java/app/passwordstore/ui/settings/PGPSettings.kt index b81af006..b59e17ba 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/PGPSettings.kt +++ b/app/src/main/java/app/passwordstore/ui/settings/PGPSettings.kt @@ -3,16 +3,16 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.settings +package app.passwordstore.ui.settings import androidx.fragment.app.FragmentActivity +import app.passwordstore.ui.pgp.PGPKeyImportActivity +import app.passwordstore.util.extensions.launchActivity +import app.passwordstore.util.features.Feature import de.Maxr1998.modernpreferences.PreferenceScreen import de.Maxr1998.modernpreferences.helpers.checkBox import de.Maxr1998.modernpreferences.helpers.onClick import de.Maxr1998.modernpreferences.helpers.pref -import dev.msfjarvis.aps.ui.pgp.PGPKeyImportActivity -import dev.msfjarvis.aps.util.extensions.launchActivity -import dev.msfjarvis.aps.util.features.Feature class PGPSettings(private val activity: FragmentActivity) : SettingsProvider { diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/PasswordSettings.kt b/app/src/main/java/app/passwordstore/ui/settings/PasswordSettings.kt index db3d3670..f90a8d95 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/PasswordSettings.kt +++ b/app/src/main/java/app/passwordstore/ui/settings/PasswordSettings.kt @@ -3,18 +3,18 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.settings +package app.passwordstore.ui.settings import android.text.InputType import androidx.fragment.app.FragmentActivity +import app.passwordstore.R +import app.passwordstore.util.settings.PreferenceKeys import de.Maxr1998.modernpreferences.PreferenceScreen import de.Maxr1998.modernpreferences.helpers.checkBox import de.Maxr1998.modernpreferences.helpers.editText import de.Maxr1998.modernpreferences.helpers.onSelectionChange import de.Maxr1998.modernpreferences.helpers.singleChoice import de.Maxr1998.modernpreferences.preferences.choice.SelectionItem -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.util.settings.PreferenceKeys class PasswordSettings(private val activity: FragmentActivity) : SettingsProvider { diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/RepositorySettings.kt b/app/src/main/java/app/passwordstore/ui/settings/RepositorySettings.kt index df34b145..c9e28123 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/RepositorySettings.kt +++ b/app/src/main/java/app/passwordstore/ui/settings/RepositorySettings.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.settings +package app.passwordstore.ui.settings import android.content.Intent import android.content.SharedPreferences @@ -13,6 +13,23 @@ import androidx.activity.result.contract.ActivityResultContracts import androidx.core.content.edit import androidx.core.content.getSystemService import androidx.fragment.app.FragmentActivity +import app.passwordstore.R +import app.passwordstore.data.repo.PasswordRepository +import app.passwordstore.injection.prefs.GitPreferences +import app.passwordstore.ui.git.config.GitConfigActivity +import app.passwordstore.ui.git.config.GitServerConfigActivity +import app.passwordstore.ui.proxy.ProxySelectorActivity +import app.passwordstore.ui.sshkeygen.ShowSshKeyFragment +import app.passwordstore.ui.sshkeygen.SshKeyGenActivity +import app.passwordstore.ui.sshkeygen.SshKeyImportActivity +import app.passwordstore.util.extensions.getString +import app.passwordstore.util.extensions.launchActivity +import app.passwordstore.util.extensions.sharedPrefs +import app.passwordstore.util.extensions.snackbar +import app.passwordstore.util.extensions.unsafeLazy +import app.passwordstore.util.git.sshj.SshKey +import app.passwordstore.util.settings.GitSettings +import app.passwordstore.util.settings.PreferenceKeys import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.runCatching import com.google.android.material.dialog.MaterialAlertDialogBuilder @@ -25,23 +42,6 @@ import de.Maxr1998.modernpreferences.PreferenceScreen import de.Maxr1998.modernpreferences.helpers.checkBox import de.Maxr1998.modernpreferences.helpers.onClick import de.Maxr1998.modernpreferences.helpers.pref -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.repo.PasswordRepository -import dev.msfjarvis.aps.injection.prefs.GitPreferences -import dev.msfjarvis.aps.ui.git.config.GitConfigActivity -import dev.msfjarvis.aps.ui.git.config.GitServerConfigActivity -import dev.msfjarvis.aps.ui.proxy.ProxySelectorActivity -import dev.msfjarvis.aps.ui.sshkeygen.ShowSshKeyFragment -import dev.msfjarvis.aps.ui.sshkeygen.SshKeyGenActivity -import dev.msfjarvis.aps.ui.sshkeygen.SshKeyImportActivity -import dev.msfjarvis.aps.util.extensions.getString -import dev.msfjarvis.aps.util.extensions.launchActivity -import dev.msfjarvis.aps.util.extensions.sharedPrefs -import dev.msfjarvis.aps.util.extensions.snackbar -import dev.msfjarvis.aps.util.extensions.unsafeLazy -import dev.msfjarvis.aps.util.git.sshj.SshKey -import dev.msfjarvis.aps.util.settings.GitSettings -import dev.msfjarvis.aps.util.settings.PreferenceKeys class RepositorySettings(private val activity: FragmentActivity) : SettingsProvider { diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/SettingsActivity.kt b/app/src/main/java/app/passwordstore/ui/settings/SettingsActivity.kt index d31aa630..8eae0520 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/SettingsActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/settings/SettingsActivity.kt @@ -3,19 +3,19 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.settings +package app.passwordstore.ui.settings import android.os.Bundle import android.view.MenuItem import androidx.appcompat.app.AppCompatActivity +import app.passwordstore.R +import app.passwordstore.databinding.ActivityPreferenceRecyclerviewBinding +import app.passwordstore.util.extensions.viewBinding import com.google.android.material.dialog.MaterialAlertDialogBuilder import de.Maxr1998.modernpreferences.Preference import de.Maxr1998.modernpreferences.PreferencesAdapter import de.Maxr1998.modernpreferences.helpers.screen import de.Maxr1998.modernpreferences.helpers.subScreen -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.databinding.ActivityPreferenceRecyclerviewBinding -import dev.msfjarvis.aps.util.extensions.viewBinding class SettingsActivity : AppCompatActivity() { diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/settings/SettingsProvider.kt b/app/src/main/java/app/passwordstore/ui/settings/SettingsProvider.kt index 61b11064..6c1f80ec 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/settings/SettingsProvider.kt +++ b/app/src/main/java/app/passwordstore/ui/settings/SettingsProvider.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.settings +package app.passwordstore.ui.settings import de.Maxr1998.modernpreferences.PreferenceScreen diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/ShowSshKeyFragment.kt b/app/src/main/java/app/passwordstore/ui/sshkeygen/ShowSshKeyFragment.kt index 73cd2ba1..a42d6aa1 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/ShowSshKeyFragment.kt +++ b/app/src/main/java/app/passwordstore/ui/sshkeygen/ShowSshKeyFragment.kt @@ -2,15 +2,15 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.sshkeygen +package app.passwordstore.ui.sshkeygen import android.app.Dialog import android.content.Intent import android.os.Bundle import androidx.fragment.app.DialogFragment +import app.passwordstore.R +import app.passwordstore.util.git.sshj.SshKey import com.google.android.material.dialog.MaterialAlertDialogBuilder -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.util.git.sshj.SshKey class ShowSshKeyFragment : DialogFragment() { diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/SshKeyGenActivity.kt b/app/src/main/java/app/passwordstore/ui/sshkeygen/SshKeyGenActivity.kt index dec0c135..8a3d3edf 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/SshKeyGenActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/sshkeygen/SshKeyGenActivity.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.sshkeygen +package app.passwordstore.ui.sshkeygen import android.content.SharedPreferences import android.os.Bundle @@ -14,18 +14,18 @@ import androidx.appcompat.app.AppCompatActivity import androidx.core.content.edit import androidx.core.content.getSystemService import androidx.lifecycle.lifecycleScope +import app.passwordstore.R +import app.passwordstore.databinding.ActivitySshKeygenBinding +import app.passwordstore.injection.prefs.GitPreferences +import app.passwordstore.util.auth.BiometricAuthenticator +import app.passwordstore.util.auth.BiometricAuthenticator.Result +import app.passwordstore.util.extensions.keyguardManager +import app.passwordstore.util.extensions.viewBinding +import app.passwordstore.util.git.sshj.SshKey import com.github.michaelbull.result.fold import com.github.michaelbull.result.runCatching import com.google.android.material.dialog.MaterialAlertDialogBuilder import dagger.hilt.android.AndroidEntryPoint -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.databinding.ActivitySshKeygenBinding -import dev.msfjarvis.aps.injection.prefs.GitPreferences -import dev.msfjarvis.aps.util.auth.BiometricAuthenticator -import dev.msfjarvis.aps.util.auth.BiometricAuthenticator.Result -import dev.msfjarvis.aps.util.extensions.keyguardManager -import dev.msfjarvis.aps.util.extensions.viewBinding -import dev.msfjarvis.aps.util.git.sshj.SshKey import javax.inject.Inject import kotlin.coroutines.resume import kotlin.coroutines.suspendCoroutine diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/SshKeyImportActivity.kt b/app/src/main/java/app/passwordstore/ui/sshkeygen/SshKeyImportActivity.kt index 446e0c32..99b3bf3f 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/SshKeyImportActivity.kt +++ b/app/src/main/java/app/passwordstore/ui/sshkeygen/SshKeyImportActivity.kt @@ -3,18 +3,18 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.sshkeygen +package app.passwordstore.ui.sshkeygen import android.net.Uri import android.os.Bundle import android.widget.Toast import androidx.activity.result.contract.ActivityResultContracts import androidx.appcompat.app.AppCompatActivity +import app.passwordstore.R +import app.passwordstore.util.git.sshj.SshKey import com.github.michaelbull.result.onFailure import com.github.michaelbull.result.runCatching import com.google.android.material.dialog.MaterialAlertDialogBuilder -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.util.git.sshj.SshKey class SshKeyImportActivity : AppCompatActivity() { diff --git a/app/src/main/java/dev/msfjarvis/aps/ui/util/OnOffItemAnimator.kt b/app/src/main/java/app/passwordstore/ui/util/OnOffItemAnimator.kt index 494a9ed7..c315766a 100644 --- a/app/src/main/java/dev/msfjarvis/aps/ui/util/OnOffItemAnimator.kt +++ b/app/src/main/java/app/passwordstore/ui/util/OnOffItemAnimator.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.ui.util +package app.passwordstore.ui.util import androidx.recyclerview.widget.DefaultItemAnimator import androidx.recyclerview.widget.RecyclerView diff --git a/app/src/main/java/dev/msfjarvis/aps/util/auth/BiometricAuthenticator.kt b/app/src/main/java/app/passwordstore/util/auth/BiometricAuthenticator.kt index 38ff812a..e9d7c3a4 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/auth/BiometricAuthenticator.kt +++ b/app/src/main/java/app/passwordstore/util/auth/BiometricAuthenticator.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.auth +package app.passwordstore.util.auth import android.app.KeyguardManager import androidx.annotation.StringRes @@ -12,7 +12,7 @@ import androidx.biometric.BiometricPrompt import androidx.core.content.ContextCompat import androidx.core.content.getSystemService import androidx.fragment.app.FragmentActivity -import dev.msfjarvis.aps.R +import app.passwordstore.R import logcat.logcat object BiometricAuthenticator { diff --git a/app/src/main/java/dev/msfjarvis/aps/util/autofill/Api30AutofillResponseBuilder.kt b/app/src/main/java/app/passwordstore/util/autofill/Api30AutofillResponseBuilder.kt index 745bad73..6d1f2e33 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/autofill/Api30AutofillResponseBuilder.kt +++ b/app/src/main/java/app/passwordstore/util/autofill/Api30AutofillResponseBuilder.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.autofill +package app.passwordstore.util.autofill import android.content.Context import android.content.IntentSender @@ -14,6 +14,14 @@ import android.service.autofill.SaveInfo import android.view.inputmethod.InlineSuggestionsRequest import android.widget.inline.InlinePresentationSpec import androidx.annotation.RequiresApi +import app.passwordstore.autofill.oreo.ui.AutofillSmsActivity +import app.passwordstore.ui.autofill.AutofillDecryptActivity +import app.passwordstore.ui.autofill.AutofillDecryptActivityV2 +import app.passwordstore.ui.autofill.AutofillFilterView +import app.passwordstore.ui.autofill.AutofillPublisherChangedActivity +import app.passwordstore.ui.autofill.AutofillSaveActivity +import app.passwordstore.util.features.Feature +import app.passwordstore.util.features.Features import com.github.androidpasswordstore.autofillparser.AutofillAction import com.github.androidpasswordstore.autofillparser.FillableForm import com.github.androidpasswordstore.autofillparser.fillWith @@ -21,14 +29,6 @@ import com.github.michaelbull.result.fold import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject -import dev.msfjarvis.aps.autofill.oreo.ui.AutofillSmsActivity -import dev.msfjarvis.aps.ui.autofill.AutofillDecryptActivity -import dev.msfjarvis.aps.ui.autofill.AutofillDecryptActivityV2 -import dev.msfjarvis.aps.ui.autofill.AutofillFilterView -import dev.msfjarvis.aps.ui.autofill.AutofillPublisherChangedActivity -import dev.msfjarvis.aps.ui.autofill.AutofillSaveActivity -import dev.msfjarvis.aps.util.features.Feature -import dev.msfjarvis.aps.util.features.Features import java.io.File import logcat.LogPriority.ERROR import logcat.asLog diff --git a/app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillMatcher.kt b/app/src/main/java/app/passwordstore/util/autofill/AutofillMatcher.kt index 42c1d693..4fbccd87 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillMatcher.kt +++ b/app/src/main/java/app/passwordstore/util/autofill/AutofillMatcher.kt @@ -2,18 +2,18 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.autofill +package app.passwordstore.util.autofill import android.content.Context import android.content.SharedPreferences import android.widget.Toast import androidx.core.content.edit +import app.passwordstore.R import com.github.androidpasswordstore.autofillparser.FormOrigin import com.github.androidpasswordstore.autofillparser.computeCertificatesHash import com.github.michaelbull.result.Err import com.github.michaelbull.result.Ok import com.github.michaelbull.result.Result -import dev.msfjarvis.aps.R import java.io.File import logcat.LogPriority.ERROR import logcat.LogPriority.WARN diff --git a/app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillPreferences.kt b/app/src/main/java/app/passwordstore/util/autofill/AutofillPreferences.kt index 6803da47..d99ba7a2 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillPreferences.kt +++ b/app/src/main/java/app/passwordstore/util/autofill/AutofillPreferences.kt @@ -2,16 +2,16 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.autofill +package app.passwordstore.util.autofill import android.content.Context import androidx.annotation.RequiresApi +import app.passwordstore.data.passfile.PasswordEntry +import app.passwordstore.util.extensions.getString +import app.passwordstore.util.extensions.sharedPrefs +import app.passwordstore.util.services.getDefaultUsername +import app.passwordstore.util.settings.PreferenceKeys import com.github.androidpasswordstore.autofillparser.Credentials -import dev.msfjarvis.aps.data.passfile.PasswordEntry -import dev.msfjarvis.aps.util.extensions.getString -import dev.msfjarvis.aps.util.extensions.sharedPrefs -import dev.msfjarvis.aps.util.services.getDefaultUsername -import dev.msfjarvis.aps.util.settings.PreferenceKeys import java.io.File import java.nio.file.Paths import kotlinx.coroutines.flow.first diff --git a/app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillResponseBuilder.kt b/app/src/main/java/app/passwordstore/util/autofill/AutofillResponseBuilder.kt index a091e206..de542bac 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillResponseBuilder.kt +++ b/app/src/main/java/app/passwordstore/util/autofill/AutofillResponseBuilder.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.autofill +package app.passwordstore.util.autofill import android.content.Context import android.content.IntentSender @@ -13,6 +13,14 @@ import android.service.autofill.FillCallback import android.service.autofill.FillResponse import android.service.autofill.SaveInfo import androidx.annotation.RequiresApi +import app.passwordstore.autofill.oreo.ui.AutofillSmsActivity +import app.passwordstore.ui.autofill.AutofillDecryptActivity +import app.passwordstore.ui.autofill.AutofillDecryptActivityV2 +import app.passwordstore.ui.autofill.AutofillFilterView +import app.passwordstore.ui.autofill.AutofillPublisherChangedActivity +import app.passwordstore.ui.autofill.AutofillSaveActivity +import app.passwordstore.util.features.Feature +import app.passwordstore.util.features.Features import com.github.androidpasswordstore.autofillparser.AutofillAction import com.github.androidpasswordstore.autofillparser.AutofillScenario import com.github.androidpasswordstore.autofillparser.Credentials @@ -22,14 +30,6 @@ import com.github.michaelbull.result.fold import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject -import dev.msfjarvis.aps.autofill.oreo.ui.AutofillSmsActivity -import dev.msfjarvis.aps.ui.autofill.AutofillDecryptActivity -import dev.msfjarvis.aps.ui.autofill.AutofillDecryptActivityV2 -import dev.msfjarvis.aps.ui.autofill.AutofillFilterView -import dev.msfjarvis.aps.ui.autofill.AutofillPublisherChangedActivity -import dev.msfjarvis.aps.ui.autofill.AutofillSaveActivity -import dev.msfjarvis.aps.util.features.Feature -import dev.msfjarvis.aps.util.features.Features import java.io.File import logcat.LogPriority.ERROR import logcat.asLog diff --git a/app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillViewUtils.kt b/app/src/main/java/app/passwordstore/util/autofill/AutofillViewUtils.kt index 20414e6f..9bf2cc8d 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillViewUtils.kt +++ b/app/src/main/java/app/passwordstore/util/autofill/AutofillViewUtils.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.autofill +package app.passwordstore.util.autofill import android.annotation.SuppressLint import android.app.PendingIntent @@ -18,9 +18,9 @@ import android.widget.inline.InlinePresentationSpec import androidx.annotation.DrawableRes import androidx.autofill.inline.UiVersions import androidx.autofill.inline.v1.InlineSuggestionUi -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.repo.PasswordRepository -import dev.msfjarvis.aps.ui.passwords.PasswordStore +import app.passwordstore.R +import app.passwordstore.data.repo.PasswordRepository +import app.passwordstore.ui.passwords.PasswordStore import java.io.File data class DatasetMetadata(val title: String, val subtitle: String?, @DrawableRes val iconRes: Int) diff --git a/app/src/main/java/dev/msfjarvis/aps/util/crypto/GpgIdentifier.kt b/app/src/main/java/app/passwordstore/util/crypto/GpgIdentifier.kt index f99b623c..3df3e09f 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/crypto/GpgIdentifier.kt +++ b/app/src/main/java/app/passwordstore/util/crypto/GpgIdentifier.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.crypto +package app.passwordstore.util.crypto import me.msfjarvis.openpgpktx.util.OpenPgpUtils diff --git a/app/src/main/java/dev/msfjarvis/aps/util/extensions/AndroidExtensions.kt b/app/src/main/java/app/passwordstore/util/extensions/AndroidExtensions.kt index cc243a09..69811e05 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/extensions/AndroidExtensions.kt +++ b/app/src/main/java/app/passwordstore/util/extensions/AndroidExtensions.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.extensions +package app.passwordstore.util.extensions import android.app.KeyguardManager import android.content.ClipboardManager @@ -21,13 +21,13 @@ import androidx.core.content.getSystemService import androidx.fragment.app.FragmentActivity import androidx.security.crypto.EncryptedSharedPreferences import androidx.security.crypto.MasterKey +import app.passwordstore.BuildConfig +import app.passwordstore.R +import app.passwordstore.data.repo.PasswordRepository +import app.passwordstore.util.git.operation.GitOperation import com.github.michaelbull.result.Ok import com.github.michaelbull.result.Result import com.google.android.material.snackbar.Snackbar -import dev.msfjarvis.aps.BuildConfig -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.repo.PasswordRepository -import dev.msfjarvis.aps.util.git.operation.GitOperation import logcat.logcat /** Get an instance of [AutofillManager]. Only available on Android Oreo and above */ diff --git a/app/src/main/java/dev/msfjarvis/aps/util/extensions/Extensions.kt b/app/src/main/java/app/passwordstore/util/extensions/Extensions.kt index 8530a216..9d81587d 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/extensions/Extensions.kt +++ b/app/src/main/java/app/passwordstore/util/extensions/Extensions.kt @@ -2,14 +2,14 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.extensions +package app.passwordstore.util.extensions +import app.passwordstore.data.repo.PasswordRepository import com.github.michaelbull.result.Err import com.github.michaelbull.result.Ok import com.github.michaelbull.result.Result import com.github.michaelbull.result.getOrElse import com.github.michaelbull.result.runCatching -import dev.msfjarvis.aps.data.repo.PasswordRepository import java.io.File import java.util.Date import logcat.asLog diff --git a/app/src/main/java/dev/msfjarvis/aps/util/extensions/FragmentExtensions.kt b/app/src/main/java/app/passwordstore/util/extensions/FragmentExtensions.kt index 3a256ee7..fca45df6 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/extensions/FragmentExtensions.kt +++ b/app/src/main/java/app/passwordstore/util/extensions/FragmentExtensions.kt @@ -3,13 +3,13 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.extensions +package app.passwordstore.util.extensions import androidx.annotation.IdRes import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.commit -import dev.msfjarvis.aps.R +import app.passwordstore.R /** Check if [permission] is granted to the app. Aliases to [isPermissionGranted] internally. */ fun Fragment.isPermissionGranted(permission: String): Boolean { diff --git a/app/src/main/java/dev/msfjarvis/aps/util/extensions/FragmentViewBindingDelegate.kt b/app/src/main/java/app/passwordstore/util/extensions/FragmentViewBindingDelegate.kt index fe885c86..617f3b84 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/extensions/FragmentViewBindingDelegate.kt +++ b/app/src/main/java/app/passwordstore/util/extensions/FragmentViewBindingDelegate.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.extensions +package app.passwordstore.util.extensions import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/java/dev/msfjarvis/aps/util/features/Feature.kt b/app/src/main/java/app/passwordstore/util/features/Feature.kt index 4eef003d..6e9e77e9 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/features/Feature.kt +++ b/app/src/main/java/app/passwordstore/util/features/Feature.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.features +package app.passwordstore.util.features /** List of all feature flags for the app. */ enum class Feature( diff --git a/app/src/main/java/dev/msfjarvis/aps/util/features/Features.kt b/app/src/main/java/app/passwordstore/util/features/Features.kt index 39b2c3a8..fbba15f9 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/features/Features.kt +++ b/app/src/main/java/app/passwordstore/util/features/Features.kt @@ -3,10 +3,10 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.features +package app.passwordstore.util.features import android.content.SharedPreferences -import dev.msfjarvis.aps.injection.prefs.SettingsPreferences +import app.passwordstore.injection.prefs.SettingsPreferences import javax.inject.Inject class Features diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/ErrorMessages.kt b/app/src/main/java/app/passwordstore/util/git/ErrorMessages.kt index 36dc445f..3ff932d0 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/ErrorMessages.kt +++ b/app/src/main/java/app/passwordstore/util/git/ErrorMessages.kt @@ -3,12 +3,12 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.git +package app.passwordstore.util.git import android.os.RemoteException import androidx.annotation.StringRes -import dev.msfjarvis.aps.Application -import dev.msfjarvis.aps.R +import app.passwordstore.Application +import app.passwordstore.R import java.net.UnknownHostException /** diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/GitCommandExecutor.kt b/app/src/main/java/app/passwordstore/util/git/GitCommandExecutor.kt index e6eb77f5..40fd0fff 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/GitCommandExecutor.kt +++ b/app/src/main/java/app/passwordstore/util/git/GitCommandExecutor.kt @@ -3,10 +3,17 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.git +package app.passwordstore.util.git import android.widget.Toast import androidx.fragment.app.FragmentActivity +import app.passwordstore.R +import app.passwordstore.util.extensions.snackbar +import app.passwordstore.util.extensions.unsafeLazy +import app.passwordstore.util.git.GitException.PullException +import app.passwordstore.util.git.GitException.PushException +import app.passwordstore.util.git.operation.GitOperation +import app.passwordstore.util.settings.GitSettings import com.github.michaelbull.result.Result import com.github.michaelbull.result.runCatching import com.google.android.material.snackbar.Snackbar @@ -14,13 +21,6 @@ import dagger.hilt.EntryPoint import dagger.hilt.InstallIn import dagger.hilt.android.EntryPointAccessors import dagger.hilt.components.SingletonComponent -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.util.extensions.snackbar -import dev.msfjarvis.aps.util.extensions.unsafeLazy -import dev.msfjarvis.aps.util.git.GitException.PullException -import dev.msfjarvis.aps.util.git.GitException.PushException -import dev.msfjarvis.aps.util.git.operation.GitOperation -import dev.msfjarvis.aps.util.settings.GitSettings import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import org.eclipse.jgit.api.CommitCommand diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/GitCommit.kt b/app/src/main/java/app/passwordstore/util/git/GitCommit.kt index 490f5e2c..0a5d2020 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/GitCommit.kt +++ b/app/src/main/java/app/passwordstore/util/git/GitCommit.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.git +package app.passwordstore.util.git import java.util.Date diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/GitLogModel.kt b/app/src/main/java/app/passwordstore/util/git/GitLogModel.kt index ed210a65..387c16d9 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/GitLogModel.kt +++ b/app/src/main/java/app/passwordstore/util/git/GitLogModel.kt @@ -3,15 +3,15 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.git +package app.passwordstore.util.git +import app.passwordstore.data.repo.PasswordRepository +import app.passwordstore.util.extensions.asLog +import app.passwordstore.util.extensions.hash +import app.passwordstore.util.extensions.time +import app.passwordstore.util.extensions.unsafeLazy import com.github.michaelbull.result.getOrElse import com.github.michaelbull.result.runCatching -import dev.msfjarvis.aps.data.repo.PasswordRepository -import dev.msfjarvis.aps.util.extensions.asLog -import dev.msfjarvis.aps.util.extensions.hash -import dev.msfjarvis.aps.util.extensions.time -import dev.msfjarvis.aps.util.extensions.unsafeLazy import logcat.LogPriority.ERROR import logcat.logcat import org.eclipse.jgit.api.Git diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/operation/BreakOutOfDetached.kt b/app/src/main/java/app/passwordstore/util/git/operation/BreakOutOfDetached.kt index 6ea9b8bb..65629daa 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/operation/BreakOutOfDetached.kt +++ b/app/src/main/java/app/passwordstore/util/git/operation/BreakOutOfDetached.kt @@ -2,12 +2,12 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.git.operation +package app.passwordstore.util.git.operation +import app.passwordstore.R +import app.passwordstore.util.extensions.unsafeLazy +import app.passwordstore.util.git.sshj.ContinuationContainerActivity import com.google.android.material.dialog.MaterialAlertDialogBuilder -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.util.extensions.unsafeLazy -import dev.msfjarvis.aps.util.git.sshj.ContinuationContainerActivity import org.eclipse.jgit.api.RebaseCommand import org.eclipse.jgit.api.ResetCommand import org.eclipse.jgit.lib.RepositoryState diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/operation/CloneOperation.kt b/app/src/main/java/app/passwordstore/util/git/operation/CloneOperation.kt index 75db2ea5..88178125 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/operation/CloneOperation.kt +++ b/app/src/main/java/app/passwordstore/util/git/operation/CloneOperation.kt @@ -2,9 +2,9 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.git.operation +package app.passwordstore.util.git.operation -import dev.msfjarvis.aps.util.git.sshj.ContinuationContainerActivity +import app.passwordstore.util.git.sshj.ContinuationContainerActivity import org.eclipse.jgit.api.Git import org.eclipse.jgit.api.GitCommand diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/operation/CredentialFinder.kt b/app/src/main/java/app/passwordstore/util/git/operation/CredentialFinder.kt index 623d69ea..16364f0c 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/operation/CredentialFinder.kt +++ b/app/src/main/java/app/passwordstore/util/git/operation/CredentialFinder.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.git.operation +package app.passwordstore.util.git.operation import android.annotation.SuppressLint import android.content.SharedPreferences @@ -13,6 +13,11 @@ import androidx.annotation.StringRes import androidx.core.content.edit import androidx.core.widget.doOnTextChanged import androidx.fragment.app.FragmentActivity +import app.passwordstore.R +import app.passwordstore.injection.prefs.GitPreferences +import app.passwordstore.util.git.sshj.InteractivePasswordFinder +import app.passwordstore.util.settings.AuthMode +import app.passwordstore.util.settings.PreferenceKeys import com.google.android.material.checkbox.MaterialCheckBox import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.textfield.TextInputEditText @@ -21,11 +26,6 @@ import dagger.hilt.EntryPoint import dagger.hilt.InstallIn import dagger.hilt.android.EntryPointAccessors import dagger.hilt.components.SingletonComponent -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.injection.prefs.GitPreferences -import dev.msfjarvis.aps.util.git.sshj.InteractivePasswordFinder -import dev.msfjarvis.aps.util.settings.AuthMode -import dev.msfjarvis.aps.util.settings.PreferenceKeys import kotlin.coroutines.Continuation import kotlin.coroutines.resume diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/operation/GcOperation.kt b/app/src/main/java/app/passwordstore/util/git/operation/GcOperation.kt index c070027e..556c899e 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/operation/GcOperation.kt +++ b/app/src/main/java/app/passwordstore/util/git/operation/GcOperation.kt @@ -3,9 +3,9 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.git.operation +package app.passwordstore.util.git.operation -import dev.msfjarvis.aps.util.git.sshj.ContinuationContainerActivity +import app.passwordstore.util.git.sshj.ContinuationContainerActivity import org.eclipse.jgit.api.GitCommand /** diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/operation/GitOperation.kt b/app/src/main/java/app/passwordstore/util/git/operation/GitOperation.kt index 576a802d..2f13b5ad 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/operation/GitOperation.kt +++ b/app/src/main/java/app/passwordstore/util/git/operation/GitOperation.kt @@ -2,11 +2,24 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.git.operation +package app.passwordstore.util.git.operation import android.content.Intent import android.widget.Toast import androidx.fragment.app.FragmentActivity +import app.passwordstore.R +import app.passwordstore.data.repo.PasswordRepository +import app.passwordstore.ui.sshkeygen.SshKeyGenActivity +import app.passwordstore.ui.sshkeygen.SshKeyImportActivity +import app.passwordstore.util.auth.BiometricAuthenticator +import app.passwordstore.util.auth.BiometricAuthenticator.Result.* +import app.passwordstore.util.git.GitCommandExecutor +import app.passwordstore.util.git.sshj.ContinuationContainerActivity +import app.passwordstore.util.git.sshj.SshAuthMethod +import app.passwordstore.util.git.sshj.SshKey +import app.passwordstore.util.git.sshj.SshjSessionFactory +import app.passwordstore.util.settings.AuthMode +import app.passwordstore.util.settings.GitSettings import com.github.michaelbull.result.Err import com.github.michaelbull.result.Ok import com.github.michaelbull.result.Result @@ -17,19 +30,6 @@ import dagger.hilt.EntryPoint import dagger.hilt.InstallIn import dagger.hilt.android.EntryPointAccessors import dagger.hilt.components.SingletonComponent -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.repo.PasswordRepository -import dev.msfjarvis.aps.ui.sshkeygen.SshKeyGenActivity -import dev.msfjarvis.aps.ui.sshkeygen.SshKeyImportActivity -import dev.msfjarvis.aps.util.auth.BiometricAuthenticator -import dev.msfjarvis.aps.util.auth.BiometricAuthenticator.Result.* -import dev.msfjarvis.aps.util.git.GitCommandExecutor -import dev.msfjarvis.aps.util.git.sshj.ContinuationContainerActivity -import dev.msfjarvis.aps.util.git.sshj.SshAuthMethod -import dev.msfjarvis.aps.util.git.sshj.SshKey -import dev.msfjarvis.aps.util.git.sshj.SshjSessionFactory -import dev.msfjarvis.aps.util.settings.AuthMode -import dev.msfjarvis.aps.util.settings.GitSettings import kotlin.coroutines.resume import kotlin.coroutines.suspendCoroutine import kotlinx.coroutines.Dispatchers diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/operation/PullOperation.kt b/app/src/main/java/app/passwordstore/util/git/operation/PullOperation.kt index 394b7cb4..75b6fc1a 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/operation/PullOperation.kt +++ b/app/src/main/java/app/passwordstore/util/git/operation/PullOperation.kt @@ -2,9 +2,9 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.git.operation +package app.passwordstore.util.git.operation -import dev.msfjarvis.aps.util.git.sshj.ContinuationContainerActivity +import app.passwordstore.util.git.sshj.ContinuationContainerActivity import org.eclipse.jgit.api.GitCommand class PullOperation( diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/operation/PushOperation.kt b/app/src/main/java/app/passwordstore/util/git/operation/PushOperation.kt index 14f16164..386d79e6 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/operation/PushOperation.kt +++ b/app/src/main/java/app/passwordstore/util/git/operation/PushOperation.kt @@ -2,9 +2,9 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.git.operation +package app.passwordstore.util.git.operation -import dev.msfjarvis.aps.util.git.sshj.ContinuationContainerActivity +import app.passwordstore.util.git.sshj.ContinuationContainerActivity import org.eclipse.jgit.api.GitCommand class PushOperation(callingActivity: ContinuationContainerActivity) : diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/operation/ResetToRemoteOperation.kt b/app/src/main/java/app/passwordstore/util/git/operation/ResetToRemoteOperation.kt index 16114f65..7c8cee93 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/operation/ResetToRemoteOperation.kt +++ b/app/src/main/java/app/passwordstore/util/git/operation/ResetToRemoteOperation.kt @@ -2,9 +2,9 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.git.operation +package app.passwordstore.util.git.operation -import dev.msfjarvis.aps.util.git.sshj.ContinuationContainerActivity +import app.passwordstore.util.git.sshj.ContinuationContainerActivity import org.eclipse.jgit.api.ResetCommand class ResetToRemoteOperation(callingActivity: ContinuationContainerActivity) : diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/operation/SyncOperation.kt b/app/src/main/java/app/passwordstore/util/git/operation/SyncOperation.kt index 589c6305..226fd753 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/operation/SyncOperation.kt +++ b/app/src/main/java/app/passwordstore/util/git/operation/SyncOperation.kt @@ -2,9 +2,9 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.git.operation +package app.passwordstore.util.git.operation -import dev.msfjarvis.aps.util.git.sshj.ContinuationContainerActivity +import app.passwordstore.util.git.sshj.ContinuationContainerActivity class SyncOperation( callingActivity: ContinuationContainerActivity, diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/ContinuationContainerActivity.kt b/app/src/main/java/app/passwordstore/util/git/sshj/ContinuationContainerActivity.kt index 523ff5b6..10872a24 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/ContinuationContainerActivity.kt +++ b/app/src/main/java/app/passwordstore/util/git/sshj/ContinuationContainerActivity.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.git.sshj +package app.passwordstore.util.git.sshj import android.content.Intent import androidx.activity.result.contract.ActivityResultContracts diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainKeyProvider.kt b/app/src/main/java/app/passwordstore/util/git/sshj/OpenKeychainKeyProvider.kt index 8436d1ce..7603059f 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainKeyProvider.kt +++ b/app/src/main/java/app/passwordstore/util/git/sshj/OpenKeychainKeyProvider.kt @@ -2,16 +2,16 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.git.sshj +package app.passwordstore.util.git.sshj import android.app.PendingIntent import android.content.Intent import androidx.activity.result.IntentSenderRequest import androidx.core.content.edit import androidx.lifecycle.lifecycleScope -import dev.msfjarvis.aps.util.extensions.OPENPGP_PROVIDER -import dev.msfjarvis.aps.util.extensions.sharedPrefs -import dev.msfjarvis.aps.util.settings.PreferenceKeys +import app.passwordstore.util.extensions.OPENPGP_PROVIDER +import app.passwordstore.util.extensions.sharedPrefs +import app.passwordstore.util.settings.PreferenceKeys import java.io.Closeable import java.security.PublicKey import java.security.interfaces.ECKey diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt b/app/src/main/java/app/passwordstore/util/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt index c5cb6eaa..611ba9e0 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt +++ b/app/src/main/java/app/passwordstore/util/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.git.sshj +package app.passwordstore.util.git.sshj import com.hierynomus.sshj.key.KeyAlgorithm import java.io.ByteArrayOutputStream diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshKey.kt b/app/src/main/java/app/passwordstore/util/git/sshj/SshKey.kt index ea96af53..15753da9 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshKey.kt +++ b/app/src/main/java/app/passwordstore/util/git/sshj/SshKey.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.git.sshj +package app.passwordstore.util.git.sshj import android.content.Context import android.content.pm.PackageManager @@ -16,15 +16,15 @@ import android.util.Base64 import androidx.core.content.edit import androidx.security.crypto.EncryptedFile import androidx.security.crypto.MasterKey +import app.passwordstore.Application +import app.passwordstore.R +import app.passwordstore.util.extensions.getEncryptedGitPrefs +import app.passwordstore.util.extensions.getString +import app.passwordstore.util.extensions.sharedPrefs +import app.passwordstore.util.extensions.unsafeLazy +import app.passwordstore.util.settings.PreferenceKeys import com.github.michaelbull.result.getOrElse import com.github.michaelbull.result.runCatching -import dev.msfjarvis.aps.Application -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.util.extensions.getEncryptedGitPrefs -import dev.msfjarvis.aps.util.extensions.getString -import dev.msfjarvis.aps.util.extensions.sharedPrefs -import dev.msfjarvis.aps.util.extensions.unsafeLazy -import dev.msfjarvis.aps.util.settings.PreferenceKeys import java.io.File import java.io.IOException import java.security.KeyFactory diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshjConfig.kt b/app/src/main/java/app/passwordstore/util/git/sshj/SshjConfig.kt index 948fbd35..7522de50 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshjConfig.kt +++ b/app/src/main/java/app/passwordstore/util/git/sshj/SshjConfig.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.git.sshj +package app.passwordstore.util.git.sshj import com.github.michaelbull.result.runCatching import com.hierynomus.sshj.key.KeyAlgorithms diff --git a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshjSessionFactory.kt b/app/src/main/java/app/passwordstore/util/git/sshj/SshjSessionFactory.kt index a9f84fa9..b7f0542f 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshjSessionFactory.kt +++ b/app/src/main/java/app/passwordstore/util/git/sshj/SshjSessionFactory.kt @@ -2,13 +2,13 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.git.sshj +package app.passwordstore.util.git.sshj import android.util.Base64 +import app.passwordstore.util.git.operation.CredentialFinder +import app.passwordstore.util.settings.AuthMode import com.github.michaelbull.result.getOrElse import com.github.michaelbull.result.runCatching -import dev.msfjarvis.aps.util.git.operation.CredentialFinder -import dev.msfjarvis.aps.util.settings.AuthMode import java.io.File import java.io.IOException import java.io.InputStream diff --git a/app/src/main/java/dev/msfjarvis/aps/util/proxy/ProxyUtils.kt b/app/src/main/java/app/passwordstore/util/proxy/ProxyUtils.kt index d21ee24d..633c3904 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/proxy/ProxyUtils.kt +++ b/app/src/main/java/app/passwordstore/util/proxy/ProxyUtils.kt @@ -3,9 +3,9 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.proxy +package app.passwordstore.util.proxy -import dev.msfjarvis.aps.util.settings.GitSettings +import app.passwordstore.util.settings.GitSettings import java.io.IOException import java.net.Authenticator import java.net.InetSocketAddress diff --git a/app/src/main/java/dev/msfjarvis/aps/util/services/ClipboardService.kt b/app/src/main/java/app/passwordstore/util/services/ClipboardService.kt index 34c3a989..3d57e29b 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/services/ClipboardService.kt +++ b/app/src/main/java/app/passwordstore/util/services/ClipboardService.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.services +package app.passwordstore.util.services import android.app.Notification import android.app.NotificationChannel @@ -16,10 +16,10 @@ import android.os.IBinder import androidx.annotation.RequiresApi import androidx.core.app.NotificationCompat import androidx.core.content.getSystemService -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.util.extensions.clipboard -import dev.msfjarvis.aps.util.extensions.sharedPrefs -import dev.msfjarvis.aps.util.settings.PreferenceKeys +import app.passwordstore.R +import app.passwordstore.util.extensions.clipboard +import app.passwordstore.util.extensions.sharedPrefs +import app.passwordstore.util.settings.PreferenceKeys import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Job diff --git a/app/src/main/java/dev/msfjarvis/aps/util/services/OreoAutofillService.kt b/app/src/main/java/app/passwordstore/util/services/OreoAutofillService.kt index 3a1c69d3..54cbb3b5 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/services/OreoAutofillService.kt +++ b/app/src/main/java/app/passwordstore/util/services/OreoAutofillService.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.services +package app.passwordstore.util.services import android.content.Context import android.os.Build @@ -14,6 +14,15 @@ import android.service.autofill.FillResponse import android.service.autofill.SaveCallback import android.service.autofill.SaveRequest import androidx.annotation.RequiresApi +import app.passwordstore.BuildConfig +import app.passwordstore.R +import app.passwordstore.ui.autofill.AutofillSaveActivity +import app.passwordstore.util.autofill.Api30AutofillResponseBuilder +import app.passwordstore.util.autofill.AutofillResponseBuilder +import app.passwordstore.util.extensions.getString +import app.passwordstore.util.extensions.hasFlag +import app.passwordstore.util.extensions.sharedPrefs +import app.passwordstore.util.settings.PreferenceKeys import com.github.androidpasswordstore.autofillparser.AutofillScenario import com.github.androidpasswordstore.autofillparser.Credentials import com.github.androidpasswordstore.autofillparser.FillableForm @@ -24,15 +33,6 @@ import com.github.androidpasswordstore.autofillparser.passwordValue import com.github.androidpasswordstore.autofillparser.recoverNodes import com.github.androidpasswordstore.autofillparser.usernameValue import dagger.hilt.android.AndroidEntryPoint -import dev.msfjarvis.aps.BuildConfig -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.ui.autofill.AutofillSaveActivity -import dev.msfjarvis.aps.util.autofill.Api30AutofillResponseBuilder -import dev.msfjarvis.aps.util.autofill.AutofillResponseBuilder -import dev.msfjarvis.aps.util.extensions.getString -import dev.msfjarvis.aps.util.extensions.hasFlag -import dev.msfjarvis.aps.util.extensions.sharedPrefs -import dev.msfjarvis.aps.util.settings.PreferenceKeys import javax.inject.Inject import logcat.LogPriority.ERROR import logcat.logcat diff --git a/app/src/main/java/dev/msfjarvis/aps/util/services/PasswordExportService.kt b/app/src/main/java/app/passwordstore/util/services/PasswordExportService.kt index 91a7ac5f..536006f6 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/services/PasswordExportService.kt +++ b/app/src/main/java/app/passwordstore/util/services/PasswordExportService.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.services +package app.passwordstore.util.services import android.app.NotificationChannel import android.app.NotificationManager @@ -15,8 +15,8 @@ import android.os.IBinder import androidx.core.app.NotificationCompat import androidx.core.content.getSystemService import androidx.documentfile.provider.DocumentFile -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.repo.PasswordRepository +import app.passwordstore.R +import app.passwordstore.data.repo.PasswordRepository import java.time.LocalDateTime import java.time.format.DateTimeFormatter import java.util.Calendar diff --git a/app/src/main/java/dev/msfjarvis/aps/util/settings/GitSettings.kt b/app/src/main/java/app/passwordstore/util/settings/GitSettings.kt index 4f5187c4..1baf9640 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/settings/GitSettings.kt +++ b/app/src/main/java/app/passwordstore/util/settings/GitSettings.kt @@ -2,18 +2,18 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.settings +package app.passwordstore.util.settings import android.content.SharedPreferences import androidx.core.content.edit +import app.passwordstore.data.repo.PasswordRepository +import app.passwordstore.injection.context.FilesDirPath +import app.passwordstore.injection.prefs.GitPreferences +import app.passwordstore.injection.prefs.ProxyPreferences +import app.passwordstore.injection.prefs.SettingsPreferences +import app.passwordstore.util.extensions.getString import com.github.michaelbull.result.getOrElse import com.github.michaelbull.result.runCatching -import dev.msfjarvis.aps.data.repo.PasswordRepository -import dev.msfjarvis.aps.injection.context.FilesDirPath -import dev.msfjarvis.aps.injection.prefs.GitPreferences -import dev.msfjarvis.aps.injection.prefs.ProxyPreferences -import dev.msfjarvis.aps.injection.prefs.SettingsPreferences -import dev.msfjarvis.aps.util.extensions.getString import java.io.File import javax.inject.Inject import javax.inject.Singleton diff --git a/app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt b/app/src/main/java/app/passwordstore/util/settings/Migrations.kt index 7e91ab41..859e6360 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt +++ b/app/src/main/java/app/passwordstore/util/settings/Migrations.kt @@ -4,14 +4,14 @@ */ @file:Suppress("DEPRECATION") -package dev.msfjarvis.aps.util.settings +package app.passwordstore.util.settings import android.content.SharedPreferences import androidx.core.content.edit +import app.passwordstore.util.extensions.getString +import app.passwordstore.util.git.sshj.SshKey import com.github.michaelbull.result.get import com.github.michaelbull.result.runCatching -import dev.msfjarvis.aps.util.extensions.getString -import dev.msfjarvis.aps.util.git.sshj.SshKey import java.io.File import java.net.URI import logcat.LogPriority.ERROR diff --git a/app/src/main/java/dev/msfjarvis/aps/util/settings/PasswordSortOrder.kt b/app/src/main/java/app/passwordstore/util/settings/PasswordSortOrder.kt index 6b48b6a9..61e4b118 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/settings/PasswordSortOrder.kt +++ b/app/src/main/java/app/passwordstore/util/settings/PasswordSortOrder.kt @@ -3,14 +3,14 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.settings +package app.passwordstore.util.settings import android.content.Context import android.content.SharedPreferences -import dev.msfjarvis.aps.Application -import dev.msfjarvis.aps.data.password.PasswordItem -import dev.msfjarvis.aps.util.extensions.base64 -import dev.msfjarvis.aps.util.extensions.getString +import app.passwordstore.Application +import app.passwordstore.data.password.PasswordItem +import app.passwordstore.util.extensions.base64 +import app.passwordstore.util.extensions.getString enum class PasswordSortOrder(val comparator: java.util.Comparator<PasswordItem>) { FOLDER_FIRST( diff --git a/app/src/main/java/dev/msfjarvis/aps/util/settings/PreferenceKeys.kt b/app/src/main/java/app/passwordstore/util/settings/PreferenceKeys.kt index 7f4e0daf..16edb4c7 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/settings/PreferenceKeys.kt +++ b/app/src/main/java/app/passwordstore/util/settings/PreferenceKeys.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.settings +package app.passwordstore.util.settings object PreferenceKeys { diff --git a/app/src/main/java/dev/msfjarvis/aps/util/shortcuts/ShortcutHandler.kt b/app/src/main/java/app/passwordstore/util/shortcuts/ShortcutHandler.kt index 2ca881ed..03d14b9c 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/shortcuts/ShortcutHandler.kt +++ b/app/src/main/java/app/passwordstore/util/shortcuts/ShortcutHandler.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.shortcuts +package app.passwordstore.util.shortcuts import android.content.Context import android.content.Intent @@ -13,10 +13,10 @@ import android.graphics.drawable.Icon import android.os.Build import androidx.annotation.RequiresApi import androidx.core.content.getSystemService +import app.passwordstore.R +import app.passwordstore.data.password.PasswordItem import dagger.Reusable import dagger.hilt.android.qualifiers.ApplicationContext -import dev.msfjarvis.aps.R -import dev.msfjarvis.aps.data.password.PasswordItem import javax.inject.Inject import logcat.logcat diff --git a/app/src/main/java/dev/msfjarvis/aps/util/totp/UriTotpFinder.kt b/app/src/main/java/app/passwordstore/util/totp/UriTotpFinder.kt index 9c4dc4f4..30447690 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/totp/UriTotpFinder.kt +++ b/app/src/main/java/app/passwordstore/util/totp/UriTotpFinder.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.totp +package app.passwordstore.util.totp import android.net.Uri import javax.inject.Inject diff --git a/app/src/main/java/dev/msfjarvis/aps/util/viewmodel/SearchableRepositoryViewModel.kt b/app/src/main/java/app/passwordstore/util/viewmodel/SearchableRepositoryViewModel.kt index 5f3d04e3..8cb18309 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/viewmodel/SearchableRepositoryViewModel.kt +++ b/app/src/main/java/app/passwordstore/util/viewmodel/SearchableRepositoryViewModel.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.viewmodel +package app.passwordstore.util.viewmodel import android.app.Application import android.os.Parcelable @@ -24,15 +24,15 @@ import androidx.recyclerview.selection.StorageStrategy import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView +import app.passwordstore.data.password.PasswordItem +import app.passwordstore.data.repo.PasswordRepository +import app.passwordstore.util.autofill.AutofillPreferences +import app.passwordstore.util.autofill.DirectoryStructure +import app.passwordstore.util.extensions.sharedPrefs +import app.passwordstore.util.extensions.unsafeLazy +import app.passwordstore.util.settings.PasswordSortOrder +import app.passwordstore.util.settings.PreferenceKeys import com.github.androidpasswordstore.sublimefuzzy.Fuzzy -import dev.msfjarvis.aps.data.password.PasswordItem -import dev.msfjarvis.aps.data.repo.PasswordRepository -import dev.msfjarvis.aps.util.autofill.AutofillPreferences -import dev.msfjarvis.aps.util.autofill.DirectoryStructure -import dev.msfjarvis.aps.util.extensions.sharedPrefs -import dev.msfjarvis.aps.util.extensions.unsafeLazy -import dev.msfjarvis.aps.util.settings.PasswordSortOrder -import dev.msfjarvis.aps.util.settings.PreferenceKeys import java.io.File import java.text.Collator import java.util.Locale diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml index 6c991faa..269c5460 100644 --- a/app/src/main/res/layout/activity_git_clone.xml +++ b/app/src/main/res/layout/activity_git_clone.xml @@ -11,7 +11,7 @@ android:background="?android:attr/windowBackground" android:padding="@dimen/activity_horizontal_margin" tools:background="@color/white" - tools:context="dev.msfjarvis.aps.ui.git.config.GitServerConfigActivity"> + tools:context="app.passwordstore.ui.git.config.GitServerConfigActivity"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/activity_git_config.xml b/app/src/main/res/layout/activity_git_config.xml index 364c5287..a05dd9c4 100644 --- a/app/src/main/res/layout/activity_git_config.xml +++ b/app/src/main/res/layout/activity_git_config.xml @@ -9,7 +9,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:padding="@dimen/activity_horizontal_margin" - tools:context="dev.msfjarvis.aps.ui.git.config.GitConfigActivity" + tools:context="app.passwordstore.ui.git.config.GitConfigActivity" tools:layout_editor_absoluteX="0dp" tools:layout_editor_absoluteY="81dp"> diff --git a/app/src/main/res/layout/activity_git_log.xml b/app/src/main/res/layout/activity_git_log.xml index 33d9a761..ff542718 100644 --- a/app/src/main/res/layout/activity_git_log.xml +++ b/app/src/main/res/layout/activity_git_log.xml @@ -16,7 +16,7 @@ android:orientation="vertical" android:scrollbars="vertical" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" - tools:context=".ui.git.log.GitLogActivity" + tools:context="app.passwordstore.ui.git.log.GitLogActivity" tools:listitem="@layout/git_log_row_layout" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_onboarding.xml b/app/src/main/res/layout/activity_onboarding.xml index 61299d1c..b3b89330 100644 --- a/app/src/main/res/layout/activity_onboarding.xml +++ b/app/src/main/res/layout/activity_onboarding.xml @@ -5,7 +5,7 @@ <androidx.fragment.app.FragmentContainerView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/fragment_first_run" - android:name="dev.msfjarvis.aps.ui.onboarding.fragments.WelcomeFragment" + android:name="app.passwordstore.ui.onboarding.fragments.WelcomeFragment" android:layout_width="match_parent" android:layout_height="match_parent" android:tag="welcome_fragment" /> diff --git a/app/src/main/res/layout/activity_oreo_autofill_filter.xml b/app/src/main/res/layout/activity_oreo_autofill_filter.xml index 5bace091..eca04f62 100644 --- a/app/src/main/res/layout/activity_oreo_autofill_filter.xml +++ b/app/src/main/res/layout/activity_oreo_autofill_filter.xml @@ -9,7 +9,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:elevation="2dp" - tools:context="dev.msfjarvis.aps.ui.autofill.AutofillFilterView"> + tools:context="app.passwordstore.ui.autofill.AutofillFilterView"> <ImageView android:id="@+id/cover" diff --git a/app/src/main/res/layout/activity_oreo_autofill_publisher_changed.xml b/app/src/main/res/layout/activity_oreo_autofill_publisher_changed.xml index f0e9efbb..90b18844 100644 --- a/app/src/main/res/layout/activity_oreo_autofill_publisher_changed.xml +++ b/app/src/main/res/layout/activity_oreo_autofill_publisher_changed.xml @@ -12,7 +12,7 @@ android:elevation="2dp" android:paddingBottom="16dp" android:scrollbars="vertical" - tools:context="dev.msfjarvis.aps.ui.autofill.AutofillPublisherChangedActivity"> + tools:context="app.passwordstore.ui.autofill.AutofillPublisherChangedActivity"> <ImageView android:id="@+id/cover" diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml index 183bf467..a5fbbeec 100644 --- a/app/src/main/res/layout/decrypt_layout.xml +++ b/app/src/main/res/layout/decrypt_layout.xml @@ -10,7 +10,7 @@ android:layout_height="match_parent" android:orientation="vertical" android:paddingTop="16dp" - tools:context=".ui.crypto.DecryptActivity"> + tools:context="app.passwordstore.ui.crypto.DecryptActivity"> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/password_category" diff --git a/app/src/main/res/layout/password_creation_activity.xml b/app/src/main/res/layout/password_creation_activity.xml index 6bae6d35..c489e121 100644 --- a/app/src/main/res/layout/password_creation_activity.xml +++ b/app/src/main/res/layout/password_creation_activity.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:fillViewport="false" - tools:context=".ui.crypto.PasswordCreationActivity"> + tools:context="app.passwordstore.ui.crypto.PasswordCreationActivity"> <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/password_recycler_view.xml b/app/src/main/res/layout/password_recycler_view.xml index 4b37d007..ccd62f17 100644 --- a/app/src/main/res/layout/password_recycler_view.xml +++ b/app/src/main/res/layout/password_recycler_view.xml @@ -10,7 +10,7 @@ android:clipChildren="false" android:clipToPadding="false" android:orientation="vertical" - tools:context="dev.msfjarvis.aps.ui.passwords.PasswordFragment"> + tools:context="app.passwordstore.ui.passwords.PasswordFragment"> <androidx.swiperefreshlayout.widget.SwipeRefreshLayout android:id="@+id/swipe_refresher" diff --git a/app/src/main/res/menu/pgp_handler_select_folder.xml b/app/src/main/res/menu/pgp_handler_select_folder.xml index c723a0c5..f1d63fea 100644 --- a/app/src/main/res/menu/pgp_handler_select_folder.xml +++ b/app/src/main/res/menu/pgp_handler_select_folder.xml @@ -6,7 +6,7 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:pwstore="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - tools:context="dev.msfjarvis.aps.SelectFolderActivity"> + tools:context="app.passwordstore.SelectFolderActivity"> <item android:id="@+id/crypto_select" android:icon="@drawable/ic_done_24dp" diff --git a/app/src/nonFree/java/dev/msfjarvis/aps/autofill/oreo/ui/AutofillSmsActivity.kt b/app/src/nonFree/java/app/passwordstore/autofill/oreo/ui/AutofillSmsActivity.kt index f251773a..884d621a 100644 --- a/app/src/nonFree/java/dev/msfjarvis/aps/autofill/oreo/ui/AutofillSmsActivity.kt +++ b/app/src/nonFree/java/app/passwordstore/autofill/oreo/ui/AutofillSmsActivity.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2020 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.autofill.oreo.ui +package app.passwordstore.autofill.oreo.ui import android.app.Activity import android.app.PendingIntent @@ -17,6 +17,9 @@ import android.view.autofill.AutofillManager import androidx.annotation.RequiresApi import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope +import app.passwordstore.databinding.ActivityOreoAutofillSmsBinding +import app.passwordstore.util.autofill.AutofillResponseBuilder +import app.passwordstore.util.extensions.viewBinding import com.github.androidpasswordstore.autofillparser.AutofillAction import com.github.androidpasswordstore.autofillparser.Credentials import com.github.michaelbull.result.onFailure @@ -27,9 +30,6 @@ import com.google.android.gms.common.ConnectionResult import com.google.android.gms.common.GoogleApiAvailability import com.google.android.gms.common.api.ResolvableApiException import com.google.android.gms.tasks.Task -import dev.msfjarvis.aps.databinding.ActivityOreoAutofillSmsBinding -import dev.msfjarvis.aps.util.autofill.AutofillResponseBuilder -import dev.msfjarvis.aps.util.extensions.viewBinding import java.util.concurrent.ExecutionException import kotlin.coroutines.resume import kotlin.coroutines.resumeWithException diff --git a/app/src/nonFree/res/layout/activity_oreo_autofill_sms.xml b/app/src/nonFree/res/layout/activity_oreo_autofill_sms.xml index f5b995a3..69f8e6dc 100644 --- a/app/src/nonFree/res/layout/activity_oreo_autofill_sms.xml +++ b/app/src/nonFree/res/layout/activity_oreo_autofill_sms.xml @@ -9,7 +9,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingHorizontal="10dp" - tools:context="dev.msfjarvis.aps.ui.autofill.AutofillFilterView"> + tools:context="app.passwordstore.AutofillFilterView"> <ImageView android:id="@+id/cover" diff --git a/app/src/test/java/dev/msfjarvis/aps/util/crypto/GpgIdentifierTest.kt b/app/src/test/java/app/passwordstore/util/crypto/GpgIdentifierTest.kt index 8c3272ef..29a9dc16 100644 --- a/app/src/test/java/dev/msfjarvis/aps/util/crypto/GpgIdentifierTest.kt +++ b/app/src/test/java/app/passwordstore/util/crypto/GpgIdentifierTest.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.crypto +package app.passwordstore.util.crypto import kotlin.test.Test import kotlin.test.assertNotNull diff --git a/app/src/test/java/dev/msfjarvis/aps/util/settings/MigrationsTest.kt b/app/src/test/java/app/passwordstore/util/settings/MigrationsTest.kt index cf89d81e..d8864453 100644 --- a/app/src/test/java/dev/msfjarvis/aps/util/settings/MigrationsTest.kt +++ b/app/src/test/java/app/passwordstore/util/settings/MigrationsTest.kt @@ -4,13 +4,13 @@ */ @file:Suppress("DEPRECATION") -package dev.msfjarvis.aps.util.settings +package app.passwordstore.util.settings import android.content.Context import android.content.SharedPreferences import androidx.core.content.edit +import app.passwordstore.util.extensions.getString import com.github.ivanshafran.sharedpreferencesmock.SPMockBuilder -import dev.msfjarvis.aps.util.extensions.getString import kotlin.test.BeforeTest import kotlin.test.Test import kotlin.test.assertEquals diff --git a/app/src/test/java/dev/msfjarvis/aps/util/totp/UriTotpFinderTest.kt b/app/src/test/java/app/passwordstore/util/totp/UriTotpFinderTest.kt index 8d1d5915..c62df0e7 100644 --- a/app/src/test/java/dev/msfjarvis/aps/util/totp/UriTotpFinderTest.kt +++ b/app/src/test/java/app/passwordstore/util/totp/UriTotpFinderTest.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.totp +package app.passwordstore.util.totp import kotlin.test.Test import kotlin.test.assertEquals diff --git a/app/src/test/java/dev/msfjarvis/aps/util/viewmodel/StrictDomainRegexTest.kt b/app/src/test/java/app/passwordstore/util/viewmodel/StrictDomainRegexTest.kt index ea58460d..0792b4e5 100644 --- a/app/src/test/java/dev/msfjarvis/aps/util/viewmodel/StrictDomainRegexTest.kt +++ b/app/src/test/java/app/passwordstore/util/viewmodel/StrictDomainRegexTest.kt @@ -2,7 +2,7 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.viewmodel +package app.passwordstore.util.viewmodel import kotlin.test.Test import kotlin.test.assertFalse |