diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 19c99fe46c..6dba45d733 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -215,6 +215,8 @@ dependencies { implementation(files("libs/authenticatorbridge-1.0.0-release.aar")) + implementation(project(":core")) + implementation(libs.androidx.activity.compose) implementation(libs.androidx.appcompat) implementation(libs.androidx.autofill) @@ -305,7 +307,7 @@ kover { "androidx.compose.ui.tooling.preview.Preview", "androidx.compose.ui.tooling.preview.PreviewScreenSizes", // Manually excluded classes/files/etc. - "com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage", + "com.bitwarden.core.annotation.OmitFromCoverage", ) classes( // Navigation helpers diff --git a/app/src/main/java/com/x8bit/bitwarden/AccessibilityActivity.kt b/app/src/main/java/com/x8bit/bitwarden/AccessibilityActivity.kt index 250781ec2d..73f8937540 100644 --- a/app/src/main/java/com/x8bit/bitwarden/AccessibilityActivity.kt +++ b/app/src/main/java/com/x8bit/bitwarden/AccessibilityActivity.kt @@ -2,7 +2,7 @@ package com.x8bit.bitwarden import android.os.Bundle import androidx.appcompat.app.AppCompatActivity -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage /** * An activity to be launched and then immediately closed so that the OS Shade can be collapsed diff --git a/app/src/main/java/com/x8bit/bitwarden/AuthCallbackActivity.kt b/app/src/main/java/com/x8bit/bitwarden/AuthCallbackActivity.kt index 2c94d765cf..2c20514231 100644 --- a/app/src/main/java/com/x8bit/bitwarden/AuthCallbackActivity.kt +++ b/app/src/main/java/com/x8bit/bitwarden/AuthCallbackActivity.kt @@ -4,7 +4,7 @@ import android.content.Intent import android.os.Bundle import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import dagger.hilt.android.AndroidEntryPoint /** diff --git a/app/src/main/java/com/x8bit/bitwarden/AutofillTotpCopyActivity.kt b/app/src/main/java/com/x8bit/bitwarden/AutofillTotpCopyActivity.kt index 36ca9580c7..4f432aa60a 100644 --- a/app/src/main/java/com/x8bit/bitwarden/AutofillTotpCopyActivity.kt +++ b/app/src/main/java/com/x8bit/bitwarden/AutofillTotpCopyActivity.kt @@ -4,8 +4,8 @@ import android.os.Bundle import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.lifecycleScope +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.autofill.manager.AutofillCompletionManager -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach diff --git a/app/src/main/java/com/x8bit/bitwarden/BitwardenAppComponentFactory.kt b/app/src/main/java/com/x8bit/bitwarden/BitwardenAppComponentFactory.kt index fc4cdc89fd..cee1a7f10d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/BitwardenAppComponentFactory.kt +++ b/app/src/main/java/com/x8bit/bitwarden/BitwardenAppComponentFactory.kt @@ -5,10 +5,10 @@ import android.content.Intent import android.os.Build import androidx.annotation.Keep import androidx.core.app.AppComponentFactory +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.autofill.BitwardenAutofillService import com.x8bit.bitwarden.data.autofill.accessibility.BitwardenAccessibilityService import com.x8bit.bitwarden.data.autofill.fido2.BitwardenFido2ProviderService -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.tiles.BitwardenAutofillTileService import com.x8bit.bitwarden.data.tiles.BitwardenGeneratorTileService import com.x8bit.bitwarden.data.tiles.BitwardenVaultTileService diff --git a/app/src/main/java/com/x8bit/bitwarden/BitwardenApplication.kt b/app/src/main/java/com/x8bit/bitwarden/BitwardenApplication.kt index 50b478850e..b26f2f4f99 100644 --- a/app/src/main/java/com/x8bit/bitwarden/BitwardenApplication.kt +++ b/app/src/main/java/com/x8bit/bitwarden/BitwardenApplication.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden import android.app.Application +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.auth.manager.AuthRequestNotificationManager -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.manager.LogsManager import com.x8bit.bitwarden.data.platform.manager.event.OrganizationEventManager import com.x8bit.bitwarden.data.platform.manager.network.NetworkConfigManager diff --git a/app/src/main/java/com/x8bit/bitwarden/MainActivity.kt b/app/src/main/java/com/x8bit/bitwarden/MainActivity.kt index 9a1d753abd..d6933cfc50 100644 --- a/app/src/main/java/com/x8bit/bitwarden/MainActivity.kt +++ b/app/src/main/java/com/x8bit/bitwarden/MainActivity.kt @@ -18,10 +18,10 @@ import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.navigation.compose.NavHost import androidx.navigation.compose.rememberNavController +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilityCompletionManager import com.x8bit.bitwarden.data.autofill.manager.AutofillActivityManager import com.x8bit.bitwarden.data.autofill.manager.AutofillCompletionManager -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.manager.util.ObserveScreenDataEffect import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.ui.platform.base.util.EventsEffect diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestNotificationManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestNotificationManagerImpl.kt index f2752a54d8..831119b98b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestNotificationManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/manager/AuthRequestNotificationManagerImpl.kt @@ -7,11 +7,11 @@ import androidx.compose.ui.graphics.Color import androidx.core.app.NotificationChannelCompat import androidx.core.app.NotificationCompat import androidx.core.app.NotificationManagerCompat +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.util.createPasswordlessRequestDataIntent import com.x8bit.bitwarden.data.autofill.util.toPendingIntentMutabilityFlag -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.manager.PushManager import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.PasswordlessRequestData diff --git a/app/src/main/java/com/x8bit/bitwarden/data/auth/util/KdfParamsConstants.kt b/app/src/main/java/com/x8bit/bitwarden/data/auth/util/KdfParamsConstants.kt index 251f8a6b85..bc75149c8d 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/auth/util/KdfParamsConstants.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/auth/util/KdfParamsConstants.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.auth.util +import com.bitwarden.core.annotation.OmitFromCoverage import com.bitwarden.crypto.Kdf -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage /** * Constants relating to [Kdf] initialization defaults. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/BitwardenAutofillService.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/BitwardenAutofillService.kt index 88b1e01d3f..e458e1c5cb 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/BitwardenAutofillService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/BitwardenAutofillService.kt @@ -8,9 +8,9 @@ import android.service.autofill.FillRequest import android.service.autofill.SaveCallback import android.service.autofill.SaveRequest import androidx.annotation.Keep +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.autofill.model.AutofillAppInfo import com.x8bit.bitwarden.data.autofill.processor.AutofillProcessor -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/BitwardenAccessibilityService.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/BitwardenAccessibilityService.kt index d0fc977663..7c0d34fe84 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/BitwardenAccessibilityService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/BitwardenAccessibilityService.kt @@ -4,9 +4,9 @@ import android.accessibilityservice.AccessibilityService import android.content.Intent import android.view.accessibility.AccessibilityEvent import androidx.annotation.Keep +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilityEnabledManager import com.x8bit.bitwarden.data.autofill.accessibility.processor.BitwardenAccessibilityProcessor -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.tiles.BitwardenAutofillTileService import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/util/AccessibilityNodeInfoExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/util/AccessibilityNodeInfoExtensions.kt index eb1eb1bfdc..44c02d5c2c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/util/AccessibilityNodeInfoExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/util/AccessibilityNodeInfoExtensions.kt @@ -3,8 +3,8 @@ package com.x8bit.bitwarden.data.autofill.accessibility.util import android.view.accessibility.AccessibilityNodeInfo import android.widget.EditText import androidx.core.os.bundleOf +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.autofill.accessibility.model.KnownUsernameField -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage private const val PACKAGE_NAME_BITWARDEN_PREFIX: String = "com.x8bit.bitwarden" private const val PACKAGE_NAME_SYSTEM_UI: String = "com.android.systemui" diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/util/UriExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/util/UriExtensions.kt index 0b8aa25c8c..74de8e27a5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/util/UriExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/accessibility/util/UriExtensions.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.autofill.accessibility.util import android.net.Uri -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import java.net.URISyntaxException /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/BitwardenFido2ProviderService.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/BitwardenFido2ProviderService.kt index 1d66d2e11d..b12e1dd7b2 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/BitwardenFido2ProviderService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/fido2/BitwardenFido2ProviderService.kt @@ -14,8 +14,8 @@ import androidx.credentials.provider.BeginGetCredentialRequest import androidx.credentials.provider.BeginGetCredentialResponse import androidx.credentials.provider.CredentialProviderService import androidx.credentials.provider.ProviderClearCredentialStateRequest +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.autofill.fido2.processor.Fido2ProviderProcessor -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/chrome/ChromeThirdPartyAutofillManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/chrome/ChromeThirdPartyAutofillManagerImpl.kt index a1ed46b8ab..f6661c7645 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/chrome/ChromeThirdPartyAutofillManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/manager/chrome/ChromeThirdPartyAutofillManagerImpl.kt @@ -3,9 +3,9 @@ package com.x8bit.bitwarden.data.autofill.manager.chrome import android.content.ContentResolver import android.content.Context import android.net.Uri +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.autofill.model.chrome.ChromeReleaseChannel import com.x8bit.bitwarden.data.autofill.model.chrome.ChromeThirdPartyAutoFillData -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage private const val CONTENT_PROVIDER_NAME = ".AutofillThirdPartyModeContentProvider" private const val THIRD_PARTY_MODE_COLUMN = "autofill_third_party_state" diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/ActivityExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/ActivityExtensions.kt index 6458045ba8..2cf85de7b2 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/ActivityExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/ActivityExtensions.kt @@ -4,8 +4,8 @@ package com.x8bit.bitwarden.data.autofill.util import android.app.Activity import android.os.Build +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.autofill.model.AutofillAppInfo -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage /** * Build an [AutofillAppInfo] from the given [Activity]. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/AutofillIntentUtils.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/AutofillIntentUtils.kt index 537a3b8e53..b472b282ef 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/AutofillIntentUtils.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/AutofillIntentUtils.kt @@ -11,13 +11,13 @@ import android.content.IntentSender import android.service.autofill.Dataset import android.view.autofill.AutofillManager import androidx.core.os.bundleOf +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.AutofillTotpCopyActivity import com.x8bit.bitwarden.MainActivity import com.x8bit.bitwarden.data.autofill.model.AutofillAppInfo import com.x8bit.bitwarden.data.autofill.model.AutofillSaveItem import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData import com.x8bit.bitwarden.data.autofill.model.AutofillTotpCopyData -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.util.getSafeParcelableExtra import kotlin.random.Random diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/HtmlInfoExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/HtmlInfoExtensions.kt index 03e8d09efd..e825cdabe7 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/HtmlInfoExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/HtmlInfoExtensions.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.autofill.util import android.view.ViewStructure.HtmlInfo -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage /** * Whether this [HtmlInfo] represents a password field. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/IntExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/IntExtensions.kt index cf79ce30b5..b2cc113e57 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/IntExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/autofill/util/IntExtensions.kt @@ -3,7 +3,7 @@ package com.x8bit.bitwarden.data.autofill.util import android.app.PendingIntent import android.os.Build import android.text.InputType -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage /** * Whether this [Int] is a password [InputType]. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/legacy/LegacySecureStorageImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/legacy/LegacySecureStorageImpl.kt index c96e5a1ff1..73b3ca2101 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/legacy/LegacySecureStorageImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/disk/legacy/LegacySecureStorageImpl.kt @@ -10,7 +10,7 @@ import android.security.keystore.KeyGenParameterSpec import android.security.keystore.KeyProperties import android.util.Base64 import androidx.core.content.edit -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import java.math.BigInteger import java.nio.charset.StandardCharsets import java.security.InvalidAlgorithmParameterException diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/interceptor/BaseUrlInterceptors.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/interceptor/BaseUrlInterceptors.kt index d4b1747244..4d0f664143 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/interceptor/BaseUrlInterceptors.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/interceptor/BaseUrlInterceptors.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.platform.datasource.network.interceptor -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.datasource.disk.EnvironmentDiskSource import com.x8bit.bitwarden.data.platform.repository.model.Environment import com.x8bit.bitwarden.data.platform.repository.util.baseApiUrl diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/AssetManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/AssetManagerImpl.kt index 7dd45187ee..a4c53315f9 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/AssetManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/AssetManagerImpl.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.platform.manager import android.content.Context -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import kotlinx.coroutines.withContext diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/BiometricsEncryptionManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/BiometricsEncryptionManagerImpl.kt index 3dbaadf1e5..6900d438ce 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/BiometricsEncryptionManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/BiometricsEncryptionManagerImpl.kt @@ -3,9 +3,9 @@ package com.x8bit.bitwarden.data.platform.manager import android.security.keystore.KeyGenParameterSpec import android.security.keystore.KeyPermanentlyInvalidatedException import android.security.keystore.KeyProperties +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.BuildConfig import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.datasource.disk.SettingsDiskSource import java.security.InvalidAlgorithmParameterException import java.security.InvalidKeyException diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/NativeLibraryManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/NativeLibraryManagerImpl.kt index 78fd2a5490..897f7f1aa5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/NativeLibraryManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/NativeLibraryManagerImpl.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.platform.manager -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import timber.log.Timber /** diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/clipboard/BitwardenClipboardManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/clipboard/BitwardenClipboardManagerImpl.kt index 78c407b89d..dd3eacefce 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/clipboard/BitwardenClipboardManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/clipboard/BitwardenClipboardManagerImpl.kt @@ -11,8 +11,8 @@ import androidx.core.os.persistableBundleOf import androidx.work.ExistingWorkPolicy import androidx.work.OneTimeWorkRequest import androidx.work.WorkManager +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.ui.platform.base.util.Text import com.x8bit.bitwarden.ui.platform.base.util.toAnnotatedString diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/clipboard/ClearClipboardWorker.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/clipboard/ClearClipboardWorker.kt index cf12b975fa..e21f85205b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/clipboard/ClearClipboardWorker.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/clipboard/ClearClipboardWorker.kt @@ -5,7 +5,7 @@ import android.content.Context import android.content.Context.CLIPBOARD_SERVICE import androidx.work.Worker import androidx.work.WorkerParameters -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage /** * A worker to clear the clipboard manager. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/util/DataStateExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/util/DataStateExtensions.kt index 998bd1e2b5..90049e71bd 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/util/DataStateExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/repository/util/DataStateExtensions.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.platform.repository.util -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.repository.model.DataState import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/service/AuthenticatorBridgeService.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/service/AuthenticatorBridgeService.kt index 903dce9740..c72b82877c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/service/AuthenticatorBridgeService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/service/AuthenticatorBridgeService.kt @@ -2,7 +2,7 @@ package com.x8bit.bitwarden.data.platform.service import android.app.Service import android.content.Intent -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.processor.AuthenticatorBridgeProcessor import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/AddTotpIntentFromAuthenticatorUtils.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/AddTotpIntentFromAuthenticatorUtils.kt index 52b725c047..5308bff453 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/AddTotpIntentFromAuthenticatorUtils.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/AddTotpIntentFromAuthenticatorUtils.kt @@ -7,9 +7,9 @@ import android.content.Intent import android.content.Intent.FLAG_ACTIVITY_NEW_TASK import android.content.Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED import android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.MainActivity import com.x8bit.bitwarden.data.auth.manager.AddTotpItemFromAuthenticatorManager -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage private const val ADD_TOTP_ITEM_FROM_AUTHENTICATOR_KEY = "add-totp-item-from-authenticator-key" diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/AndroidBuildUtils.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/AndroidBuildUtils.kt index dc53212228..f7fd4dc140 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/AndroidBuildUtils.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/AndroidBuildUtils.kt @@ -3,7 +3,7 @@ package com.x8bit.bitwarden.data.platform.util import android.os.Build -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage /** * Returns true if the current OS build version is below the provided [version]. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/DeviceModelProvider.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/DeviceModelProvider.kt index a8f3b79774..89cf2e7a49 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/DeviceModelProvider.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/DeviceModelProvider.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.platform.util import android.os.Build -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage /** * Provides device model string. Useful for mocking static [Build.MODEL] call tests. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/InputStreamExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/InputStreamExtensions.kt index 9cb053763c..00a256f127 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/InputStreamExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/InputStreamExtensions.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.platform.util import android.os.Build -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import java.io.IOException import java.io.InputStream import java.io.OutputStream diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/IntentExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/IntentExtensions.kt index df3202f70c..c7e68669c2 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/IntentExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/IntentExtensions.kt @@ -7,7 +7,7 @@ import android.os.Bundle import android.os.Parcelable import androidx.core.content.IntentCompat import androidx.core.os.BundleCompat -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage /** * A means of retrieving a [Parcelable] from an [Intent] using the given [name] in a manner that diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/StringExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/StringExtensions.kt index cfb84dbb82..4fa55c0765 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/util/StringExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/util/StringExtensions.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.platform.util -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.manager.ResourceCacheManager import java.net.URI import java.net.URISyntaxException diff --git a/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenAutofillTileService.kt b/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenAutofillTileService.kt index f9248ab08f..9daee626ce 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenAutofillTileService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenAutofillTileService.kt @@ -8,12 +8,12 @@ import android.content.Intent import android.os.Build import android.service.quicksettings.TileService import androidx.annotation.Keep +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.AccessibilityActivity import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilityAutofillManager import com.x8bit.bitwarden.data.autofill.accessibility.model.AccessibilityAction import com.x8bit.bitwarden.data.autofill.accessibility.util.isAccessibilityServiceEnabled -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject diff --git a/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenGeneratorTileService.kt b/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenGeneratorTileService.kt index e8924db7bf..01bd844a67 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenGeneratorTileService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenGeneratorTileService.kt @@ -4,7 +4,7 @@ import android.annotation.SuppressLint import android.os.Build import android.service.quicksettings.TileService import androidx.annotation.Keep -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager import dagger.hilt.android.AndroidEntryPoint diff --git a/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenVaultTileService.kt b/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenVaultTileService.kt index a265577ce6..c57b678e94 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenVaultTileService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/tiles/BitwardenVaultTileService.kt @@ -4,7 +4,7 @@ import android.annotation.SuppressLint import android.os.Build import android.service.quicksettings.TileService import androidx.annotation.Keep -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow import com.x8bit.bitwarden.ui.platform.manager.intent.IntentManager import dagger.hilt.android.AndroidEntryPoint diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialAuthenticationUserInterfaceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialAuthenticationUserInterfaceImpl.kt index ef52205a96..c879e44eae 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialAuthenticationUserInterfaceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialAuthenticationUserInterfaceImpl.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk.model +import com.bitwarden.core.annotation.OmitFromCoverage import com.bitwarden.fido.CheckUserOptions import com.bitwarden.sdk.CheckUserAndPickCredentialForCreationResult import com.bitwarden.sdk.CheckUserResult @@ -8,7 +9,6 @@ import com.bitwarden.sdk.Fido2UserInterface import com.bitwarden.sdk.UiHint import com.bitwarden.vault.CipherView import com.bitwarden.vault.Fido2CredentialNewView -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage /** * Implementation of [Fido2UserInterface] for authenticating with a FIDO 2 credential. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialRegistrationUserInterfaceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialRegistrationUserInterfaceImpl.kt index 78b6ce2054..8041313b7c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialRegistrationUserInterfaceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialRegistrationUserInterfaceImpl.kt @@ -1,5 +1,6 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk.model +import com.bitwarden.core.annotation.OmitFromCoverage import com.bitwarden.fido.CheckUserOptions import com.bitwarden.sdk.CheckUserAndPickCredentialForCreationResult import com.bitwarden.sdk.CheckUserResult @@ -8,7 +9,6 @@ import com.bitwarden.sdk.Fido2UserInterface import com.bitwarden.sdk.UiHint import com.bitwarden.vault.CipherView import com.bitwarden.vault.Fido2CredentialNewView -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage /** * Implementation of [Fido2UserInterface] for registering new FIDO 2 credentials. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialStoreImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialStoreImpl.kt index 18dc106484..9fec401442 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialStoreImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/datasource/sdk/model/Fido2CredentialStoreImpl.kt @@ -1,12 +1,12 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk.model +import com.bitwarden.core.annotation.OmitFromCoverage import com.bitwarden.fido.Fido2CredentialAutofillView import com.bitwarden.sdk.Fido2CredentialStore import com.bitwarden.vault.Cipher import com.bitwarden.vault.CipherView import com.x8bit.bitwarden.data.auth.repository.AuthRepository import com.x8bit.bitwarden.data.autofill.util.isActiveWithFido2Credentials -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.vault.datasource.sdk.VaultSdkSource import com.x8bit.bitwarden.data.vault.repository.VaultRepository import com.x8bit.bitwarden.data.vault.repository.model.SyncVaultDataResult diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/FileManager.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/FileManager.kt index 829b8e40c5..c1ec2645f1 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/FileManager.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/FileManager.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.data.vault.manager import android.net.Uri -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.vault.manager.model.DownloadResult import java.io.File diff --git a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/FileManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/FileManagerImpl.kt index 57fcb0716e..02f1289486 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/FileManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/vault/manager/FileManagerImpl.kt @@ -2,7 +2,7 @@ package com.x8bit.bitwarden.data.vault.manager import android.content.Context import android.net.Uri -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.util.sdkAgnosticTransferTo import com.x8bit.bitwarden.data.vault.datasource.network.service.DownloadService diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupAutoFillNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupAutoFillNavigation.kt index 7f13ad4e13..4cfc6a05ee 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupAutoFillNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupAutoFillNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.composableWithPushTransitions import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockNavigation.kt index 277b08e6a8..8021c511bc 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/accountsetup/SetupUnlockNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.composableWithPushTransitions import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/checkemail/CheckEmailNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/checkemail/CheckEmailNavigation.kt index c9c2b72ec1..6d8f9aa49b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/checkemail/CheckEmailNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/checkemail/CheckEmailNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions private const val EMAIL: String = "email" diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationNavigation.kt index 24d07b8ddf..0bb9cba96b 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/completeregistration/CompleteRegistrationNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions private const val EMAIL_ADDRESS: String = "email_address" diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnNavigation.kt index ab69a1d4b8..ab9c68c4f1 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/enterprisesignon/EnterpriseSignOnNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions private const val ENTERPRISE_SIGN_ON_PREFIX = "enterprise_sign_on " diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginNavigation.kt index 3bd355c598..5574d0eaa4 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/login/LoginNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions private const val EMAIL_ADDRESS: String = "email_address" diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceNavigation.kt index c587c9dd80..ebfd7145c2 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/loginwithdevice/LoginWithDeviceNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.auth.feature.loginwithdevice.model.LoginWithDeviceType import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordhint/MasterPasswordHintNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordhint/MasterPasswordHintNavigation.kt index 0d83b42621..58a65d7d8c 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordhint/MasterPasswordHintNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/masterpasswordhint/MasterPasswordHintNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions private const val EMAIL_ADDRESS: String = "email_address" diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeEmailAccessNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeEmailAccessNavigation.kt index 2be6f4a473..158d3b8727 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeEmailAccessNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/newdevicenotice/NewDeviceNoticeEmailAccessNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions private const val EMAIL_ADDRESS = "email_address" diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginNavigation.kt index 03e7e7c954..e84970a6f0 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/twofactorlogin/TwoFactorLoginNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.datasource.network.util.base64UrlDecodeOrNull import com.x8bit.bitwarden.data.platform.datasource.network.util.base64UrlEncode import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockNavigation.kt index c14dc7761e..4447a4561a 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/auth/feature/vaultunlock/VaultUnlockNavigation.kt @@ -7,7 +7,7 @@ import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.compose.composable import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.auth.feature.vaultunlock.model.UnlockType private const val VAULT_UNLOCK_TYPE: String = "unlock_type" diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/ModifierExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/ModifierExtensions.kt index ccee4cab32..e2b24f28f5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/ModifierExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/ModifierExtensions.kt @@ -46,7 +46,7 @@ import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.constrainWidth import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.offset -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.components.model.CardStyle import com.x8bit.bitwarden.ui.platform.model.WindowSize import com.x8bit.bitwarden.ui.platform.theme.BitwardenTheme diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/NavGraphBuilderExtensions.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/NavGraphBuilderExtensions.kt index c45f34c6c9..7d2d789687 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/NavGraphBuilderExtensions.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/NavGraphBuilderExtensions.kt @@ -7,7 +7,7 @@ import androidx.navigation.NavBackStackEntry import androidx.navigation.NavDeepLink import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.theme.TransitionProviders /** diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/ToastUtils.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/ToastUtils.kt index 4acafd759a..5f68daaa44 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/ToastUtils.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/base/util/ToastUtils.kt @@ -2,7 +2,7 @@ package com.x8bit.bitwarden.ui.platform.base.util import android.content.Context import android.widget.Toast -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage /** * Shows a [Toast] with a message indicating something is not yet implemented. diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/interceptor/NoPersonalizedLearningInterceptor.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/interceptor/NoPersonalizedLearningInterceptor.kt index 28d99922f3..471bd3394e 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/interceptor/NoPersonalizedLearningInterceptor.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/interceptor/NoPersonalizedLearningInterceptor.kt @@ -7,7 +7,7 @@ import androidx.compose.ui.platform.InterceptPlatformTextInput import androidx.compose.ui.platform.PlatformTextInputInterceptor import androidx.compose.ui.platform.PlatformTextInputMethodRequest import androidx.compose.ui.platform.PlatformTextInputSession -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage /** * Interceptor that disables the [EditorInfo.IME_FLAG_NO_PERSONALIZED_LEARNING] flag on text inputs. diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/toolbar/BitwardenCutCopyTextToolbar.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/toolbar/BitwardenCutCopyTextToolbar.kt index 9204f80439..01461f8864 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/toolbar/BitwardenCutCopyTextToolbar.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/toolbar/BitwardenCutCopyTextToolbar.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.platform.TextToolbarStatus import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.input.getSelectedText import androidx.core.os.persistableBundleOf -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage /** * A custom [TextToolbar] that is obfuscates the copied or cut text. diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/toolbar/BitwardenEmptyTextToolbar.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/toolbar/BitwardenEmptyTextToolbar.kt index e68484551b..0e8a241fce 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/toolbar/BitwardenEmptyTextToolbar.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/components/field/toolbar/BitwardenEmptyTextToolbar.kt @@ -3,7 +3,7 @@ package com.x8bit.bitwarden.ui.platform.components.field.toolbar import androidx.compose.ui.geometry.Rect import androidx.compose.ui.platform.TextToolbar import androidx.compose.ui.platform.TextToolbarStatus -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage /** * A custom [TextToolbar] that is completely empty. diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/composition/LocalManagerProvider.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/composition/LocalManagerProvider.kt index a99d89d212..f6307bc111 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/composition/LocalManagerProvider.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/composition/LocalManagerProvider.kt @@ -10,7 +10,7 @@ import androidx.compose.runtime.CompositionLocal import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.runtime.ProvidableCompositionLocal import androidx.compose.runtime.compositionLocalOf -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.manager.util.AppResumeStateManager import com.x8bit.bitwarden.data.platform.manager.util.AppResumeStateManagerImpl import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchNavigation.kt index b97ec8d9bb..071744aff5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions import com.x8bit.bitwarden.ui.platform.feature.search.model.SearchType import com.x8bit.bitwarden.ui.vault.feature.addedit.VaultAddEditArgs diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt index cb8a6d0314..137fe2622a 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/search/SearchViewModel.kt @@ -3,6 +3,7 @@ package com.x8bit.bitwarden.ui.platform.feature.search import android.os.Parcelable import androidx.lifecycle.SavedStateHandle import androidx.lifecycle.viewModelScope +import com.bitwarden.core.annotation.OmitFromCoverage import com.bitwarden.vault.CipherType import com.bitwarden.vault.CipherView import com.bitwarden.vault.LoginUriView @@ -12,7 +13,6 @@ import com.x8bit.bitwarden.data.auth.repository.model.ValidatePasswordResult import com.x8bit.bitwarden.data.autofill.accessibility.manager.AccessibilitySelectionManager import com.x8bit.bitwarden.data.autofill.manager.AutofillSelectionManager import com.x8bit.bitwarden.data.autofill.model.AutofillSelectionData -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.manager.PolicyManager import com.x8bit.bitwarden.data.platform.manager.SpecialCircumstanceManager import com.x8bit.bitwarden.data.platform.manager.clipboard.BitwardenClipboardManager diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/loginapproval/LoginApprovalNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/loginapproval/LoginApprovalNavigation.kt index 17aeba6d3b..7a7182c341 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/loginapproval/LoginApprovalNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/accountsecurity/loginapproval/LoginApprovalNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions private const val FINGERPRINT: String = "fingerprint" diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditNavigation.kt index ff9dec921e..c309f68cfb 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/settings/folders/addedit/FolderAddEditNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions import com.x8bit.bitwarden.ui.platform.feature.settings.folders.model.FolderAddEditType diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/splash/SplashScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/splash/SplashScreen.kt index fecf67f544..85db62e824 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/splash/SplashScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/feature/splash/SplashScreen.kt @@ -4,7 +4,7 @@ import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage /** * Splash screen with empty composable content so that the Activity window background is shown. diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/biometrics/BiometricsManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/biometrics/BiometricsManagerImpl.kt index b7ec1dbe1c..e6c106fcef 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/biometrics/BiometricsManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/biometrics/BiometricsManagerImpl.kt @@ -6,8 +6,8 @@ import androidx.biometric.BiometricManager.Authenticators import androidx.biometric.BiometricPrompt import androidx.core.content.ContextCompat import androidx.fragment.app.FragmentActivity +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import javax.crypto.Cipher /** diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/exit/ExitManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/exit/ExitManagerImpl.kt index f8ea1be8b7..ff83b4d3e0 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/exit/ExitManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/exit/ExitManagerImpl.kt @@ -1,7 +1,7 @@ package com.x8bit.bitwarden.ui.platform.manager.exit import android.app.Activity -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage /** * The default implementation of the [ExitManager] for managing the various ways to exit the app. diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManagerImpl.kt index c3a0bb92cf..ac0d9b5977 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/intent/IntentManagerImpl.kt @@ -23,12 +23,12 @@ import androidx.core.content.ContextCompat import androidx.core.content.FileProvider import androidx.core.net.toUri import androidx.credentials.CredentialManager +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.BuildConfig import com.x8bit.bitwarden.MainActivity import com.x8bit.bitwarden.R import com.x8bit.bitwarden.data.autofill.model.chrome.ChromeReleaseChannel import com.x8bit.bitwarden.data.autofill.util.toPendingIntentMutabilityFlag -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.util.isBuildVersionBelow import com.x8bit.bitwarden.ui.platform.util.toFormattedPattern import java.io.File diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/nfc/NfcManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/nfc/NfcManagerImpl.kt index 0584638a0e..dbf9e4ef33 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/nfc/NfcManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/nfc/NfcManagerImpl.kt @@ -7,9 +7,9 @@ import android.content.Intent import android.content.IntentFilter import android.nfc.NfcAdapter import android.os.Build +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.AuthCallbackActivity import com.x8bit.bitwarden.data.autofill.util.toPendingIntentMutabilityFlag -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import kotlin.random.Random /** diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/permissions/PermissionsManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/permissions/PermissionsManagerImpl.kt index 692d73c0bd..3cf050d90a 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/permissions/PermissionsManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/permissions/PermissionsManagerImpl.kt @@ -7,7 +7,7 @@ import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.runtime.Composable import androidx.core.content.ContextCompat -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage /** * Primary implementation of [PermissionsManager]. diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/resource/ResourceManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/resource/ResourceManagerImpl.kt index f98d4abe1c..fea45c07ad 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/resource/ResourceManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/platform/manager/resource/ResourceManagerImpl.kt @@ -2,7 +2,7 @@ package com.x8bit.bitwarden.ui.platform.manager.resource import android.content.Context import androidx.annotation.StringRes -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage /** * Primary implementation of [ResourceManager]. diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorNavigation.kt index 5892bfb56b..e31bdc3386 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/GeneratorNavigation.kt @@ -7,7 +7,7 @@ import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.compose.composable import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions import com.x8bit.bitwarden.ui.tools.feature.generator.model.GeneratorMode diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryNavigation.kt index b69abee4b9..f327f301b5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/generator/passwordhistory/PasswordHistoryNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions import com.x8bit.bitwarden.ui.tools.feature.generator.model.GeneratorPasswordHistoryMode diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendNavigation.kt index 8509dcbcdf..353e22a824 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/tools/feature/send/addsend/AddSendNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions import com.x8bit.bitwarden.ui.tools.feature.send.addsend.model.AddSendType diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditNavigation.kt index 4ede0bb6b9..c103fa0fa1 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/addedit/VaultAddEditNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions import com.x8bit.bitwarden.ui.tools.feature.generator.model.GeneratorMode import com.x8bit.bitwarden.ui.vault.model.VaultAddEditType diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsNavigation.kt index bb05d0a10f..c23553e7e4 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/attachments/AttachmentsNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions private const val ATTACHMENTS_CIPHER_ID = "cipher_id" diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsNavigation.kt index a8eed97956..1f2a9b1234 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions import com.x8bit.bitwarden.ui.platform.manager.snackbar.SnackbarRelay diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt index 8413d77714..d272f99056 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/importlogins/ImportLoginsScreen.kt @@ -37,8 +37,8 @@ import androidx.compose.ui.unit.dp import androidx.core.net.toUri import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.EventsEffect import com.x8bit.bitwarden.ui.platform.base.util.bitwardenBoldSpanStyle import com.x8bit.bitwarden.ui.platform.base.util.standardHorizontalMargin diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemNavigation.kt index e7eff3162a..1fa5a9d1cd 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/item/VaultItemNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions import com.x8bit.bitwarden.ui.vault.feature.addedit.VaultAddEditArgs import com.x8bit.bitwarden.ui.vault.model.VaultItemCipherType diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingNavigation.kt index ae6e2f6d84..2ff495e7e5 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/itemlisting/VaultItemListingNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.composableWithPushTransitions import com.x8bit.bitwarden.ui.platform.base.util.composableWithStayTransitions import com.x8bit.bitwarden.ui.platform.feature.search.model.SearchType diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationNavigation.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationNavigation.kt index 3599d7f4ca..a5c0bcaf7a 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationNavigation.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/movetoorganization/VaultMoveToOrganizationNavigation.kt @@ -6,7 +6,7 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.NavOptions import androidx.navigation.NavType import androidx.navigation.navArgument -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage import com.x8bit.bitwarden.ui.platform.base.util.composableWithSlideTransitions private const val VAULT_MOVE_TO_ORGANIZATION_PREFIX = "vault_move_to_organization" diff --git a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/util/QrCodeAnalyzerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/util/QrCodeAnalyzerImpl.kt index 2b57a79c2e..c8eb06e663 100644 --- a/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/util/QrCodeAnalyzerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/ui/vault/feature/qrcodescan/util/QrCodeAnalyzerImpl.kt @@ -1,6 +1,7 @@ package com.x8bit.bitwarden.ui.vault.feature.qrcodescan.util import androidx.camera.core.ImageProxy +import com.bitwarden.core.annotation.OmitFromCoverage import com.google.zxing.BarcodeFormat import com.google.zxing.BinaryBitmap import com.google.zxing.DecodeHintType @@ -8,7 +9,6 @@ import com.google.zxing.MultiFormatReader import com.google.zxing.NotFoundException import com.google.zxing.PlanarYUVLuminanceSource import com.google.zxing.common.HybridBinarizer -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import java.nio.ByteBuffer /** diff --git a/app/src/standard/java/com/x8bit/bitwarden/data/platform/manager/LogsManagerImpl.kt b/app/src/standard/java/com/x8bit/bitwarden/data/platform/manager/LogsManagerImpl.kt index 188ed4bee1..7025f78fb1 100644 --- a/app/src/standard/java/com/x8bit/bitwarden/data/platform/manager/LogsManagerImpl.kt +++ b/app/src/standard/java/com/x8bit/bitwarden/data/platform/manager/LogsManagerImpl.kt @@ -1,9 +1,9 @@ package com.x8bit.bitwarden.data.platform.manager +import com.bitwarden.core.annotation.OmitFromCoverage import com.google.firebase.crashlytics.ktx.crashlytics import com.google.firebase.ktx.Firebase import com.x8bit.bitwarden.BuildConfig -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.datasource.disk.legacy.LegacyAppCenterMigrator import com.x8bit.bitwarden.data.platform.repository.SettingsRepository import com.x8bit.bitwarden.data.platform.repository.model.Environment diff --git a/app/src/standard/java/com/x8bit/bitwarden/data/push/BitwardenFirebaseMessagingService.kt b/app/src/standard/java/com/x8bit/bitwarden/data/push/BitwardenFirebaseMessagingService.kt index fecca8cf33..3dc1f0b5ae 100644 --- a/app/src/standard/java/com/x8bit/bitwarden/data/push/BitwardenFirebaseMessagingService.kt +++ b/app/src/standard/java/com/x8bit/bitwarden/data/push/BitwardenFirebaseMessagingService.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.data.push +import com.bitwarden.core.annotation.OmitFromCoverage import com.google.firebase.messaging.FirebaseMessagingService import com.google.firebase.messaging.RemoteMessage -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import com.x8bit.bitwarden.data.platform.manager.PushManager import dagger.hilt.android.AndroidEntryPoint import javax.inject.Inject diff --git a/app/src/standard/java/com/x8bit/bitwarden/ui/platform/manager/review/AppReviewManagerImpl.kt b/app/src/standard/java/com/x8bit/bitwarden/ui/platform/manager/review/AppReviewManagerImpl.kt index 843d3b184d..4bd5b62ac3 100644 --- a/app/src/standard/java/com/x8bit/bitwarden/ui/platform/manager/review/AppReviewManagerImpl.kt +++ b/app/src/standard/java/com/x8bit/bitwarden/ui/platform/manager/review/AppReviewManagerImpl.kt @@ -2,10 +2,10 @@ package com.x8bit.bitwarden.ui.platform.manager.review import android.app.Activity import android.widget.Toast +import com.bitwarden.core.annotation.OmitFromCoverage import com.google.android.play.core.review.ReviewManagerFactory import com.x8bit.bitwarden.BuildConfig import com.x8bit.bitwarden.R -import com.x8bit.bitwarden.data.platform.annotation.OmitFromCoverage import timber.log.Timber /** diff --git a/authenticator/build.gradle.kts b/authenticator/build.gradle.kts index cfb2400b50..153168def3 100644 --- a/authenticator/build.gradle.kts +++ b/authenticator/build.gradle.kts @@ -153,6 +153,8 @@ dependencies { implementation(files("libs/authenticatorbridge-1.0.0-release.aar")) + implementation(project(":core")) + implementation(libs.androidx.activity.compose) implementation(libs.androidx.appcompat) implementation(libs.androidx.autofill) @@ -239,7 +241,7 @@ kover { // Compose previews "androidx.compose.ui.tooling.preview.Preview", // Manually excluded classes/files/etc. - "com.bitwarden.authenticator.data.platform.annotation.OmitFromCoverage", + "com.bitwarden.core.annotation.OmitFromCoverage", ) classes( // Navigation helpers diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/annotation/OmitFromCoverage.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/annotation/OmitFromCoverage.kt deleted file mode 100644 index e335d4bdfb..0000000000 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/annotation/OmitFromCoverage.kt +++ /dev/null @@ -1,13 +0,0 @@ -package com.bitwarden.authenticator.data.platform.annotation - -/** - * Used to omit the annotated class from test coverage reporting. This should be used sparingly and - * is intended for non-testable classes that are placed in packages along with testable ones. - */ -@Target( - AnnotationTarget.CLASS, - AnnotationTarget.FILE, - AnnotationTarget.FUNCTION, -) -@Retention(AnnotationRetention.BINARY) -annotation class OmitFromCoverage diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/core/ResultCall.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/core/ResultCall.kt index 07609e356e..1122c19d3d 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/core/ResultCall.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/data/platform/datasource/network/core/ResultCall.kt @@ -2,9 +2,9 @@ package com.bitwarden.authenticator.data.platform.datasource.network.core -import com.bitwarden.authenticator.data.platform.annotation.OmitFromCoverage import com.bitwarden.authenticator.data.platform.util.asFailure import com.bitwarden.authenticator.data.platform.util.asSuccess +import com.bitwarden.core.annotation.OmitFromCoverage import okhttp3.Request import okio.IOException import okio.Timeout diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/base/util/ModifierExtensions.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/base/util/ModifierExtensions.kt index 3bf9de4d9e..071fab15d6 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/base/util/ModifierExtensions.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/base/util/ModifierExtensions.kt @@ -14,8 +14,8 @@ import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp -import com.bitwarden.authenticator.data.platform.annotation.OmitFromCoverage import com.bitwarden.authenticator.ui.platform.util.isPortrait +import com.bitwarden.core.annotation.OmitFromCoverage /** * This is a [Modifier] extension for drawing a divider at the bottom of the composable. diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/manager/intent/IntentManagerImpl.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/manager/intent/IntentManagerImpl.kt index 74346a010b..024625dee5 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/manager/intent/IntentManagerImpl.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/manager/intent/IntentManagerImpl.kt @@ -16,7 +16,7 @@ import androidx.compose.runtime.Composable import androidx.core.content.ContextCompat import androidx.core.net.toUri import com.bitwarden.authenticator.R -import com.bitwarden.authenticator.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage /** * The default implementation of the [IntentManager] for simplifying the handling of Android diff --git a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/util/ConfigurationExtensions.kt b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/util/ConfigurationExtensions.kt index 709022e17a..678c6c3ce0 100644 --- a/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/util/ConfigurationExtensions.kt +++ b/authenticator/src/main/kotlin/com/bitwarden/authenticator/ui/platform/util/ConfigurationExtensions.kt @@ -3,7 +3,7 @@ package com.bitwarden.authenticator.ui.platform.util import android.content.res.Configuration -import com.bitwarden.authenticator.data.platform.annotation.OmitFromCoverage +import com.bitwarden.core.annotation.OmitFromCoverage /** * A helper method to indicate if the current UI configuration is portrait or not. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/annotation/OmitFromCoverage.kt b/core/src/main/kotlin/com/bitwarden/core/annotation/OmitFromCoverage.kt similarity index 87% rename from app/src/main/java/com/x8bit/bitwarden/data/platform/annotation/OmitFromCoverage.kt rename to core/src/main/kotlin/com/bitwarden/core/annotation/OmitFromCoverage.kt index df7de9cc5a..28008a2f76 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/annotation/OmitFromCoverage.kt +++ b/core/src/main/kotlin/com/bitwarden/core/annotation/OmitFromCoverage.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.platform.annotation +package com.bitwarden.core.annotation /** * Used to omit the annotated class from test coverage reporting. This should be used sparingly and