diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 734bb19f0..d493d5df1 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -27,7 +27,7 @@ android { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } - namespace = "dev.msfjarvis.aps" + namespace = "app.passwordstore" lint { abortOnError = true 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 similarity index 93% rename from app/src/free/java/dev/msfjarvis/aps/autofill/oreo/ui/AutofillSmsActivity.kt rename to app/src/free/java/app/passwordstore/autofill/oreo/ui/AutofillSmsActivity.kt index 0faf3d67a..19ebfe557 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 aed314aa5..1d78e7347 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,7 +22,7 @@ android:required="false" /> @@ -73,60 +73,60 @@ tools:node="replace" /> @@ -138,50 +138,50 @@ diff --git a/app/src/main/java/dev/msfjarvis/aps/Application.kt b/app/src/main/java/app/passwordstore/Application.kt similarity index 82% rename from app/src/main/java/dev/msfjarvis/aps/Application.kt rename to app/src/main/java/app/passwordstore/Application.kt index 6aa6e53b1..05bffbfbd 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 similarity index 88% rename from app/src/main/java/dev/msfjarvis/aps/data/crypto/CryptoRepository.kt rename to app/src/main/java/app/passwordstore/data/crypto/CryptoRepository.kt index 0e262e7ae..6c214fd1d 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 similarity index 92% rename from app/src/main/java/dev/msfjarvis/aps/data/password/FieldItem.kt rename to app/src/main/java/app/passwordstore/data/password/FieldItem.kt index e7c88ef1d..49ed4c821 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 similarity index 92% rename from app/src/main/java/dev/msfjarvis/aps/data/password/PasswordItem.kt rename to app/src/main/java/app/passwordstore/data/password/PasswordItem.kt index 82b0dc352..77497671b 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 similarity index 93% rename from app/src/main/java/dev/msfjarvis/aps/data/repo/PasswordRepository.kt rename to app/src/main/java/app/passwordstore/data/repo/PasswordRepository.kt index f675e80a4..b42b78927 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 similarity index 82% rename from app/src/main/java/dev/msfjarvis/aps/injection/context/ContextModule.kt rename to app/src/main/java/app/passwordstore/injection/context/ContextModule.kt index 41e59bf97..d8f28494e 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 similarity index 83% rename from app/src/main/java/dev/msfjarvis/aps/injection/context/FilesDirPath.kt rename to app/src/main/java/app/passwordstore/injection/context/FilesDirPath.kt index f6419354f..15da4edbc 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 similarity index 70% rename from app/src/main/java/dev/msfjarvis/aps/injection/coroutines/DispatcherModule.kt rename to app/src/main/java/app/passwordstore/injection/coroutines/DispatcherModule.kt index bf84fc274..3539845fe 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 similarity index 80% rename from app/src/main/java/dev/msfjarvis/aps/injection/crypto/CryptoHandlerModule.kt rename to app/src/main/java/app/passwordstore/injection/crypto/CryptoHandlerModule.kt index ef6a11ce7..5a863d8d8 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 similarity index 85% rename from app/src/main/java/dev/msfjarvis/aps/injection/crypto/KeyManagerModule.kt rename to app/src/main/java/app/passwordstore/injection/crypto/KeyManagerModule.kt index a1119a1c1..69174394c 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 similarity index 86% rename from app/src/main/java/dev/msfjarvis/aps/injection/prefs/GitPreferences.kt rename to app/src/main/java/app/passwordstore/injection/prefs/GitPreferences.kt index 2947a64de..c1bf271c6 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 similarity index 86% rename from app/src/main/java/dev/msfjarvis/aps/injection/prefs/PasswordGeneratorPreferences.kt rename to app/src/main/java/app/passwordstore/injection/prefs/PasswordGeneratorPreferences.kt index 14b3a6f25..832c3f049 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 similarity index 95% rename from app/src/main/java/dev/msfjarvis/aps/injection/prefs/PreferenceModule.kt rename to app/src/main/java/app/passwordstore/injection/prefs/PreferenceModule.kt index e68a998f7..072bf031a 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 similarity index 86% rename from app/src/main/java/dev/msfjarvis/aps/injection/prefs/ProxyPreferences.kt rename to app/src/main/java/app/passwordstore/injection/prefs/ProxyPreferences.kt index 5fa99140b..cedb9a29a 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 similarity index 74% rename from app/src/main/java/dev/msfjarvis/aps/injection/prefs/SettingsPreferences.kt rename to app/src/main/java/app/passwordstore/injection/prefs/SettingsPreferences.kt index 7bca03c8e..aeeec8ebf 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 similarity index 81% rename from app/src/main/java/dev/msfjarvis/aps/injection/pwgen/DicewareModule.kt rename to app/src/main/java/app/passwordstore/injection/pwgen/DicewareModule.kt index 8aed12de6..78bad7688 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 similarity index 73% rename from app/src/main/java/dev/msfjarvis/aps/injection/totp/TotpModule.kt rename to app/src/main/java/app/passwordstore/injection/totp/TotpModule.kt index 859559cd0..ed9435edf 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 similarity index 93% rename from app/src/main/java/dev/msfjarvis/aps/ui/adapters/FieldItemAdapter.kt rename to app/src/main/java/app/passwordstore/ui/adapters/FieldItemAdapter.kt index ea96f9619..590bb5c28 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, 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 similarity index 93% rename from app/src/main/java/dev/msfjarvis/aps/ui/adapters/PasswordItemRecyclerAdapter.kt rename to app/src/main/java/app/passwordstore/ui/adapters/PasswordItemRecyclerAdapter.kt index be0267c41..cb5409c52 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 similarity index 94% rename from app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillDecryptActivity.kt rename to app/src/main/java/app/passwordstore/ui/autofill/AutofillDecryptActivity.kt index b50520491..1017d3a90 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 similarity index 90% rename from app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillDecryptActivityV2.kt rename to app/src/main/java/app/passwordstore/ui/autofill/AutofillDecryptActivityV2.kt index 4fd8f026e..35d6ca44e 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 similarity index 89% rename from app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillFilterView.kt rename to app/src/main/java/app/passwordstore/ui/autofill/AutofillFilterView.kt index 89f1a7339..869904c19 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 similarity index 90% rename from app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillPublisherChangedActivity.kt rename to app/src/main/java/app/passwordstore/ui/autofill/AutofillPublisherChangedActivity.kt index 85911815e..dd54b8eb6 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 similarity index 86% rename from app/src/main/java/dev/msfjarvis/aps/ui/autofill/AutofillSaveActivity.kt rename to app/src/main/java/app/passwordstore/ui/autofill/AutofillSaveActivity.kt index a963836e4..d5cb7e1c8 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 similarity index 86% rename from app/src/main/java/dev/msfjarvis/aps/ui/autofill/PasswordViewHolder.kt rename to app/src/main/java/app/passwordstore/ui/autofill/PasswordViewHolder.kt index eacd49c3c..fdfa0eb0d 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 similarity index 93% rename from app/src/main/java/dev/msfjarvis/aps/ui/crypto/BasePgpActivity.kt rename to app/src/main/java/app/passwordstore/ui/crypto/BasePgpActivity.kt index 758a927d3..8e97b876b 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 similarity index 94% rename from app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivity.kt rename to app/src/main/java/app/passwordstore/ui/crypto/DecryptActivity.kt index af9a4ddd8..f3fac1f26 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 similarity index 92% rename from app/src/main/java/dev/msfjarvis/aps/ui/crypto/DecryptActivityV2.kt rename to app/src/main/java/app/passwordstore/ui/crypto/DecryptActivityV2.kt index 424d5c461..fc5cb90b8 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 similarity index 98% rename from app/src/main/java/dev/msfjarvis/aps/ui/crypto/GetKeyIdsActivity.kt rename to app/src/main/java/app/passwordstore/ui/crypto/GetKeyIdsActivity.kt index afd302703..2b25db0b8 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 similarity index 95% rename from app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivity.kt rename to app/src/main/java/app/passwordstore/ui/crypto/PasswordCreationActivity.kt index b1f11dfa9..f432227ec 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 similarity index 94% rename from app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordCreationActivityV2.kt rename to app/src/main/java/app/passwordstore/ui/crypto/PasswordCreationActivityV2.kt index 5792c892b..7070ce7bc 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 similarity index 90% rename from app/src/main/java/dev/msfjarvis/aps/ui/crypto/PasswordDialog.kt rename to app/src/main/java/app/passwordstore/ui/crypto/PasswordDialog.kt index d69a4686e..958ce0c1b 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 similarity index 96% rename from app/src/main/java/dev/msfjarvis/aps/ui/dialogs/BasicBottomSheet.kt rename to app/src/main/java/app/passwordstore/ui/dialogs/BasicBottomSheet.kt index 53d9a2012..c35985cb4 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 similarity index 85% rename from app/src/main/java/dev/msfjarvis/aps/ui/dialogs/DicewarePasswordGeneratorDialogFragment.kt rename to app/src/main/java/app/passwordstore/ui/dialogs/DicewarePasswordGeneratorDialogFragment.kt index 22f991c50..bb3b6f6f2 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 similarity index 92% rename from app/src/main/java/dev/msfjarvis/aps/ui/dialogs/FolderCreationDialogFragment.kt rename to app/src/main/java/app/passwordstore/ui/dialogs/FolderCreationDialogFragment.kt index 9b7b3e219..78177f10b 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 similarity index 88% rename from app/src/main/java/dev/msfjarvis/aps/ui/dialogs/ItemCreationBottomSheet.kt rename to app/src/main/java/app/passwordstore/ui/dialogs/ItemCreationBottomSheet.kt index af2a5f19e..82228f20a 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 similarity index 90% rename from app/src/main/java/dev/msfjarvis/aps/ui/dialogs/OtpImportDialogFragment.kt rename to app/src/main/java/app/passwordstore/ui/dialogs/OtpImportDialogFragment.kt index 1670d2636..4d2413d48 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 similarity index 91% rename from app/src/main/java/dev/msfjarvis/aps/ui/dialogs/PasswordGeneratorDialogFragment.kt rename to app/src/main/java/app/passwordstore/ui/dialogs/PasswordGeneratorDialogFragment.kt index e14076b15..06ce2d926 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 similarity index 87% rename from app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderActivity.kt rename to app/src/main/java/app/passwordstore/ui/folderselect/SelectFolderActivity.kt index 48ed5b79d..009267e29 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 similarity index 85% rename from app/src/main/java/dev/msfjarvis/aps/ui/folderselect/SelectFolderFragment.kt rename to app/src/main/java/app/passwordstore/ui/folderselect/SelectFolderFragment.kt index cae55ba19..577777f75 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 similarity index 88% rename from app/src/main/java/dev/msfjarvis/aps/ui/git/base/BaseGitActivity.kt rename to app/src/main/java/app/passwordstore/ui/git/base/BaseGitActivity.kt index 614d9a52e..fb9cfde37 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 similarity index 94% rename from app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitConfigActivity.kt rename to app/src/main/java/app/passwordstore/ui/git/config/GitConfigActivity.kt index 03c923137..2b5ecae5d 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 similarity index 95% rename from app/src/main/java/dev/msfjarvis/aps/ui/git/config/GitServerConfigActivity.kt rename to app/src/main/java/app/passwordstore/ui/git/config/GitServerConfigActivity.kt index 93f104fbe..9cac0fdd0 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 similarity index 86% rename from app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogActivity.kt rename to app/src/main/java/app/passwordstore/ui/git/log/GitLogActivity.kt index 4265717df..e160f16a0 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 similarity index 89% rename from app/src/main/java/dev/msfjarvis/aps/ui/git/log/GitLogAdapter.kt rename to app/src/main/java/app/passwordstore/ui/git/log/GitLogAdapter.kt index a3080fefd..29ffbe9bd 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 similarity index 79% rename from app/src/main/java/dev/msfjarvis/aps/ui/main/LaunchActivity.kt rename to app/src/main/java/app/passwordstore/ui/main/LaunchActivity.kt index 17005b6ad..6b72792a2 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 similarity index 88% rename from app/src/main/java/dev/msfjarvis/aps/ui/onboarding/activity/OnboardingActivity.kt rename to app/src/main/java/app/passwordstore/ui/onboarding/activity/OnboardingActivity.kt index 31ca362cf..2fe92098d 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 similarity index 79% rename from app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/CloneFragment.kt rename to app/src/main/java/app/passwordstore/ui/onboarding/fragments/CloneFragment.kt index e3d1df857..6702afc0e 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 similarity index 78% rename from app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/KeySelectionFragment.kt rename to app/src/main/java/app/passwordstore/ui/onboarding/fragments/KeySelectionFragment.kt index 7783e1eb9..2b32cb616 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 similarity index 72% rename from app/src/main/java/dev/msfjarvis/aps/ui/onboarding/fragments/WelcomeFragment.kt rename to app/src/main/java/app/passwordstore/ui/onboarding/fragments/WelcomeFragment.kt index ef87741f6..4d320ff75 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 similarity index 91% rename from app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordFragment.kt rename to app/src/main/java/app/passwordstore/ui/passwords/PasswordFragment.kt index c70f0b5a1..9c7011a4b 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 similarity index 93% rename from app/src/main/java/dev/msfjarvis/aps/ui/passwords/PasswordStore.kt rename to app/src/main/java/app/passwordstore/ui/passwords/PasswordStore.kt index 0ee42896a..cb77bdb7b 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 similarity index 92% rename from app/src/main/java/dev/msfjarvis/aps/ui/pgp/PGPKeyImportActivity.kt rename to app/src/main/java/app/passwordstore/ui/pgp/PGPKeyImportActivity.kt index e140ac91b..69b40a2ea 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 similarity index 86% rename from app/src/main/java/dev/msfjarvis/aps/ui/proxy/ProxySelectorActivity.kt rename to app/src/main/java/app/passwordstore/ui/proxy/ProxySelectorActivity.kt index 41cab0402..9243a7f5b 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 similarity index 95% rename from app/src/main/java/dev/msfjarvis/aps/ui/settings/AutofillSettings.kt rename to app/src/main/java/app/passwordstore/ui/settings/AutofillSettings.kt index 80dce5776..64ca531b5 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 similarity index 93% rename from app/src/main/java/dev/msfjarvis/aps/ui/settings/GeneralSettings.kt rename to app/src/main/java/app/passwordstore/ui/settings/GeneralSettings.kt index 21ecd55c0..d6520ea3c 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 similarity index 92% rename from app/src/main/java/dev/msfjarvis/aps/ui/settings/MiscSettings.kt rename to app/src/main/java/app/passwordstore/ui/settings/MiscSettings.kt index 5bb50cd86..7bd04eb5a 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 similarity index 83% rename from app/src/main/java/dev/msfjarvis/aps/ui/settings/PGPSettings.kt rename to app/src/main/java/app/passwordstore/ui/settings/PGPSettings.kt index b81af006b..b59e17bab 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 similarity index 94% rename from app/src/main/java/dev/msfjarvis/aps/ui/settings/PasswordSettings.kt rename to app/src/main/java/app/passwordstore/ui/settings/PasswordSettings.kt index db3d36706..f90a8d958 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 similarity index 87% rename from app/src/main/java/dev/msfjarvis/aps/ui/settings/RepositorySettings.kt rename to app/src/main/java/app/passwordstore/ui/settings/RepositorySettings.kt index df34b145e..c9e281239 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 similarity index 95% rename from app/src/main/java/dev/msfjarvis/aps/ui/settings/SettingsActivity.kt rename to app/src/main/java/app/passwordstore/ui/settings/SettingsActivity.kt index d31aa630a..8eae0520b 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 similarity index 91% rename from app/src/main/java/dev/msfjarvis/aps/ui/settings/SettingsProvider.kt rename to app/src/main/java/app/passwordstore/ui/settings/SettingsProvider.kt index 61b110644..6c1f80ece 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 similarity index 91% rename from app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/ShowSshKeyFragment.kt rename to app/src/main/java/app/passwordstore/ui/sshkeygen/ShowSshKeyFragment.kt index 73cd2ba16..a42d6aa1b 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 similarity index 92% rename from app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/SshKeyGenActivity.kt rename to app/src/main/java/app/passwordstore/ui/sshkeygen/SshKeyGenActivity.kt index dec0c135f..8a3d3edf0 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 similarity index 94% rename from app/src/main/java/dev/msfjarvis/aps/ui/sshkeygen/SshKeyImportActivity.kt rename to app/src/main/java/app/passwordstore/ui/sshkeygen/SshKeyImportActivity.kt index 446e0c32c..99b3bf3f7 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 similarity index 98% rename from app/src/main/java/dev/msfjarvis/aps/ui/util/OnOffItemAnimator.kt rename to app/src/main/java/app/passwordstore/ui/util/OnOffItemAnimator.kt index 494a9ed7e..c315766a2 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 similarity index 98% rename from app/src/main/java/dev/msfjarvis/aps/util/auth/BiometricAuthenticator.kt rename to app/src/main/java/app/passwordstore/util/auth/BiometricAuthenticator.kt index 38ff812a4..e9d7c3a49 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 similarity index 94% rename from app/src/main/java/dev/msfjarvis/aps/util/autofill/Api30AutofillResponseBuilder.kt rename to app/src/main/java/app/passwordstore/util/autofill/Api30AutofillResponseBuilder.kt index 745bad735..6d1f2e33d 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 similarity index 99% rename from app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillMatcher.kt rename to app/src/main/java/app/passwordstore/util/autofill/AutofillMatcher.kt index 42c1d693b..4fbccd87f 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 similarity index 94% rename from app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillPreferences.kt rename to app/src/main/java/app/passwordstore/util/autofill/AutofillPreferences.kt index 6803da47d..d99ba7a2d 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 similarity index 94% rename from app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillResponseBuilder.kt rename to app/src/main/java/app/passwordstore/util/autofill/AutofillResponseBuilder.kt index a091e206b..de542bacd 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 similarity index 95% rename from app/src/main/java/dev/msfjarvis/aps/util/autofill/AutofillViewUtils.kt rename to app/src/main/java/app/passwordstore/util/autofill/AutofillViewUtils.kt index 20414e6fe..9bf2cc8de 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 similarity index 97% rename from app/src/main/java/dev/msfjarvis/aps/util/crypto/GpgIdentifier.kt rename to app/src/main/java/app/passwordstore/util/crypto/GpgIdentifier.kt index f99b623c9..3df3e09f2 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 similarity index 95% rename from app/src/main/java/dev/msfjarvis/aps/util/extensions/AndroidExtensions.kt rename to app/src/main/java/app/passwordstore/util/extensions/AndroidExtensions.kt index cc243a091..69811e05e 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 similarity index 96% rename from app/src/main/java/dev/msfjarvis/aps/util/extensions/Extensions.kt rename to app/src/main/java/app/passwordstore/util/extensions/Extensions.kt index 8530a216e..9d81587dc 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 similarity index 94% rename from app/src/main/java/dev/msfjarvis/aps/util/extensions/FragmentExtensions.kt rename to app/src/main/java/app/passwordstore/util/extensions/FragmentExtensions.kt index 3a256ee77..fca45df6a 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 similarity index 98% rename from app/src/main/java/dev/msfjarvis/aps/util/extensions/FragmentViewBindingDelegate.kt rename to app/src/main/java/app/passwordstore/util/extensions/FragmentViewBindingDelegate.kt index fe885c860..617f3b843 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 similarity index 93% rename from app/src/main/java/dev/msfjarvis/aps/util/features/Feature.kt rename to app/src/main/java/app/passwordstore/util/features/Feature.kt index 4eef003d9..6e9e77e92 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 similarity index 81% rename from app/src/main/java/dev/msfjarvis/aps/util/features/Features.kt rename to app/src/main/java/app/passwordstore/util/features/Features.kt index 39b2c3a80..fbba15f99 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 similarity index 95% rename from app/src/main/java/dev/msfjarvis/aps/util/git/ErrorMessages.kt rename to app/src/main/java/app/passwordstore/util/git/ErrorMessages.kt index 36dc445f1..3ff932d0b 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 similarity index 92% rename from app/src/main/java/dev/msfjarvis/aps/util/git/GitCommandExecutor.kt rename to app/src/main/java/app/passwordstore/util/git/GitCommandExecutor.kt index e6eb77f5c..40fd0fffa 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 similarity index 94% rename from app/src/main/java/dev/msfjarvis/aps/util/git/GitCommit.kt rename to app/src/main/java/app/passwordstore/util/git/GitCommit.kt index 490f5e2cf..0a5d20203 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 similarity index 86% rename from app/src/main/java/dev/msfjarvis/aps/util/git/GitLogModel.kt rename to app/src/main/java/app/passwordstore/util/git/GitLogModel.kt index ed210a651..387c16d94 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 similarity index 91% rename from app/src/main/java/dev/msfjarvis/aps/util/git/operation/BreakOutOfDetached.kt rename to app/src/main/java/app/passwordstore/util/git/operation/BreakOutOfDetached.kt index 6ea9b8bb6..65629daa4 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 similarity index 85% rename from app/src/main/java/dev/msfjarvis/aps/util/git/operation/CloneOperation.kt rename to app/src/main/java/app/passwordstore/util/git/operation/CloneOperation.kt index 75db2ea55..881781252 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 similarity index 93% rename from app/src/main/java/dev/msfjarvis/aps/util/git/operation/CredentialFinder.kt rename to app/src/main/java/app/passwordstore/util/git/operation/CredentialFinder.kt index 623d69ea9..16364f0ca 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 similarity index 84% rename from app/src/main/java/dev/msfjarvis/aps/util/git/operation/GcOperation.kt rename to app/src/main/java/app/passwordstore/util/git/operation/GcOperation.kt index c070027ea..556c899e7 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 similarity index 92% rename from app/src/main/java/dev/msfjarvis/aps/util/git/operation/GitOperation.kt rename to app/src/main/java/app/passwordstore/util/git/operation/GitOperation.kt index 576a802dd..2f13b5ad6 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 similarity index 92% rename from app/src/main/java/dev/msfjarvis/aps/util/git/operation/PullOperation.kt rename to app/src/main/java/app/passwordstore/util/git/operation/PullOperation.kt index 394b7cb41..75b6fc1a3 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 similarity index 78% rename from app/src/main/java/dev/msfjarvis/aps/util/git/operation/PushOperation.kt rename to app/src/main/java/app/passwordstore/util/git/operation/PushOperation.kt index 14f16164f..386d79e69 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 similarity index 89% rename from app/src/main/java/dev/msfjarvis/aps/util/git/operation/ResetToRemoteOperation.kt rename to app/src/main/java/app/passwordstore/util/git/operation/ResetToRemoteOperation.kt index 16114f656..7c8cee939 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 similarity index 87% rename from app/src/main/java/dev/msfjarvis/aps/util/git/operation/SyncOperation.kt rename to app/src/main/java/app/passwordstore/util/git/operation/SyncOperation.kt index 589c63055..226fd753c 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 similarity index 96% rename from app/src/main/java/dev/msfjarvis/aps/util/git/sshj/ContinuationContainerActivity.kt rename to app/src/main/java/app/passwordstore/util/git/sshj/ContinuationContainerActivity.kt index 523ff5b6c..10872a246 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 similarity index 97% rename from app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainKeyProvider.kt rename to app/src/main/java/app/passwordstore/util/git/sshj/OpenKeychainKeyProvider.kt index 8436d1ce4..7603059fe 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 similarity index 98% rename from app/src/main/java/dev/msfjarvis/aps/util/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt rename to app/src/main/java/app/passwordstore/util/git/sshj/OpenKeychainWrappedKeyAlgorithmFactory.kt index c5cb6eaa4..611ba9e06 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 similarity index 97% rename from app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshKey.kt rename to app/src/main/java/app/passwordstore/util/git/sshj/SshKey.kt index ea96af538..15753da95 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 similarity index 99% rename from app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshjConfig.kt rename to app/src/main/java/app/passwordstore/util/git/sshj/SshjConfig.kt index 948fbd353..7522de500 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 similarity index 98% rename from app/src/main/java/dev/msfjarvis/aps/util/git/sshj/SshjSessionFactory.kt rename to app/src/main/java/app/passwordstore/util/git/sshj/SshjSessionFactory.kt index a9f84fa91..b7f0542fc 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 similarity index 96% rename from app/src/main/java/dev/msfjarvis/aps/util/proxy/ProxyUtils.kt rename to app/src/main/java/app/passwordstore/util/proxy/ProxyUtils.kt index d21ee24d3..633c3904f 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 similarity index 96% rename from app/src/main/java/dev/msfjarvis/aps/util/services/ClipboardService.kt rename to app/src/main/java/app/passwordstore/util/services/ClipboardService.kt index 34c3a9895..3d57e29bd 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 similarity index 91% rename from app/src/main/java/dev/msfjarvis/aps/util/services/OreoAutofillService.kt rename to app/src/main/java/app/passwordstore/util/services/OreoAutofillService.kt index 3a1c69d32..54cbb3b5a 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 similarity index 97% rename from app/src/main/java/dev/msfjarvis/aps/util/services/PasswordExportService.kt rename to app/src/main/java/app/passwordstore/util/services/PasswordExportService.kt index 91a7ac5f7..536006f60 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 similarity index 94% rename from app/src/main/java/dev/msfjarvis/aps/util/settings/GitSettings.kt rename to app/src/main/java/app/passwordstore/util/settings/GitSettings.kt index 4f5187c42..1baf96409 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 similarity index 97% rename from app/src/main/java/dev/msfjarvis/aps/util/settings/Migrations.kt rename to app/src/main/java/app/passwordstore/util/settings/Migrations.kt index 7e91ab41b..859e63603 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 similarity index 87% rename from app/src/main/java/dev/msfjarvis/aps/util/settings/PasswordSortOrder.kt rename to app/src/main/java/app/passwordstore/util/settings/PasswordSortOrder.kt index 6b48b6a9b..61e4b1181 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) { 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 similarity index 98% rename from app/src/main/java/dev/msfjarvis/aps/util/settings/PreferenceKeys.kt rename to app/src/main/java/app/passwordstore/util/settings/PreferenceKeys.kt index 7f4e0dafc..16edb4c7e 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 similarity index 97% rename from app/src/main/java/dev/msfjarvis/aps/util/shortcuts/ShortcutHandler.kt rename to app/src/main/java/app/passwordstore/util/shortcuts/ShortcutHandler.kt index 2ca881ed9..03d14b9cf 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 similarity index 97% rename from app/src/main/java/dev/msfjarvis/aps/util/totp/UriTotpFinder.kt rename to app/src/main/java/app/passwordstore/util/totp/UriTotpFinder.kt index 9c4dc4f4a..304476907 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 similarity index 97% rename from app/src/main/java/dev/msfjarvis/aps/util/viewmodel/SearchableRepositoryViewModel.kt rename to app/src/main/java/app/passwordstore/util/viewmodel/SearchableRepositoryViewModel.kt index 5f3d04e33..8cb18309e 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 6c991faa4..269c5460a 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"> diff --git a/app/src/main/res/layout/activity_git_log.xml b/app/src/main/res/layout/activity_git_log.xml index 33d9a7616..ff5427183 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" /> diff --git a/app/src/main/res/layout/activity_onboarding.xml b/app/src/main/res/layout/activity_onboarding.xml index 61299d1cf..b3b89330c 100644 --- a/app/src/main/res/layout/activity_onboarding.xml +++ b/app/src/main/res/layout/activity_onboarding.xml @@ -5,7 +5,7 @@ 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 5bace091f..eca04f62b 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"> + tools:context="app.passwordstore.ui.autofill.AutofillPublisherChangedActivity"> + tools:context="app.passwordstore.ui.crypto.DecryptActivity"> + tools:context="app.passwordstore.ui.crypto.PasswordCreationActivity"> + tools:context="app.passwordstore.ui.passwords.PasswordFragment"> + tools:context="app.passwordstore.SelectFolderActivity"> + tools:context="app.passwordstore.AutofillFilterView"> { /** * Inserts a [key] into the store. If the key already exists, this method will return - * [dev.msfjarvis.aps.crypto.errors.KeyAlreadyExistsException] unless [replace] is `true`. + * [app.passwordstore.crypto.errors.KeyAlreadyExistsException] unless [replace] is `true`. */ public suspend fun addKey(key: Key, replace: Boolean = false): Result diff --git a/crypto-common/src/main/kotlin/dev/msfjarvis/aps/crypto/errors/CryptoException.kt b/crypto-common/src/main/kotlin/app/passwordstore/crypto/errors/CryptoException.kt similarity index 92% rename from crypto-common/src/main/kotlin/dev/msfjarvis/aps/crypto/errors/CryptoException.kt rename to crypto-common/src/main/kotlin/app/passwordstore/crypto/errors/CryptoException.kt index b795bbf1d..81bdf95f8 100644 --- a/crypto-common/src/main/kotlin/dev/msfjarvis/aps/crypto/errors/CryptoException.kt +++ b/crypto-common/src/main/kotlin/app/passwordstore/crypto/errors/CryptoException.kt @@ -1,6 +1,6 @@ -package dev.msfjarvis.aps.crypto.errors +package app.passwordstore.crypto.errors -import dev.msfjarvis.aps.crypto.KeyManager +import app.passwordstore.crypto.KeyManager public sealed class CryptoException(message: String? = null, cause: Throwable? = null) : Exception(message, cause) @@ -30,7 +30,7 @@ public class KeyNotFoundException(keyId: String) : public class KeyAlreadyExistsException(keyId: String) : KeyManagerException("Pre-existing key was found for $keyId") -/** Sealed exception types for [dev.msfjarvis.aps.crypto.CryptoHandler]. */ +/** Sealed exception types for [app.passwordstore.crypto.CryptoHandler]. */ public sealed class CryptoHandlerException(message: String? = null, cause: Throwable? = null) : CryptoException(message, cause) diff --git a/crypto-pgpainless/src/main/kotlin/dev/msfjarvis/aps/crypto/GpgIdentifier.kt b/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/GpgIdentifier.kt similarity index 99% rename from crypto-pgpainless/src/main/kotlin/dev/msfjarvis/aps/crypto/GpgIdentifier.kt rename to crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/GpgIdentifier.kt index b7dcdd0df..4aa4a57a2 100644 --- a/crypto-pgpainless/src/main/kotlin/dev/msfjarvis/aps/crypto/GpgIdentifier.kt +++ b/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/GpgIdentifier.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.crypto +package app.passwordstore.crypto import java.util.Locale import java.util.regex.Pattern diff --git a/crypto-pgpainless/src/main/kotlin/dev/msfjarvis/aps/crypto/KeyUtils.kt b/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/KeyUtils.kt similarity index 93% rename from crypto-pgpainless/src/main/kotlin/dev/msfjarvis/aps/crypto/KeyUtils.kt rename to crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/KeyUtils.kt index 1251463a5..394787514 100644 --- a/crypto-pgpainless/src/main/kotlin/dev/msfjarvis/aps/crypto/KeyUtils.kt +++ b/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/KeyUtils.kt @@ -3,11 +3,11 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.crypto +package app.passwordstore.crypto +import app.passwordstore.crypto.GpgIdentifier.KeyId import com.github.michaelbull.result.get import com.github.michaelbull.result.runCatching -import dev.msfjarvis.aps.crypto.GpgIdentifier.KeyId import org.bouncycastle.openpgp.PGPKeyRing import org.pgpainless.PGPainless diff --git a/crypto-pgpainless/src/main/kotlin/dev/msfjarvis/aps/crypto/PGPKey.kt b/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKey.kt similarity index 92% rename from crypto-pgpainless/src/main/kotlin/dev/msfjarvis/aps/crypto/PGPKey.kt rename to crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKey.kt index 2e1311a1a..a33655d47 100644 --- a/crypto-pgpainless/src/main/kotlin/dev/msfjarvis/aps/crypto/PGPKey.kt +++ b/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKey.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.crypto +package app.passwordstore.crypto /** * A simple value class wrapping over a [ByteArray] that can represent a PGP key. The implementation diff --git a/crypto-pgpainless/src/main/kotlin/dev/msfjarvis/aps/crypto/PGPKeyManager.kt b/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKeyManager.kt similarity index 88% rename from crypto-pgpainless/src/main/kotlin/dev/msfjarvis/aps/crypto/PGPKeyManager.kt rename to crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKeyManager.kt index 137bd141f..a80b5dcbd 100644 --- a/crypto-pgpainless/src/main/kotlin/dev/msfjarvis/aps/crypto/PGPKeyManager.kt +++ b/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPKeyManager.kt @@ -4,19 +4,19 @@ */ @file:Suppress("BlockingMethodInNonBlockingContext") -package dev.msfjarvis.aps.crypto +package app.passwordstore.crypto import androidx.annotation.VisibleForTesting +import app.passwordstore.crypto.KeyUtils.tryGetId +import app.passwordstore.crypto.KeyUtils.tryParseKeyring +import app.passwordstore.crypto.errors.InvalidKeyException +import app.passwordstore.crypto.errors.KeyAlreadyExistsException +import app.passwordstore.crypto.errors.KeyDeletionFailedException +import app.passwordstore.crypto.errors.KeyDirectoryUnavailableException +import app.passwordstore.crypto.errors.KeyNotFoundException +import app.passwordstore.crypto.errors.NoKeysAvailableException +import app.passwordstore.util.coroutines.runSuspendCatching import com.github.michaelbull.result.Result -import dev.msfjarvis.aps.crypto.KeyUtils.tryGetId -import dev.msfjarvis.aps.crypto.KeyUtils.tryParseKeyring -import dev.msfjarvis.aps.crypto.errors.InvalidKeyException -import dev.msfjarvis.aps.crypto.errors.KeyAlreadyExistsException -import dev.msfjarvis.aps.crypto.errors.KeyDeletionFailedException -import dev.msfjarvis.aps.crypto.errors.KeyDirectoryUnavailableException -import dev.msfjarvis.aps.crypto.errors.KeyNotFoundException -import dev.msfjarvis.aps.crypto.errors.NoKeysAvailableException -import dev.msfjarvis.aps.util.coroutines.runSuspendCatching import java.io.File import javax.inject.Inject import kotlinx.coroutines.CoroutineDispatcher diff --git a/crypto-pgpainless/src/main/kotlin/dev/msfjarvis/aps/crypto/PGPainlessCryptoHandler.kt b/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt similarity index 94% rename from crypto-pgpainless/src/main/kotlin/dev/msfjarvis/aps/crypto/PGPainlessCryptoHandler.kt rename to crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt index 24b3e665e..440b162ef 100644 --- a/crypto-pgpainless/src/main/kotlin/dev/msfjarvis/aps/crypto/PGPainlessCryptoHandler.kt +++ b/crypto-pgpainless/src/main/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandler.kt @@ -3,15 +3,15 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.crypto +package app.passwordstore.crypto +import app.passwordstore.crypto.errors.CryptoHandlerException +import app.passwordstore.crypto.errors.IncorrectPassphraseException +import app.passwordstore.crypto.errors.NoKeysProvided +import app.passwordstore.crypto.errors.UnknownError import com.github.michaelbull.result.Result import com.github.michaelbull.result.mapError import com.github.michaelbull.result.runCatching -import dev.msfjarvis.aps.crypto.errors.CryptoHandlerException -import dev.msfjarvis.aps.crypto.errors.IncorrectPassphraseException -import dev.msfjarvis.aps.crypto.errors.NoKeysProvided -import dev.msfjarvis.aps.crypto.errors.UnknownError import java.io.ByteArrayInputStream import java.io.InputStream import java.io.OutputStream diff --git a/crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/CryptoConstants.kt b/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/CryptoConstants.kt similarity index 91% rename from crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/CryptoConstants.kt rename to crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/CryptoConstants.kt index ede8f08da..d827e1699 100644 --- a/crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/CryptoConstants.kt +++ b/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/CryptoConstants.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.crypto +package app.passwordstore.crypto object CryptoConstants { const val KEY_PASSPHRASE = "hunter2" diff --git a/crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/GpgIdentifierTest.kt b/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/GpgIdentifierTest.kt similarity index 96% rename from crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/GpgIdentifierTest.kt rename to crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/GpgIdentifierTest.kt index aaf20cd8e..009976a2f 100644 --- a/crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/GpgIdentifierTest.kt +++ b/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/GpgIdentifierTest.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.crypto +package app.passwordstore.crypto import kotlin.test.Test import kotlin.test.assertNotNull diff --git a/crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/KeyUtilsTest.kt b/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/KeyUtilsTest.kt similarity index 74% rename from crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/KeyUtilsTest.kt rename to crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/KeyUtilsTest.kt index 33597f9fa..209865eaf 100644 --- a/crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/KeyUtilsTest.kt +++ b/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/KeyUtilsTest.kt @@ -1,8 +1,8 @@ -package dev.msfjarvis.aps.crypto +package app.passwordstore.crypto -import dev.msfjarvis.aps.crypto.KeyUtils.tryGetId -import dev.msfjarvis.aps.crypto.KeyUtils.tryParseKeyring -import dev.msfjarvis.aps.crypto.TestUtils.getArmoredPrivateKeyWithMultipleIdentities +import app.passwordstore.crypto.KeyUtils.tryGetId +import app.passwordstore.crypto.KeyUtils.tryParseKeyring +import app.passwordstore.crypto.TestUtils.getArmoredPrivateKeyWithMultipleIdentities import kotlin.test.Test import kotlin.test.assertEquals import kotlin.test.assertIs diff --git a/crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/PGPKeyManagerTest.kt b/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPKeyManagerTest.kt similarity index 93% rename from crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/PGPKeyManagerTest.kt rename to crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPKeyManagerTest.kt index 60436d3b3..c446cee48 100644 --- a/crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/PGPKeyManagerTest.kt +++ b/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPKeyManagerTest.kt @@ -1,13 +1,13 @@ -package dev.msfjarvis.aps.crypto +package app.passwordstore.crypto +import app.passwordstore.crypto.GpgIdentifier.KeyId +import app.passwordstore.crypto.GpgIdentifier.UserId +import app.passwordstore.crypto.TestUtils.getArmoredPrivateKeyWithMultipleIdentities +import app.passwordstore.crypto.errors.KeyAlreadyExistsException +import app.passwordstore.crypto.errors.KeyNotFoundException +import app.passwordstore.crypto.errors.NoKeysAvailableException import com.github.michaelbull.result.unwrap import com.github.michaelbull.result.unwrapError -import dev.msfjarvis.aps.crypto.GpgIdentifier.KeyId -import dev.msfjarvis.aps.crypto.GpgIdentifier.UserId -import dev.msfjarvis.aps.crypto.TestUtils.getArmoredPrivateKeyWithMultipleIdentities -import dev.msfjarvis.aps.crypto.errors.KeyAlreadyExistsException -import dev.msfjarvis.aps.crypto.errors.KeyNotFoundException -import dev.msfjarvis.aps.crypto.errors.NoKeysAvailableException import java.io.File import kotlin.test.AfterTest import kotlin.test.BeforeTest diff --git a/crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/PGPainlessCryptoHandlerTest.kt b/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandlerTest.kt similarity index 96% rename from crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/PGPainlessCryptoHandlerTest.kt rename to crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandlerTest.kt index e39bc06e3..60e8fb6e4 100644 --- a/crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/PGPainlessCryptoHandlerTest.kt +++ b/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/PGPainlessCryptoHandlerTest.kt @@ -3,13 +3,13 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.crypto +package app.passwordstore.crypto +import app.passwordstore.crypto.errors.IncorrectPassphraseException import com.github.michaelbull.result.Err import com.github.michaelbull.result.getError import com.google.testing.junit.testparameterinjector.TestParameter import com.google.testing.junit.testparameterinjector.TestParameterInjector -import dev.msfjarvis.aps.crypto.errors.IncorrectPassphraseException import java.io.ByteArrayOutputStream import kotlin.test.Test import kotlin.test.assertEquals diff --git a/crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/TestUtils.kt b/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/TestUtils.kt similarity index 95% rename from crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/TestUtils.kt rename to crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/TestUtils.kt index d002180d4..1e5aea8c1 100644 --- a/crypto-pgpainless/src/test/kotlin/dev/msfjarvis/aps/crypto/TestUtils.kt +++ b/crypto-pgpainless/src/test/kotlin/app/passwordstore/crypto/TestUtils.kt @@ -4,7 +4,7 @@ */ @file:Suppress("RECEIVER_NULLABILITY_MISMATCH_BASED_ON_JAVA_ANNOTATIONS") -package dev.msfjarvis.aps.crypto +package app.passwordstore.crypto object TestUtils { fun getArmoredPrivateKey() = this::class.java.classLoader.getResource("private_key").readBytes() diff --git a/format-common/src/main/AndroidManifest.xml b/format-common/src/main/AndroidManifest.xml deleted file mode 100644 index 4148bbbb8..000000000 --- a/format-common/src/main/AndroidManifest.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - diff --git a/format-common/src/main/kotlin/dev/msfjarvis/aps/data/passfile/PasswordEntry.kt b/format-common/src/main/kotlin/app/passwordstore/data/passfile/PasswordEntry.kt similarity index 97% rename from format-common/src/main/kotlin/dev/msfjarvis/aps/data/passfile/PasswordEntry.kt rename to format-common/src/main/kotlin/app/passwordstore/data/passfile/PasswordEntry.kt index a0a85f3e4..9543eb8c2 100644 --- a/format-common/src/main/kotlin/dev/msfjarvis/aps/data/passfile/PasswordEntry.kt +++ b/format-common/src/main/kotlin/app/passwordstore/data/passfile/PasswordEntry.kt @@ -3,15 +3,15 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.data.passfile +package app.passwordstore.data.passfile +import app.passwordstore.util.time.UserClock +import app.passwordstore.util.totp.Otp +import app.passwordstore.util.totp.TotpFinder import com.github.michaelbull.result.mapBoth import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject -import dev.msfjarvis.aps.util.time.UserClock -import dev.msfjarvis.aps.util.totp.Otp -import dev.msfjarvis.aps.util.totp.TotpFinder import kotlin.collections.set import kotlin.coroutines.coroutineContext import kotlin.time.Duration.Companion.seconds diff --git a/format-common/src/main/kotlin/dev/msfjarvis/aps/data/passfile/Totp.kt b/format-common/src/main/kotlin/app/passwordstore/data/passfile/Totp.kt similarity index 86% rename from format-common/src/main/kotlin/dev/msfjarvis/aps/data/passfile/Totp.kt rename to format-common/src/main/kotlin/app/passwordstore/data/passfile/Totp.kt index a43cce6a2..2f42977bd 100644 --- a/format-common/src/main/kotlin/dev/msfjarvis/aps/data/passfile/Totp.kt +++ b/format-common/src/main/kotlin/app/passwordstore/data/passfile/Totp.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.aps.data.passfile +package app.passwordstore.data.passfile import kotlin.time.Duration import kotlin.time.ExperimentalTime diff --git a/format-common/src/main/kotlin/dev/msfjarvis/aps/util/time/Clocks.kt b/format-common/src/main/kotlin/app/passwordstore/util/time/Clocks.kt similarity index 94% rename from format-common/src/main/kotlin/dev/msfjarvis/aps/util/time/Clocks.kt rename to format-common/src/main/kotlin/app/passwordstore/util/time/Clocks.kt index 087a5028c..4ffeb6a6a 100644 --- a/format-common/src/main/kotlin/dev/msfjarvis/aps/util/time/Clocks.kt +++ b/format-common/src/main/kotlin/app/passwordstore/util/time/Clocks.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.time +package app.passwordstore.util.time import java.time.Clock import java.time.Instant diff --git a/format-common/src/main/kotlin/dev/msfjarvis/aps/util/totp/Otp.kt b/format-common/src/main/kotlin/app/passwordstore/util/totp/Otp.kt similarity index 98% rename from format-common/src/main/kotlin/dev/msfjarvis/aps/util/totp/Otp.kt rename to format-common/src/main/kotlin/app/passwordstore/util/totp/Otp.kt index 1a548d92d..72d5cffe6 100644 --- a/format-common/src/main/kotlin/dev/msfjarvis/aps/util/totp/Otp.kt +++ b/format-common/src/main/kotlin/app/passwordstore/util/totp/Otp.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.totp +package app.passwordstore.util.totp import com.github.michaelbull.result.Err import com.github.michaelbull.result.runCatching diff --git a/format-common/src/main/kotlin/dev/msfjarvis/aps/util/totp/TotpFinder.kt b/format-common/src/main/kotlin/app/passwordstore/util/totp/TotpFinder.kt similarity index 96% rename from format-common/src/main/kotlin/dev/msfjarvis/aps/util/totp/TotpFinder.kt rename to format-common/src/main/kotlin/app/passwordstore/util/totp/TotpFinder.kt index 1cb7de97a..d53d76dc9 100644 --- a/format-common/src/main/kotlin/dev/msfjarvis/aps/util/totp/TotpFinder.kt +++ b/format-common/src/main/kotlin/app/passwordstore/util/totp/TotpFinder.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.totp +package app.passwordstore.util.totp /** Defines a class that can extract relevant parts of a TOTP URL for use by the app. */ public interface TotpFinder { diff --git a/format-common/src/test/kotlin/dev/msfjarvis/aps/data/passfile/PasswordEntryTest.kt b/format-common/src/test/kotlin/app/passwordstore/data/passfile/PasswordEntryTest.kt similarity index 97% rename from format-common/src/test/kotlin/dev/msfjarvis/aps/data/passfile/PasswordEntryTest.kt rename to format-common/src/test/kotlin/app/passwordstore/data/passfile/PasswordEntryTest.kt index 27fbe0e21..f492604da 100644 --- a/format-common/src/test/kotlin/dev/msfjarvis/aps/data/passfile/PasswordEntryTest.kt +++ b/format-common/src/test/kotlin/app/passwordstore/data/passfile/PasswordEntryTest.kt @@ -3,13 +3,13 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.data.passfile +package app.passwordstore.data.passfile import app.cash.turbine.test -import dev.msfjarvis.aps.test.CoroutineTestRule -import dev.msfjarvis.aps.util.time.TestUserClock -import dev.msfjarvis.aps.util.time.UserClock -import dev.msfjarvis.aps.util.totp.TotpFinder +import app.passwordstore.test.CoroutineTestRule +import app.passwordstore.util.time.TestUserClock +import app.passwordstore.util.time.UserClock +import app.passwordstore.util.totp.TotpFinder import java.util.Locale import kotlin.test.Test import kotlin.test.assertEquals diff --git a/format-common/src/test/kotlin/dev/msfjarvis/aps/util/time/TestClocks.kt b/format-common/src/test/kotlin/app/passwordstore/util/time/TestClocks.kt similarity index 95% rename from format-common/src/test/kotlin/dev/msfjarvis/aps/util/time/TestClocks.kt rename to format-common/src/test/kotlin/app/passwordstore/util/time/TestClocks.kt index ee74a40d6..8a860a394 100644 --- a/format-common/src/test/kotlin/dev/msfjarvis/aps/util/time/TestClocks.kt +++ b/format-common/src/test/kotlin/app/passwordstore/util/time/TestClocks.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.time +package app.passwordstore.util.time import java.time.Clock import java.time.Instant diff --git a/format-common/src/test/kotlin/dev/msfjarvis/aps/util/totp/OtpTest.kt b/format-common/src/test/kotlin/app/passwordstore/util/totp/OtpTest.kt similarity index 98% rename from format-common/src/test/kotlin/dev/msfjarvis/aps/util/totp/OtpTest.kt rename to format-common/src/test/kotlin/app/passwordstore/util/totp/OtpTest.kt index db74de3ed..bf8cd186b 100644 --- a/format-common/src/test/kotlin/dev/msfjarvis/aps/util/totp/OtpTest.kt +++ b/format-common/src/test/kotlin/app/passwordstore/util/totp/OtpTest.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.util.totp +package app.passwordstore.util.totp import com.github.michaelbull.result.get import kotlin.test.Test diff --git a/passgen/diceware/build.gradle.kts b/passgen/diceware/build.gradle.kts index 40c703c54..f612b691e 100644 --- a/passgen/diceware/build.gradle.kts +++ b/passgen/diceware/build.gradle.kts @@ -11,7 +11,7 @@ plugins { android { sourceSets { getByName("test") { resources.srcDir("src/main/res/raw") } } - namespace = "dev.msfjarvis.aps.passgen.diceware" + namespace = "app.passwordstore.passgen.diceware" } dependencies { diff --git a/passgen/diceware/src/main/kotlin/dev/msfjarvis/aps/passgen/diceware/DicewarePassphraseGenerator.kt b/passgen/diceware/src/main/kotlin/app/passwordstore/passgen/diceware/DicewarePassphraseGenerator.kt similarity index 95% rename from passgen/diceware/src/main/kotlin/dev/msfjarvis/aps/passgen/diceware/DicewarePassphraseGenerator.kt rename to passgen/diceware/src/main/kotlin/app/passwordstore/passgen/diceware/DicewarePassphraseGenerator.kt index 62e3b97b4..841eb31b2 100644 --- a/passgen/diceware/src/main/kotlin/dev/msfjarvis/aps/passgen/diceware/DicewarePassphraseGenerator.kt +++ b/passgen/diceware/src/main/kotlin/app/passwordstore/passgen/diceware/DicewarePassphraseGenerator.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.passgen.diceware +package app.passwordstore.passgen.diceware import java.io.InputStream import javax.inject.Inject diff --git a/passgen/diceware/src/main/kotlin/dev/msfjarvis/aps/passgen/diceware/Die.kt b/passgen/diceware/src/main/kotlin/app/passwordstore/passgen/diceware/Die.kt similarity index 94% rename from passgen/diceware/src/main/kotlin/dev/msfjarvis/aps/passgen/diceware/Die.kt rename to passgen/diceware/src/main/kotlin/app/passwordstore/passgen/diceware/Die.kt index d6e5aa234..e3db4b807 100644 --- a/passgen/diceware/src/main/kotlin/dev/msfjarvis/aps/passgen/diceware/Die.kt +++ b/passgen/diceware/src/main/kotlin/app/passwordstore/passgen/diceware/Die.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.passgen.diceware +package app.passwordstore.passgen.diceware import javax.inject.Inject diff --git a/passgen/diceware/src/main/kotlin/dev/msfjarvis/aps/passgen/diceware/RandomIntGenerator.kt b/passgen/diceware/src/main/kotlin/app/passwordstore/passgen/diceware/RandomIntGenerator.kt similarity index 91% rename from passgen/diceware/src/main/kotlin/dev/msfjarvis/aps/passgen/diceware/RandomIntGenerator.kt rename to passgen/diceware/src/main/kotlin/app/passwordstore/passgen/diceware/RandomIntGenerator.kt index 7f957419a..18a828a61 100644 --- a/passgen/diceware/src/main/kotlin/dev/msfjarvis/aps/passgen/diceware/RandomIntGenerator.kt +++ b/passgen/diceware/src/main/kotlin/app/passwordstore/passgen/diceware/RandomIntGenerator.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.passgen.diceware +package app.passwordstore.passgen.diceware /** * SAM interface that takes in an [IntRange] and returns a randomly chosen [Int] within its bounds. diff --git a/passgen/diceware/src/main/kotlin/dev/msfjarvis/aps/passgen/diceware/WordListParser.kt b/passgen/diceware/src/main/kotlin/app/passwordstore/passgen/diceware/WordListParser.kt similarity index 92% rename from passgen/diceware/src/main/kotlin/dev/msfjarvis/aps/passgen/diceware/WordListParser.kt rename to passgen/diceware/src/main/kotlin/app/passwordstore/passgen/diceware/WordListParser.kt index 5351aaa1d..6c7f53101 100644 --- a/passgen/diceware/src/main/kotlin/dev/msfjarvis/aps/passgen/diceware/WordListParser.kt +++ b/passgen/diceware/src/main/kotlin/app/passwordstore/passgen/diceware/WordListParser.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.passgen.diceware +package app.passwordstore.passgen.diceware import java.io.InputStream diff --git a/passgen/diceware/src/test/kotlin/dev/msfjarvis/aps/passgen/diceware/DicewarePassphraseGeneratorTest.kt b/passgen/diceware/src/test/kotlin/app/passwordstore/passgen/diceware/DicewarePassphraseGeneratorTest.kt similarity index 94% rename from passgen/diceware/src/test/kotlin/dev/msfjarvis/aps/passgen/diceware/DicewarePassphraseGeneratorTest.kt rename to passgen/diceware/src/test/kotlin/app/passwordstore/passgen/diceware/DicewarePassphraseGeneratorTest.kt index 236be708e..69febaf1e 100644 --- a/passgen/diceware/src/test/kotlin/dev/msfjarvis/aps/passgen/diceware/DicewarePassphraseGeneratorTest.kt +++ b/passgen/diceware/src/test/kotlin/app/passwordstore/passgen/diceware/DicewarePassphraseGeneratorTest.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.passgen.diceware +package app.passwordstore.passgen.diceware import kotlin.random.Random import kotlin.test.assertEquals diff --git a/passgen/diceware/src/test/kotlin/dev/msfjarvis/aps/passgen/diceware/DieTest.kt b/passgen/diceware/src/test/kotlin/app/passwordstore/passgen/diceware/DieTest.kt similarity index 95% rename from passgen/diceware/src/test/kotlin/dev/msfjarvis/aps/passgen/diceware/DieTest.kt rename to passgen/diceware/src/test/kotlin/app/passwordstore/passgen/diceware/DieTest.kt index 7f6398f62..725d80f7c 100644 --- a/passgen/diceware/src/test/kotlin/dev/msfjarvis/aps/passgen/diceware/DieTest.kt +++ b/passgen/diceware/src/test/kotlin/app/passwordstore/passgen/diceware/DieTest.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.passgen.diceware +package app.passwordstore.passgen.diceware import kotlin.random.Random import kotlin.test.Test diff --git a/passgen/diceware/src/test/kotlin/dev/msfjarvis/aps/passgen/diceware/WordListParserTest.kt b/passgen/diceware/src/test/kotlin/app/passwordstore/passgen/diceware/WordListParserTest.kt similarity index 95% rename from passgen/diceware/src/test/kotlin/dev/msfjarvis/aps/passgen/diceware/WordListParserTest.kt rename to passgen/diceware/src/test/kotlin/app/passwordstore/passgen/diceware/WordListParserTest.kt index 9364085d1..bcb85cb43 100644 --- a/passgen/diceware/src/test/kotlin/dev/msfjarvis/aps/passgen/diceware/WordListParserTest.kt +++ b/passgen/diceware/src/test/kotlin/app/passwordstore/passgen/diceware/WordListParserTest.kt @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.passgen.diceware +package app.passwordstore.passgen.diceware import java.io.InputStream import kotlin.test.Test diff --git a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/PasswordGenerator.kt b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/PasswordGenerator.kt similarity index 96% rename from passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/PasswordGenerator.kt rename to passgen/random/src/main/kotlin/app/passwordstore/passgen/random/PasswordGenerator.kt index fcd283111..4f08904d2 100644 --- a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/PasswordGenerator.kt +++ b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/PasswordGenerator.kt @@ -2,10 +2,10 @@ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. * SPDX-License-Identifier: GPL-3.0-only */ -package dev.msfjarvis.aps.passgen.random +package app.passwordstore.passgen.random -import dev.msfjarvis.aps.passgen.random.util.clearFlag -import dev.msfjarvis.aps.passgen.random.util.hasFlag +import app.passwordstore.passgen.random.util.clearFlag +import app.passwordstore.passgen.random.util.hasFlag public object PasswordGenerator { diff --git a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/PasswordGeneratorException.kt b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/PasswordGeneratorException.kt similarity index 89% rename from passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/PasswordGeneratorException.kt rename to passgen/random/src/main/kotlin/app/passwordstore/passgen/random/PasswordGeneratorException.kt index b7d70c392..16ebdc909 100644 --- a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/PasswordGeneratorException.kt +++ b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/PasswordGeneratorException.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.aps.passgen.random +package app.passwordstore.passgen.random public sealed class PasswordGeneratorException(message: String? = null, cause: Throwable? = null) : Throwable(message, cause) diff --git a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/PasswordOption.kt b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/PasswordOption.kt similarity index 83% rename from passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/PasswordOption.kt rename to passgen/random/src/main/kotlin/app/passwordstore/passgen/random/PasswordOption.kt index 70d0da22d..ead3b02a6 100644 --- a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/PasswordOption.kt +++ b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/PasswordOption.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.aps.passgen.random +package app.passwordstore.passgen.random public enum class PasswordOption(public val key: String) { NoDigits("0"), diff --git a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/RandomNumberGenerator.kt b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/RandomNumberGenerator.kt similarity index 96% rename from passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/RandomNumberGenerator.kt rename to passgen/random/src/main/kotlin/app/passwordstore/passgen/random/RandomNumberGenerator.kt index 3bb343256..4ea3a9238 100644 --- a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/RandomNumberGenerator.kt +++ b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/RandomNumberGenerator.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.passgen.random +package app.passwordstore.passgen.random import java.security.SecureRandom diff --git a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/RandomPasswordGenerator.kt b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/RandomPasswordGenerator.kt similarity index 95% rename from passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/RandomPasswordGenerator.kt rename to passgen/random/src/main/kotlin/app/passwordstore/passgen/random/RandomPasswordGenerator.kt index dcc79ac97..ddb6809ca 100644 --- a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/RandomPasswordGenerator.kt +++ b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/RandomPasswordGenerator.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.passgen.random +package app.passwordstore.passgen.random -import dev.msfjarvis.aps.passgen.random.util.hasFlag +import app.passwordstore.passgen.random.util.hasFlag internal object RandomPasswordGenerator { diff --git a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/RandomPhonemesGenerator.kt b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/RandomPhonemesGenerator.kt similarity index 98% rename from passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/RandomPhonemesGenerator.kt rename to passgen/random/src/main/kotlin/app/passwordstore/passgen/random/RandomPhonemesGenerator.kt index 57dfc1e13..7b62ea4b6 100644 --- a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/RandomPhonemesGenerator.kt +++ b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/RandomPhonemesGenerator.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.passgen.random +package app.passwordstore.passgen.random -import dev.msfjarvis.aps.passgen.random.util.hasFlag +import app.passwordstore.passgen.random.util.hasFlag import java.util.Locale internal object RandomPhonemesGenerator { diff --git a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/util/Extensions.kt b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/util/Extensions.kt similarity index 86% rename from passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/util/Extensions.kt rename to passgen/random/src/main/kotlin/app/passwordstore/passgen/random/util/Extensions.kt index 3b38e22b6..71eec63be 100644 --- a/passgen/random/src/main/kotlin/dev/msfjarvis/aps/passgen/random/util/Extensions.kt +++ b/passgen/random/src/main/kotlin/app/passwordstore/passgen/random/util/Extensions.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.aps.passgen.random.util +package app.passwordstore.passgen.random.util /** Clears the given [flag] from the value of this [Int] */ internal infix fun Int.clearFlag(flag: Int): Int { diff --git a/ui-compose/build.gradle.kts b/ui-compose/build.gradle.kts index e2499b3fd..901896a3a 100644 --- a/ui-compose/build.gradle.kts +++ b/ui-compose/build.gradle.kts @@ -12,7 +12,7 @@ android { kotlinCompilerExtensionVersion = libs.compose.compiler.get().versionConstraint.requiredVersion } } - namespace = "dev.msfjarvis.aps.ui.compose" + namespace = "app.passwordstore.ui.compose" } dependencies { diff --git a/ui-compose/src/main/kotlin/dev/msfjarvis/aps/ui/compose/theme/Color.kt b/ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Color.kt similarity index 98% rename from ui-compose/src/main/kotlin/dev/msfjarvis/aps/ui/compose/theme/Color.kt rename to ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Color.kt index 7f1904430..7709d1364 100644 --- a/ui-compose/src/main/kotlin/dev/msfjarvis/aps/ui/compose/theme/Color.kt +++ b/ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Color.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.aps.ui.compose.theme +package app.passwordstore.ui.compose.theme import androidx.compose.ui.graphics.Color diff --git a/ui-compose/src/main/kotlin/dev/msfjarvis/aps/ui/compose/theme/Theme.kt b/ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Theme.kt similarity index 98% rename from ui-compose/src/main/kotlin/dev/msfjarvis/aps/ui/compose/theme/Theme.kt rename to ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Theme.kt index a6652ee19..9bd8003e3 100644 --- a/ui-compose/src/main/kotlin/dev/msfjarvis/aps/ui/compose/theme/Theme.kt +++ b/ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Theme.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.aps.ui.compose.theme +package app.passwordstore.ui.compose.theme import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme diff --git a/ui-compose/src/main/kotlin/dev/msfjarvis/aps/ui/compose/theme/Type.kt b/ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Type.kt similarity index 97% rename from ui-compose/src/main/kotlin/dev/msfjarvis/aps/ui/compose/theme/Type.kt rename to ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Type.kt index 105fad1ab..b9a07d5d2 100644 --- a/ui-compose/src/main/kotlin/dev/msfjarvis/aps/ui/compose/theme/Type.kt +++ b/ui-compose/src/main/kotlin/app/passwordstore/ui/compose/theme/Type.kt @@ -1,4 +1,4 @@ -package dev.msfjarvis.aps.ui.compose.theme +package app.passwordstore.ui.compose.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle @@ -6,7 +6,7 @@ import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp -import dev.msfjarvis.aps.ui.compose.R +import app.passwordstore.ui.compose.R internal val Manrope = FontFamily(