diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 50463d133a..3177d02270 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -66,7 +66,7 @@ wire { } protoPath { - srcDir("${project.rootDir}/libsignal-service/src/main/protowire") + srcDir("${project.rootDir}/lib/libsignal-service/src/main/protowire") } // Handled by libsignal prune("signalservice.DecryptionErrorMessage") @@ -489,21 +489,21 @@ dependencies { ktlintRuleset(libs.ktlint.twitter.compose) coreLibraryDesugaring(libs.android.tools.desugar) - implementation(project(":libsignal-service")) - implementation(project(":paging")) - implementation(project(":core-util")) - implementation(project(":glide-config")) - implementation(project(":video")) - implementation(project(":device-transfer")) - implementation(project(":image-editor")) - implementation(project(":donations")) - implementation(project(":debuglogs-viewer")) - implementation(project(":contacts")) - implementation(project(":qr")) - implementation(project(":sticky-header-grid")) - implementation(project(":photoview")) - implementation(project(":core-ui")) - implementation(project(":core-models")) + implementation(project(":lib:libsignal-service")) + implementation(project(":lib:paging")) + implementation(project(":core:util")) + implementation(project(":lib:glide-config")) + implementation(project(":lib:video")) + implementation(project(":lib:device-transfer")) + implementation(project(":lib:image-editor")) + implementation(project(":lib:donations")) + implementation(project(":lib:debuglogs-viewer")) + implementation(project(":lib:contacts")) + implementation(project(":lib:qr")) + implementation(project(":lib:sticky-header-grid")) + implementation(project(":lib:photoview")) + implementation(project(":core:ui")) + implementation(project(":core:models")) implementation(libs.androidx.fragment.ktx) implementation(libs.androidx.appcompat) { @@ -603,9 +603,9 @@ dependencies { implementation(libs.androidx.credentials.compat) implementation(libs.kotlinx.serialization.json) - implementation(project(":billing")) + implementation(project(":lib:billing")) - "spinnerImplementation"(project(":spinner")) + "spinnerImplementation"(project(":lib:spinner")) "canaryImplementation"(libs.square.leakcanary) @@ -631,7 +631,7 @@ dependencies { } testImplementation(testLibs.conscrypt.openjdk.uber) testImplementation(testLibs.mockk) - testImplementation(testFixtures(project(":libsignal-service"))) + testImplementation(testFixtures(project(":lib:libsignal-service"))) testImplementation(testLibs.espresso.core) testImplementation(testLibs.kotlinx.coroutines.test) testImplementation(libs.androidx.compose.ui.test.junit4) diff --git a/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts b/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts index 7da40ee4e5..740b08c3ee 100644 --- a/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts +++ b/build-logic/plugins/src/main/java/signal-sample-app.gradle.kts @@ -52,7 +52,7 @@ android { dependencies { coreLibraryDesugaring(libs.android.tools.desugar) - implementation(project(":core-util")) + implementation(project(":core:util")) coreLibraryDesugaring(libs.android.tools.desugar) diff --git a/build.gradle.kts b/build.gradle.kts index 9d34231028..93f0c52619 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -55,7 +55,8 @@ subprojects { } } - val skipQa = setOf("Signal-Android", "libsignal-service", "lintchecks", "benchmark", "core-util-jvm", "core-models", "logging") + // Skip qa for: main app, pure Java/Kotlin libs, and implicit parent projects from hierarchical naming + val skipQa = setOf("Signal-Android", "libsignal-service", "lintchecks", "benchmark", "util-jvm", "models", "logging", "core", "lib", "demo", "feature") if (project.name !in skipQa && !project.name.endsWith("-app")) { tasks.register("qa") { @@ -90,13 +91,13 @@ tasks.register("qa") { ":Signal-Android:testPlayProdPerfUnitTest", ":Signal-Android:lintPlayProdRelease", "Signal-Android:ktlintCheck", - ":libsignal-service:test", - ":libsignal-service:ktlintCheck", + ":lib:libsignal-service:test", + ":lib:libsignal-service:ktlintCheck", ":Signal-Android:assemblePlayProdRelease", ":Signal-Android:compilePlayProdInstrumentationAndroidTestSources", ":microbenchmark:compileReleaseAndroidTestSources", - ":core-util-jvm:test", - ":core-util-jvm:ktlintCheck" + ":core:util-jvm:test", + ":core:util-jvm:ktlintCheck" ) } diff --git a/core-models/build.gradle.kts b/core/models/build.gradle.kts similarity index 92% rename from core-models/build.gradle.kts rename to core/models/build.gradle.kts index 07f220e73f..6fb45baa8f 100644 --- a/core-models/build.gradle.kts +++ b/core/models/build.gradle.kts @@ -23,5 +23,5 @@ kotlin { dependencies { implementation(libs.libsignal.client) implementation(libs.square.okio) - implementation(project(":core-util-jvm")) + implementation(project(":core:util-jvm")) } diff --git a/core-models/src/main/java/org/signal/core/models/AccountEntropyPool.kt b/core/models/src/main/java/org/signal/core/models/AccountEntropyPool.kt similarity index 100% rename from core-models/src/main/java/org/signal/core/models/AccountEntropyPool.kt rename to core/models/src/main/java/org/signal/core/models/AccountEntropyPool.kt diff --git a/core-models/src/main/java/org/signal/core/models/MasterKey.kt b/core/models/src/main/java/org/signal/core/models/MasterKey.kt similarity index 100% rename from core-models/src/main/java/org/signal/core/models/MasterKey.kt rename to core/models/src/main/java/org/signal/core/models/MasterKey.kt diff --git a/core-models/src/main/java/org/signal/core/models/ServiceId.kt b/core/models/src/main/java/org/signal/core/models/ServiceId.kt similarity index 100% rename from core-models/src/main/java/org/signal/core/models/ServiceId.kt rename to core/models/src/main/java/org/signal/core/models/ServiceId.kt diff --git a/core-models/src/main/java/org/signal/core/models/backup/BackupId.kt b/core/models/src/main/java/org/signal/core/models/backup/BackupId.kt similarity index 100% rename from core-models/src/main/java/org/signal/core/models/backup/BackupId.kt rename to core/models/src/main/java/org/signal/core/models/backup/BackupId.kt diff --git a/core-models/src/main/java/org/signal/core/models/backup/BackupKey.kt b/core/models/src/main/java/org/signal/core/models/backup/BackupKey.kt similarity index 100% rename from core-models/src/main/java/org/signal/core/models/backup/BackupKey.kt rename to core/models/src/main/java/org/signal/core/models/backup/BackupKey.kt diff --git a/core-models/src/main/java/org/signal/core/models/backup/MediaId.kt b/core/models/src/main/java/org/signal/core/models/backup/MediaId.kt similarity index 100% rename from core-models/src/main/java/org/signal/core/models/backup/MediaId.kt rename to core/models/src/main/java/org/signal/core/models/backup/MediaId.kt diff --git a/core-models/src/main/java/org/signal/core/models/backup/MediaName.kt b/core/models/src/main/java/org/signal/core/models/backup/MediaName.kt similarity index 100% rename from core-models/src/main/java/org/signal/core/models/backup/MediaName.kt rename to core/models/src/main/java/org/signal/core/models/backup/MediaName.kt diff --git a/core-models/src/main/java/org/signal/core/models/backup/MediaRootBackupKey.kt b/core/models/src/main/java/org/signal/core/models/backup/MediaRootBackupKey.kt similarity index 100% rename from core-models/src/main/java/org/signal/core/models/backup/MediaRootBackupKey.kt rename to core/models/src/main/java/org/signal/core/models/backup/MediaRootBackupKey.kt diff --git a/core-models/src/main/java/org/signal/core/models/backup/MessageBackupKey.kt b/core/models/src/main/java/org/signal/core/models/backup/MessageBackupKey.kt similarity index 100% rename from core-models/src/main/java/org/signal/core/models/backup/MessageBackupKey.kt rename to core/models/src/main/java/org/signal/core/models/backup/MessageBackupKey.kt diff --git a/core-models/src/main/java/org/signal/core/models/storageservice/StorageCipherKey.kt b/core/models/src/main/java/org/signal/core/models/storageservice/StorageCipherKey.kt similarity index 100% rename from core-models/src/main/java/org/signal/core/models/storageservice/StorageCipherKey.kt rename to core/models/src/main/java/org/signal/core/models/storageservice/StorageCipherKey.kt diff --git a/core-models/src/main/java/org/signal/core/models/storageservice/StorageItemKey.kt b/core/models/src/main/java/org/signal/core/models/storageservice/StorageItemKey.kt similarity index 100% rename from core-models/src/main/java/org/signal/core/models/storageservice/StorageItemKey.kt rename to core/models/src/main/java/org/signal/core/models/storageservice/StorageItemKey.kt diff --git a/core-models/src/main/java/org/signal/core/models/storageservice/StorageKey.kt b/core/models/src/main/java/org/signal/core/models/storageservice/StorageKey.kt similarity index 100% rename from core-models/src/main/java/org/signal/core/models/storageservice/StorageKey.kt rename to core/models/src/main/java/org/signal/core/models/storageservice/StorageKey.kt diff --git a/core-models/src/main/java/org/signal/core/models/storageservice/StorageManifestKey.kt b/core/models/src/main/java/org/signal/core/models/storageservice/StorageManifestKey.kt similarity index 100% rename from core-models/src/main/java/org/signal/core/models/storageservice/StorageManifestKey.kt rename to core/models/src/main/java/org/signal/core/models/storageservice/StorageManifestKey.kt diff --git a/core-ui/build.gradle.kts b/core/ui/build.gradle.kts similarity index 100% rename from core-ui/build.gradle.kts rename to core/ui/build.gradle.kts diff --git a/billing/src/main/AndroidManifest.xml b/core/ui/src/main/AndroidManifest.xml similarity index 100% rename from billing/src/main/AndroidManifest.xml rename to core/ui/src/main/AndroidManifest.xml diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/ActivityComponents.kt b/core/ui/src/main/java/org/signal/core/ui/compose/ActivityComponents.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/ActivityComponents.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/ActivityComponents.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/AnimatedFlowRow.kt b/core/ui/src/main/java/org/signal/core/ui/compose/AnimatedFlowRow.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/AnimatedFlowRow.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/AnimatedFlowRow.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Animations.kt b/core/ui/src/main/java/org/signal/core/ui/compose/Animations.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/Animations.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/Animations.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/BottomSheets.kt b/core/ui/src/main/java/org/signal/core/ui/compose/BottomSheets.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/BottomSheets.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/BottomSheets.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Buttons.kt b/core/ui/src/main/java/org/signal/core/ui/compose/Buttons.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/Buttons.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/Buttons.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/CircularProgressWrapper.kt b/core/ui/src/main/java/org/signal/core/ui/compose/CircularProgressWrapper.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/CircularProgressWrapper.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/CircularProgressWrapper.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/CircularRevealModifiers.kt b/core/ui/src/main/java/org/signal/core/ui/compose/CircularRevealModifiers.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/CircularRevealModifiers.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/CircularRevealModifiers.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/DelayedState.kt b/core/ui/src/main/java/org/signal/core/ui/compose/DelayedState.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/DelayedState.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/DelayedState.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Dialogs.kt b/core/ui/src/main/java/org/signal/core/ui/compose/Dialogs.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/Dialogs.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/Dialogs.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Dividers.kt b/core/ui/src/main/java/org/signal/core/ui/compose/Dividers.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/Dividers.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/Dividers.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/DropdownMenus.kt b/core/ui/src/main/java/org/signal/core/ui/compose/DropdownMenus.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/DropdownMenus.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/DropdownMenus.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Fragments.kt b/core/ui/src/main/java/org/signal/core/ui/compose/Fragments.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/Fragments.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/Fragments.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/IconButtons.kt b/core/ui/src/main/java/org/signal/core/ui/compose/IconButtons.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/IconButtons.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/IconButtons.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Icons.kt b/core/ui/src/main/java/org/signal/core/ui/compose/Icons.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/Icons.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/Icons.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/ModifierExtensions.kt b/core/ui/src/main/java/org/signal/core/ui/compose/ModifierExtensions.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/ModifierExtensions.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/ModifierExtensions.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Previews.kt b/core/ui/src/main/java/org/signal/core/ui/compose/Previews.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/Previews.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/Previews.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/ProvideIncognitoKeyboard.kt b/core/ui/src/main/java/org/signal/core/ui/compose/ProvideIncognitoKeyboard.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/ProvideIncognitoKeyboard.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/ProvideIncognitoKeyboard.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/QrCode.kt b/core/ui/src/main/java/org/signal/core/ui/compose/QrCode.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/QrCode.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/QrCode.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/QrCodeData.kt b/core/ui/src/main/java/org/signal/core/ui/compose/QrCodeData.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/QrCodeData.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/QrCodeData.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Rows.kt b/core/ui/src/main/java/org/signal/core/ui/compose/Rows.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/Rows.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/Rows.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Scaffolds.kt b/core/ui/src/main/java/org/signal/core/ui/compose/Scaffolds.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/Scaffolds.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/Scaffolds.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/SheetExtensions.kt b/core/ui/src/main/java/org/signal/core/ui/compose/SheetExtensions.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/SheetExtensions.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/SheetExtensions.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/SignalIcons.kt b/core/ui/src/main/java/org/signal/core/ui/compose/SignalIcons.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/SignalIcons.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/SignalIcons.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/SignalPreviews.kt b/core/ui/src/main/java/org/signal/core/ui/compose/SignalPreviews.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/SignalPreviews.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/SignalPreviews.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Snackbars.kt b/core/ui/src/main/java/org/signal/core/ui/compose/Snackbars.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/Snackbars.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/Snackbars.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/TextFields.kt b/core/ui/src/main/java/org/signal/core/ui/compose/TextFields.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/TextFields.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/TextFields.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Texts.kt b/core/ui/src/main/java/org/signal/core/ui/compose/Texts.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/Texts.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/Texts.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/Tooltips.kt b/core/ui/src/main/java/org/signal/core/ui/compose/Tooltips.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/Tooltips.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/Tooltips.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/TriggerAlignedPopup.kt b/core/ui/src/main/java/org/signal/core/ui/compose/TriggerAlignedPopup.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/TriggerAlignedPopup.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/TriggerAlignedPopup.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/DragAndDrop.kt b/core/ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/DragAndDrop.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/DragAndDrop.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/DragAndDrop.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/DragGestureDetector.kt b/core/ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/DragGestureDetector.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/DragGestureDetector.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/DragGestureDetector.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/AndroidMenu.android.kt b/core/ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/AndroidMenu.android.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/AndroidMenu.android.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/AndroidMenu.android.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/IconButton.kt b/core/ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/IconButton.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/IconButton.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/IconButton.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/Menu.kt b/core/ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/Menu.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/Menu.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/copied/androidx/compose/material3/Menu.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/theme/ExtendedColors.kt b/core/ui/src/main/java/org/signal/core/ui/compose/theme/ExtendedColors.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/theme/ExtendedColors.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/theme/ExtendedColors.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/theme/SignalTheme.kt b/core/ui/src/main/java/org/signal/core/ui/compose/theme/SignalTheme.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/theme/SignalTheme.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/theme/SignalTheme.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/compose/theme/SnackbarColors.kt b/core/ui/src/main/java/org/signal/core/ui/compose/theme/SnackbarColors.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/compose/theme/SnackbarColors.kt rename to core/ui/src/main/java/org/signal/core/ui/compose/theme/SnackbarColors.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/navigation/ResultEffect.kt b/core/ui/src/main/java/org/signal/core/ui/navigation/ResultEffect.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/navigation/ResultEffect.kt rename to core/ui/src/main/java/org/signal/core/ui/navigation/ResultEffect.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/navigation/ResultEventBus.kt b/core/ui/src/main/java/org/signal/core/ui/navigation/ResultEventBus.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/navigation/ResultEventBus.kt rename to core/ui/src/main/java/org/signal/core/ui/navigation/ResultEventBus.kt diff --git a/core-ui/src/main/java/org/signal/core/ui/view/DialogExtensions.kt b/core/ui/src/main/java/org/signal/core/ui/view/DialogExtensions.kt similarity index 100% rename from core-ui/src/main/java/org/signal/core/ui/view/DialogExtensions.kt rename to core/ui/src/main/java/org/signal/core/ui/view/DialogExtensions.kt diff --git a/core-ui/src/main/res/drawable/ic_keyboard_24.xml b/core/ui/src/main/res/drawable/ic_keyboard_24.xml similarity index 100% rename from core-ui/src/main/res/drawable/ic_keyboard_24.xml rename to core/ui/src/main/res/drawable/ic_keyboard_24.xml diff --git a/core-ui/src/main/res/drawable/qrcode_logo.png b/core/ui/src/main/res/drawable/qrcode_logo.png similarity index 100% rename from core-ui/src/main/res/drawable/qrcode_logo.png rename to core/ui/src/main/res/drawable/qrcode_logo.png diff --git a/core-ui/src/main/res/drawable/symbol_camera_24.xml b/core/ui/src/main/res/drawable/symbol_camera_24.xml similarity index 100% rename from core-ui/src/main/res/drawable/symbol_camera_24.xml rename to core/ui/src/main/res/drawable/symbol_camera_24.xml diff --git a/core-ui/src/main/res/drawable/symbol_phone_24.xml b/core/ui/src/main/res/drawable/symbol_phone_24.xml similarity index 100% rename from core-ui/src/main/res/drawable/symbol_phone_24.xml rename to core/ui/src/main/res/drawable/symbol_phone_24.xml diff --git a/core-ui/src/main/res/drawable/symbol_qrcode_24.xml b/core/ui/src/main/res/drawable/symbol_qrcode_24.xml similarity index 100% rename from core-ui/src/main/res/drawable/symbol_qrcode_24.xml rename to core/ui/src/main/res/drawable/symbol_qrcode_24.xml diff --git a/core-ui/src/main/res/values-sw360dp/dimens.xml b/core/ui/src/main/res/values-sw360dp/dimens.xml similarity index 100% rename from core-ui/src/main/res/values-sw360dp/dimens.xml rename to core/ui/src/main/res/values-sw360dp/dimens.xml diff --git a/core-ui/src/main/res/values/dimens.xml b/core/ui/src/main/res/values/dimens.xml similarity index 100% rename from core-ui/src/main/res/values/dimens.xml rename to core/ui/src/main/res/values/dimens.xml diff --git a/core-util-jvm/.gitignore b/core/util-jvm/.gitignore similarity index 100% rename from core-util-jvm/.gitignore rename to core/util-jvm/.gitignore diff --git a/core-util-jvm/build.gradle.kts b/core/util-jvm/build.gradle.kts similarity index 97% rename from core-util-jvm/build.gradle.kts rename to core/util-jvm/build.gradle.kts index 32493ac7f0..9542d656b9 100644 --- a/core-util-jvm/build.gradle.kts +++ b/core/util-jvm/build.gradle.kts @@ -45,7 +45,7 @@ wire { } tasks.runKtlintCheckOverMainSourceSet { - dependsOn(":core-util-jvm:generateMainProtos") + dependsOn(":core:util-jvm:generateMainProtos") } val sourceSets = extensions.getByName("sourceSets") as SourceSetContainer diff --git a/core-util-jvm/src/main/java/org/signal/core/util/Base64.kt b/core/util-jvm/src/main/java/org/signal/core/util/Base64.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/Base64.kt rename to core/util-jvm/src/main/java/org/signal/core/util/Base64.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/Base64Tools.java b/core/util-jvm/src/main/java/org/signal/core/util/Base64Tools.java similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/Base64Tools.java rename to core/util-jvm/src/main/java/org/signal/core/util/Base64Tools.java diff --git a/core-util-jvm/src/main/java/org/signal/core/util/BidiUtil.kt b/core/util-jvm/src/main/java/org/signal/core/util/BidiUtil.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/BidiUtil.kt rename to core/util-jvm/src/main/java/org/signal/core/util/BidiUtil.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/Bitmask.java b/core/util-jvm/src/main/java/org/signal/core/util/Bitmask.java similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/Bitmask.java rename to core/util-jvm/src/main/java/org/signal/core/util/Bitmask.java diff --git a/core-util-jvm/src/main/java/org/signal/core/util/ByteExtensions.kt b/core/util-jvm/src/main/java/org/signal/core/util/ByteExtensions.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/ByteExtensions.kt rename to core/util-jvm/src/main/java/org/signal/core/util/ByteExtensions.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/CryptoUtil.java b/core/util-jvm/src/main/java/org/signal/core/util/CryptoUtil.java similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/CryptoUtil.java rename to core/util-jvm/src/main/java/org/signal/core/util/CryptoUtil.java diff --git a/core-util-jvm/src/main/java/org/signal/core/util/DoubleExtensions.kt b/core/util-jvm/src/main/java/org/signal/core/util/DoubleExtensions.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/DoubleExtensions.kt rename to core/util-jvm/src/main/java/org/signal/core/util/DoubleExtensions.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/DurationExtensions.kt b/core/util-jvm/src/main/java/org/signal/core/util/DurationExtensions.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/DurationExtensions.kt rename to core/util-jvm/src/main/java/org/signal/core/util/DurationExtensions.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/E164Util.kt b/core/util-jvm/src/main/java/org/signal/core/util/E164Util.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/E164Util.kt rename to core/util-jvm/src/main/java/org/signal/core/util/E164Util.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/FloatExtensions.kt b/core/util-jvm/src/main/java/org/signal/core/util/FloatExtensions.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/FloatExtensions.kt rename to core/util-jvm/src/main/java/org/signal/core/util/FloatExtensions.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/FlowExtensions.kt b/core/util-jvm/src/main/java/org/signal/core/util/FlowExtensions.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/FlowExtensions.kt rename to core/util-jvm/src/main/java/org/signal/core/util/FlowExtensions.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/Hex.java b/core/util-jvm/src/main/java/org/signal/core/util/Hex.java similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/Hex.java rename to core/util-jvm/src/main/java/org/signal/core/util/Hex.java diff --git a/core-util-jvm/src/main/java/org/signal/core/util/InputStreamExtensions.kt b/core/util-jvm/src/main/java/org/signal/core/util/InputStreamExtensions.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/InputStreamExtensions.kt rename to core/util-jvm/src/main/java/org/signal/core/util/InputStreamExtensions.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/IntExtensions.kt b/core/util-jvm/src/main/java/org/signal/core/util/IntExtensions.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/IntExtensions.kt rename to core/util-jvm/src/main/java/org/signal/core/util/IntExtensions.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/LongExtensions.kt b/core/util-jvm/src/main/java/org/signal/core/util/LongExtensions.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/LongExtensions.kt rename to core/util-jvm/src/main/java/org/signal/core/util/LongExtensions.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/OptionalExtensions.kt b/core/util-jvm/src/main/java/org/signal/core/util/OptionalExtensions.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/OptionalExtensions.kt rename to core/util-jvm/src/main/java/org/signal/core/util/OptionalExtensions.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/OutputStreamExtensions.kt b/core/util-jvm/src/main/java/org/signal/core/util/OutputStreamExtensions.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/OutputStreamExtensions.kt rename to core/util-jvm/src/main/java/org/signal/core/util/OutputStreamExtensions.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/ProtoExtensions.kt b/core/util-jvm/src/main/java/org/signal/core/util/ProtoExtensions.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/ProtoExtensions.kt rename to core/util-jvm/src/main/java/org/signal/core/util/ProtoExtensions.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/RandomUtil.kt b/core/util-jvm/src/main/java/org/signal/core/util/RandomUtil.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/RandomUtil.kt rename to core/util-jvm/src/main/java/org/signal/core/util/RandomUtil.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/ResettableLazy.kt b/core/util-jvm/src/main/java/org/signal/core/util/ResettableLazy.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/ResettableLazy.kt rename to core/util-jvm/src/main/java/org/signal/core/util/ResettableLazy.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/SetUtil.java b/core/util-jvm/src/main/java/org/signal/core/util/SetUtil.java similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/SetUtil.java rename to core/util-jvm/src/main/java/org/signal/core/util/SetUtil.java diff --git a/core-util-jvm/src/main/java/org/signal/core/util/Stopwatch.kt b/core/util-jvm/src/main/java/org/signal/core/util/Stopwatch.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/Stopwatch.kt rename to core/util-jvm/src/main/java/org/signal/core/util/Stopwatch.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/StreamUtil.java b/core/util-jvm/src/main/java/org/signal/core/util/StreamUtil.java similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/StreamUtil.java rename to core/util-jvm/src/main/java/org/signal/core/util/StreamUtil.java diff --git a/core-util-jvm/src/main/java/org/signal/core/util/StringExtensions.kt b/core/util-jvm/src/main/java/org/signal/core/util/StringExtensions.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/StringExtensions.kt rename to core/util-jvm/src/main/java/org/signal/core/util/StringExtensions.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/UuidExtensions.kt b/core/util-jvm/src/main/java/org/signal/core/util/UuidExtensions.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/UuidExtensions.kt rename to core/util-jvm/src/main/java/org/signal/core/util/UuidExtensions.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/UuidUtil.kt b/core/util-jvm/src/main/java/org/signal/core/util/UuidUtil.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/UuidUtil.kt rename to core/util-jvm/src/main/java/org/signal/core/util/UuidUtil.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/concurrent/CascadingFuture.java b/core/util-jvm/src/main/java/org/signal/core/util/concurrent/CascadingFuture.java similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/concurrent/CascadingFuture.java rename to core/util-jvm/src/main/java/org/signal/core/util/concurrent/CascadingFuture.java diff --git a/core-util-jvm/src/main/java/org/signal/core/util/concurrent/FutureMapTransformer.java b/core/util-jvm/src/main/java/org/signal/core/util/concurrent/FutureMapTransformer.java similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/concurrent/FutureMapTransformer.java rename to core/util-jvm/src/main/java/org/signal/core/util/concurrent/FutureMapTransformer.java diff --git a/core-util-jvm/src/main/java/org/signal/core/util/concurrent/FutureTransformers.java b/core/util-jvm/src/main/java/org/signal/core/util/concurrent/FutureTransformers.java similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/concurrent/FutureTransformers.java rename to core/util-jvm/src/main/java/org/signal/core/util/concurrent/FutureTransformers.java diff --git a/core-util-jvm/src/main/java/org/signal/core/util/concurrent/JvmRxExtensions.kt b/core/util-jvm/src/main/java/org/signal/core/util/concurrent/JvmRxExtensions.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/concurrent/JvmRxExtensions.kt rename to core/util-jvm/src/main/java/org/signal/core/util/concurrent/JvmRxExtensions.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/concurrent/ListenableFuture.java b/core/util-jvm/src/main/java/org/signal/core/util/concurrent/ListenableFuture.java similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/concurrent/ListenableFuture.java rename to core/util-jvm/src/main/java/org/signal/core/util/concurrent/ListenableFuture.java diff --git a/core-util-jvm/src/main/java/org/signal/core/util/concurrent/SettableFuture.java b/core/util-jvm/src/main/java/org/signal/core/util/concurrent/SettableFuture.java similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/concurrent/SettableFuture.java rename to core/util-jvm/src/main/java/org/signal/core/util/concurrent/SettableFuture.java diff --git a/core-util-jvm/src/main/java/org/signal/core/util/logging/CompoundLogger.kt b/core/util-jvm/src/main/java/org/signal/core/util/logging/CompoundLogger.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/logging/CompoundLogger.kt rename to core/util-jvm/src/main/java/org/signal/core/util/logging/CompoundLogger.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/logging/Log.kt b/core/util-jvm/src/main/java/org/signal/core/util/logging/Log.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/logging/Log.kt rename to core/util-jvm/src/main/java/org/signal/core/util/logging/Log.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/logging/LoggingExtensions.kt b/core/util-jvm/src/main/java/org/signal/core/util/logging/LoggingExtensions.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/logging/LoggingExtensions.kt rename to core/util-jvm/src/main/java/org/signal/core/util/logging/LoggingExtensions.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/logging/NoopLogger.kt b/core/util-jvm/src/main/java/org/signal/core/util/logging/NoopLogger.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/logging/NoopLogger.kt rename to core/util-jvm/src/main/java/org/signal/core/util/logging/NoopLogger.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/logging/Scrubber.kt b/core/util-jvm/src/main/java/org/signal/core/util/logging/Scrubber.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/logging/Scrubber.kt rename to core/util-jvm/src/main/java/org/signal/core/util/logging/Scrubber.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/serialization/JsonExtensions.kt b/core/util-jvm/src/main/java/org/signal/core/util/serialization/JsonExtensions.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/serialization/JsonExtensions.kt rename to core/util-jvm/src/main/java/org/signal/core/util/serialization/JsonExtensions.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/serialization/JsonSerializers.kt b/core/util-jvm/src/main/java/org/signal/core/util/serialization/JsonSerializers.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/serialization/JsonSerializers.kt rename to core/util-jvm/src/main/java/org/signal/core/util/serialization/JsonSerializers.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/stream/LimitedInputStream.kt b/core/util-jvm/src/main/java/org/signal/core/util/stream/LimitedInputStream.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/stream/LimitedInputStream.kt rename to core/util-jvm/src/main/java/org/signal/core/util/stream/LimitedInputStream.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/stream/MacInputStream.kt b/core/util-jvm/src/main/java/org/signal/core/util/stream/MacInputStream.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/stream/MacInputStream.kt rename to core/util-jvm/src/main/java/org/signal/core/util/stream/MacInputStream.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/stream/MacOutputStream.kt b/core/util-jvm/src/main/java/org/signal/core/util/stream/MacOutputStream.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/stream/MacOutputStream.kt rename to core/util-jvm/src/main/java/org/signal/core/util/stream/MacOutputStream.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/stream/NonClosingOutputStream.kt b/core/util-jvm/src/main/java/org/signal/core/util/stream/NonClosingOutputStream.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/stream/NonClosingOutputStream.kt rename to core/util-jvm/src/main/java/org/signal/core/util/stream/NonClosingOutputStream.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/stream/NullOutputStream.kt b/core/util-jvm/src/main/java/org/signal/core/util/stream/NullOutputStream.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/stream/NullOutputStream.kt rename to core/util-jvm/src/main/java/org/signal/core/util/stream/NullOutputStream.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/stream/TailerInputStream.kt b/core/util-jvm/src/main/java/org/signal/core/util/stream/TailerInputStream.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/stream/TailerInputStream.kt rename to core/util-jvm/src/main/java/org/signal/core/util/stream/TailerInputStream.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/stream/TrimmingInputStream.kt b/core/util-jvm/src/main/java/org/signal/core/util/stream/TrimmingInputStream.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/stream/TrimmingInputStream.kt rename to core/util-jvm/src/main/java/org/signal/core/util/stream/TrimmingInputStream.kt diff --git a/core-util-jvm/src/main/java/org/signal/core/util/test/TestUtils.kt b/core/util-jvm/src/main/java/org/signal/core/util/test/TestUtils.kt similarity index 100% rename from core-util-jvm/src/main/java/org/signal/core/util/test/TestUtils.kt rename to core/util-jvm/src/main/java/org/signal/core/util/test/TestUtils.kt diff --git a/core-util-jvm/src/test/java/org/signal/core/util/Base64Test.kt b/core/util-jvm/src/test/java/org/signal/core/util/Base64Test.kt similarity index 100% rename from core-util-jvm/src/test/java/org/signal/core/util/Base64Test.kt rename to core/util-jvm/src/test/java/org/signal/core/util/Base64Test.kt diff --git a/core-util-jvm/src/test/java/org/signal/core/util/E164UtilTest.kt b/core/util-jvm/src/test/java/org/signal/core/util/E164UtilTest.kt similarity index 100% rename from core-util-jvm/src/test/java/org/signal/core/util/E164UtilTest.kt rename to core/util-jvm/src/test/java/org/signal/core/util/E164UtilTest.kt diff --git a/core-util-jvm/src/test/java/org/signal/core/util/FlowExtensionsTests.kt b/core/util-jvm/src/test/java/org/signal/core/util/FlowExtensionsTests.kt similarity index 100% rename from core-util-jvm/src/test/java/org/signal/core/util/FlowExtensionsTests.kt rename to core/util-jvm/src/test/java/org/signal/core/util/FlowExtensionsTests.kt diff --git a/core-util-jvm/src/test/java/org/signal/core/util/ResettableLazyTests.kt b/core/util-jvm/src/test/java/org/signal/core/util/ResettableLazyTests.kt similarity index 100% rename from core-util-jvm/src/test/java/org/signal/core/util/ResettableLazyTests.kt rename to core/util-jvm/src/test/java/org/signal/core/util/ResettableLazyTests.kt diff --git a/core-util-jvm/src/test/java/org/signal/core/util/UuidUtilTest.java b/core/util-jvm/src/test/java/org/signal/core/util/UuidUtilTest.java similarity index 100% rename from core-util-jvm/src/test/java/org/signal/core/util/UuidUtilTest.java rename to core/util-jvm/src/test/java/org/signal/core/util/UuidUtilTest.java diff --git a/core-util-jvm/src/test/java/org/signal/core/util/VarInt32Tests.kt b/core/util-jvm/src/test/java/org/signal/core/util/VarInt32Tests.kt similarity index 100% rename from core-util-jvm/src/test/java/org/signal/core/util/VarInt32Tests.kt rename to core/util-jvm/src/test/java/org/signal/core/util/VarInt32Tests.kt diff --git a/core-util-jvm/src/test/java/org/signal/core/util/logging/LogTest.kt b/core/util-jvm/src/test/java/org/signal/core/util/logging/LogTest.kt similarity index 100% rename from core-util-jvm/src/test/java/org/signal/core/util/logging/LogTest.kt rename to core/util-jvm/src/test/java/org/signal/core/util/logging/LogTest.kt diff --git a/core-util-jvm/src/test/java/org/signal/core/util/logging/ScrubberTest.kt b/core/util-jvm/src/test/java/org/signal/core/util/logging/ScrubberTest.kt similarity index 100% rename from core-util-jvm/src/test/java/org/signal/core/util/logging/ScrubberTest.kt rename to core/util-jvm/src/test/java/org/signal/core/util/logging/ScrubberTest.kt diff --git a/core-util-jvm/src/test/java/org/signal/core/util/stream/LimitedInputStreamTest.kt b/core/util-jvm/src/test/java/org/signal/core/util/stream/LimitedInputStreamTest.kt similarity index 100% rename from core-util-jvm/src/test/java/org/signal/core/util/stream/LimitedInputStreamTest.kt rename to core/util-jvm/src/test/java/org/signal/core/util/stream/LimitedInputStreamTest.kt diff --git a/core-util-jvm/src/test/java/org/signal/core/util/stream/MacInputStreamTest.kt b/core/util-jvm/src/test/java/org/signal/core/util/stream/MacInputStreamTest.kt similarity index 100% rename from core-util-jvm/src/test/java/org/signal/core/util/stream/MacInputStreamTest.kt rename to core/util-jvm/src/test/java/org/signal/core/util/stream/MacInputStreamTest.kt diff --git a/core-util-jvm/src/test/java/org/signal/core/util/stream/MacOutputStreamTest.kt b/core/util-jvm/src/test/java/org/signal/core/util/stream/MacOutputStreamTest.kt similarity index 100% rename from core-util-jvm/src/test/java/org/signal/core/util/stream/MacOutputStreamTest.kt rename to core/util-jvm/src/test/java/org/signal/core/util/stream/MacOutputStreamTest.kt diff --git a/core-util-jvm/src/test/java/org/signal/core/util/stream/TailerInputStreamTest.kt b/core/util-jvm/src/test/java/org/signal/core/util/stream/TailerInputStreamTest.kt similarity index 100% rename from core-util-jvm/src/test/java/org/signal/core/util/stream/TailerInputStreamTest.kt rename to core/util-jvm/src/test/java/org/signal/core/util/stream/TailerInputStreamTest.kt diff --git a/core-util-jvm/src/test/java/org/signal/core/util/stream/TrimmingInputStreamTest.kt b/core/util-jvm/src/test/java/org/signal/core/util/stream/TrimmingInputStreamTest.kt similarity index 100% rename from core-util-jvm/src/test/java/org/signal/core/util/stream/TrimmingInputStreamTest.kt rename to core/util-jvm/src/test/java/org/signal/core/util/stream/TrimmingInputStreamTest.kt diff --git a/core-util/.gitignore b/core/util/.gitignore similarity index 100% rename from core-util/.gitignore rename to core/util/.gitignore diff --git a/core-util/build.gradle.kts b/core/util/build.gradle.kts similarity index 93% rename from core-util/build.gradle.kts rename to core/util/build.gradle.kts index a4a18f5ad4..7795fd0e6e 100644 --- a/core-util/build.gradle.kts +++ b/core/util/build.gradle.kts @@ -8,7 +8,7 @@ android { } dependencies { - api(project(":core-util-jvm")) + api(project(":core:util-jvm")) implementation(libs.androidx.sqlite) implementation(libs.androidx.documentfile) diff --git a/core-util/consumer-rules.pro b/core/util/consumer-rules.pro similarity index 100% rename from core-util/consumer-rules.pro rename to core/util/consumer-rules.pro diff --git a/core-util/proguard-rules.pro b/core/util/proguard-rules.pro similarity index 100% rename from core-util/proguard-rules.pro rename to core/util/proguard-rules.pro diff --git a/core-ui/src/main/AndroidManifest.xml b/core/util/src/main/AndroidManifest.xml similarity index 100% rename from core-ui/src/main/AndroidManifest.xml rename to core/util/src/main/AndroidManifest.xml diff --git a/core-util/src/main/java/androidx/documentfile/provider/DocumentFileHack.kt b/core/util/src/main/java/androidx/documentfile/provider/DocumentFileHack.kt similarity index 100% rename from core-util/src/main/java/androidx/documentfile/provider/DocumentFileHack.kt rename to core/util/src/main/java/androidx/documentfile/provider/DocumentFileHack.kt diff --git a/core-util/src/main/java/org/signal/core/util/ActivityExtensions.kt b/core/util/src/main/java/org/signal/core/util/ActivityExtensions.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/ActivityExtensions.kt rename to core/util/src/main/java/org/signal/core/util/ActivityExtensions.kt diff --git a/core-util/src/main/java/org/signal/core/util/AppUtil.java b/core/util/src/main/java/org/signal/core/util/AppUtil.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/AppUtil.java rename to core/util/src/main/java/org/signal/core/util/AppUtil.java diff --git a/core-util/src/main/java/org/signal/core/util/AsciiArt.kt b/core/util/src/main/java/org/signal/core/util/AsciiArt.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/AsciiArt.kt rename to core/util/src/main/java/org/signal/core/util/AsciiArt.kt diff --git a/core-util/src/main/java/org/signal/core/util/BreakIteratorCompat.java b/core/util/src/main/java/org/signal/core/util/BreakIteratorCompat.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/BreakIteratorCompat.java rename to core/util/src/main/java/org/signal/core/util/BreakIteratorCompat.java diff --git a/core-util/src/main/java/org/signal/core/util/BundleExtensions.kt b/core/util/src/main/java/org/signal/core/util/BundleExtensions.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/BundleExtensions.kt rename to core/util/src/main/java/org/signal/core/util/BundleExtensions.kt diff --git a/core-util/src/main/java/org/signal/core/util/ByteLimitInputFilter.kt b/core/util/src/main/java/org/signal/core/util/ByteLimitInputFilter.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/ByteLimitInputFilter.kt rename to core/util/src/main/java/org/signal/core/util/ByteLimitInputFilter.kt diff --git a/core-util/src/main/java/org/signal/core/util/CharSequenceExtensions.kt b/core/util/src/main/java/org/signal/core/util/CharSequenceExtensions.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/CharSequenceExtensions.kt rename to core/util/src/main/java/org/signal/core/util/CharSequenceExtensions.kt diff --git a/core-util/src/main/java/org/signal/core/util/CharacterIterable.java b/core/util/src/main/java/org/signal/core/util/CharacterIterable.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/CharacterIterable.java rename to core/util/src/main/java/org/signal/core/util/CharacterIterable.java diff --git a/core-util/src/main/java/org/signal/core/util/CollectionsExtensions.kt b/core/util/src/main/java/org/signal/core/util/CollectionsExtensions.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/CollectionsExtensions.kt rename to core/util/src/main/java/org/signal/core/util/CollectionsExtensions.kt diff --git a/core-util/src/main/java/org/signal/core/util/ContentResolverExtensions.kt b/core/util/src/main/java/org/signal/core/util/ContentResolverExtensions.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/ContentResolverExtensions.kt rename to core/util/src/main/java/org/signal/core/util/ContentResolverExtensions.kt diff --git a/core-util/src/main/java/org/signal/core/util/ContextExtensions.kt b/core/util/src/main/java/org/signal/core/util/ContextExtensions.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/ContextExtensions.kt rename to core/util/src/main/java/org/signal/core/util/ContextExtensions.kt diff --git a/core-util/src/main/java/org/signal/core/util/Conversions.java b/core/util/src/main/java/org/signal/core/util/Conversions.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/Conversions.java rename to core/util/src/main/java/org/signal/core/util/Conversions.java diff --git a/core-util/src/main/java/org/signal/core/util/CursorExtensions.kt b/core/util/src/main/java/org/signal/core/util/CursorExtensions.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/CursorExtensions.kt rename to core/util/src/main/java/org/signal/core/util/CursorExtensions.kt diff --git a/core-util/src/main/java/org/signal/core/util/CursorUtil.java b/core/util/src/main/java/org/signal/core/util/CursorUtil.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/CursorUtil.java rename to core/util/src/main/java/org/signal/core/util/CursorUtil.java diff --git a/core-util/src/main/java/org/signal/core/util/DatabaseId.java b/core/util/src/main/java/org/signal/core/util/DatabaseId.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/DatabaseId.java rename to core/util/src/main/java/org/signal/core/util/DatabaseId.java diff --git a/core-util/src/main/java/org/signal/core/util/DimensionUnit.java b/core/util/src/main/java/org/signal/core/util/DimensionUnit.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/DimensionUnit.java rename to core/util/src/main/java/org/signal/core/util/DimensionUnit.java diff --git a/core-util/src/main/java/org/signal/core/util/DimensionUnitExtensions.kt b/core/util/src/main/java/org/signal/core/util/DimensionUnitExtensions.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/DimensionUnitExtensions.kt rename to core/util/src/main/java/org/signal/core/util/DimensionUnitExtensions.kt diff --git a/core-util/src/main/java/org/signal/core/util/DiskUtil.kt b/core/util/src/main/java/org/signal/core/util/DiskUtil.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/DiskUtil.kt rename to core/util/src/main/java/org/signal/core/util/DiskUtil.kt diff --git a/core-util/src/main/java/org/signal/core/util/EditTextUtil.java b/core/util/src/main/java/org/signal/core/util/EditTextUtil.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/EditTextUtil.java rename to core/util/src/main/java/org/signal/core/util/EditTextUtil.java diff --git a/core-util/src/main/java/org/signal/core/util/EventTimer.kt b/core/util/src/main/java/org/signal/core/util/EventTimer.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/EventTimer.kt rename to core/util/src/main/java/org/signal/core/util/EventTimer.kt diff --git a/core-util/src/main/java/org/signal/core/util/ExceptionUtil.java b/core/util/src/main/java/org/signal/core/util/ExceptionUtil.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/ExceptionUtil.java rename to core/util/src/main/java/org/signal/core/util/ExceptionUtil.java diff --git a/core-util/src/main/java/org/signal/core/util/FontUtil.kt b/core/util/src/main/java/org/signal/core/util/FontUtil.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/FontUtil.kt rename to core/util/src/main/java/org/signal/core/util/FontUtil.kt diff --git a/core-util/src/main/java/org/signal/core/util/GraphemeClusterLimitFilter.java b/core/util/src/main/java/org/signal/core/util/GraphemeClusterLimitFilter.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/GraphemeClusterLimitFilter.java rename to core/util/src/main/java/org/signal/core/util/GraphemeClusterLimitFilter.java diff --git a/core-util/src/main/java/org/signal/core/util/IntentExtensions.kt b/core/util/src/main/java/org/signal/core/util/IntentExtensions.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/IntentExtensions.kt rename to core/util/src/main/java/org/signal/core/util/IntentExtensions.kt diff --git a/core-util/src/main/java/org/signal/core/util/LinkedBlockingLifoQueue.java b/core/util/src/main/java/org/signal/core/util/LinkedBlockingLifoQueue.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/LinkedBlockingLifoQueue.java rename to core/util/src/main/java/org/signal/core/util/LinkedBlockingLifoQueue.java diff --git a/core-util/src/main/java/org/signal/core/util/ListUtil.java b/core/util/src/main/java/org/signal/core/util/ListUtil.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/ListUtil.java rename to core/util/src/main/java/org/signal/core/util/ListUtil.java diff --git a/core-util/src/main/java/org/signal/core/util/MapUtil.java b/core/util/src/main/java/org/signal/core/util/MapUtil.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/MapUtil.java rename to core/util/src/main/java/org/signal/core/util/MapUtil.java diff --git a/core-util/src/main/java/org/signal/core/util/MemoryTracker.kt b/core/util/src/main/java/org/signal/core/util/MemoryTracker.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/MemoryTracker.kt rename to core/util/src/main/java/org/signal/core/util/MemoryTracker.kt diff --git a/core-util/src/main/java/org/signal/core/util/ParallelEventTimer.kt b/core/util/src/main/java/org/signal/core/util/ParallelEventTimer.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/ParallelEventTimer.kt rename to core/util/src/main/java/org/signal/core/util/ParallelEventTimer.kt diff --git a/core-util/src/main/java/org/signal/core/util/ParcelExtensions.kt b/core/util/src/main/java/org/signal/core/util/ParcelExtensions.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/ParcelExtensions.kt rename to core/util/src/main/java/org/signal/core/util/ParcelExtensions.kt diff --git a/core-util/src/main/java/org/signal/core/util/PendingIntentFlags.kt b/core/util/src/main/java/org/signal/core/util/PendingIntentFlags.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/PendingIntentFlags.kt rename to core/util/src/main/java/org/signal/core/util/PendingIntentFlags.kt diff --git a/core-util/src/main/java/org/signal/core/util/ResourceUtil.java b/core/util/src/main/java/org/signal/core/util/ResourceUtil.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/ResourceUtil.java rename to core/util/src/main/java/org/signal/core/util/ResourceUtil.java diff --git a/core-util/src/main/java/org/signal/core/util/Result.kt b/core/util/src/main/java/org/signal/core/util/Result.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/Result.kt rename to core/util/src/main/java/org/signal/core/util/Result.kt diff --git a/core-util/src/main/java/org/signal/core/util/SQLiteDatabaseExtensions.kt b/core/util/src/main/java/org/signal/core/util/SQLiteDatabaseExtensions.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/SQLiteDatabaseExtensions.kt rename to core/util/src/main/java/org/signal/core/util/SQLiteDatabaseExtensions.kt diff --git a/core-util/src/main/java/org/signal/core/util/Serializer.kt b/core/util/src/main/java/org/signal/core/util/Serializer.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/Serializer.kt rename to core/util/src/main/java/org/signal/core/util/Serializer.kt diff --git a/core-util/src/main/java/org/signal/core/util/ShakeDetector.java b/core/util/src/main/java/org/signal/core/util/ShakeDetector.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/ShakeDetector.java rename to core/util/src/main/java/org/signal/core/util/ShakeDetector.java diff --git a/core-util/src/main/java/org/signal/core/util/SqlUtil.kt b/core/util/src/main/java/org/signal/core/util/SqlUtil.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/SqlUtil.kt rename to core/util/src/main/java/org/signal/core/util/SqlUtil.kt diff --git a/core-util/src/main/java/org/signal/core/util/StringUtil.kt b/core/util/src/main/java/org/signal/core/util/StringUtil.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/StringUtil.kt rename to core/util/src/main/java/org/signal/core/util/StringUtil.kt diff --git a/core-util/src/main/java/org/signal/core/util/SupportSQLiteQueryExtensions.kt b/core/util/src/main/java/org/signal/core/util/SupportSQLiteQueryExtensions.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/SupportSQLiteQueryExtensions.kt rename to core/util/src/main/java/org/signal/core/util/SupportSQLiteQueryExtensions.kt diff --git a/core-util/src/main/java/org/signal/core/util/ThreadUtil.java b/core/util/src/main/java/org/signal/core/util/ThreadUtil.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/ThreadUtil.java rename to core/util/src/main/java/org/signal/core/util/ThreadUtil.java diff --git a/core-util/src/main/java/org/signal/core/util/ToolbarExtensions.kt b/core/util/src/main/java/org/signal/core/util/ToolbarExtensions.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/ToolbarExtensions.kt rename to core/util/src/main/java/org/signal/core/util/ToolbarExtensions.kt diff --git a/core-util/src/main/java/org/signal/core/util/TranslationDetection.java b/core/util/src/main/java/org/signal/core/util/TranslationDetection.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/TranslationDetection.java rename to core/util/src/main/java/org/signal/core/util/TranslationDetection.java diff --git a/core-util/src/main/java/org/signal/core/util/androidx/DocumentFileInfo.kt b/core/util/src/main/java/org/signal/core/util/androidx/DocumentFileInfo.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/androidx/DocumentFileInfo.kt rename to core/util/src/main/java/org/signal/core/util/androidx/DocumentFileInfo.kt diff --git a/core-util/src/main/java/org/signal/core/util/androidx/DocumentFileUtil.kt b/core/util/src/main/java/org/signal/core/util/androidx/DocumentFileUtil.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/androidx/DocumentFileUtil.kt rename to core/util/src/main/java/org/signal/core/util/androidx/DocumentFileUtil.kt diff --git a/core-util/src/main/java/org/signal/core/util/billing/BillingApi.kt b/core/util/src/main/java/org/signal/core/util/billing/BillingApi.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/billing/BillingApi.kt rename to core/util/src/main/java/org/signal/core/util/billing/BillingApi.kt diff --git a/core-util/src/main/java/org/signal/core/util/billing/BillingDependencies.kt b/core/util/src/main/java/org/signal/core/util/billing/BillingDependencies.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/billing/BillingDependencies.kt rename to core/util/src/main/java/org/signal/core/util/billing/BillingDependencies.kt diff --git a/core-util/src/main/java/org/signal/core/util/billing/BillingError.kt b/core/util/src/main/java/org/signal/core/util/billing/BillingError.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/billing/BillingError.kt rename to core/util/src/main/java/org/signal/core/util/billing/BillingError.kt diff --git a/core-util/src/main/java/org/signal/core/util/billing/BillingProduct.kt b/core/util/src/main/java/org/signal/core/util/billing/BillingProduct.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/billing/BillingProduct.kt rename to core/util/src/main/java/org/signal/core/util/billing/BillingProduct.kt diff --git a/core-util/src/main/java/org/signal/core/util/billing/BillingPurchaseResult.kt b/core/util/src/main/java/org/signal/core/util/billing/BillingPurchaseResult.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/billing/BillingPurchaseResult.kt rename to core/util/src/main/java/org/signal/core/util/billing/BillingPurchaseResult.kt diff --git a/core-util/src/main/java/org/signal/core/util/billing/BillingPurchaseState.kt b/core/util/src/main/java/org/signal/core/util/billing/BillingPurchaseState.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/billing/BillingPurchaseState.kt rename to core/util/src/main/java/org/signal/core/util/billing/BillingPurchaseState.kt diff --git a/core-util/src/main/java/org/signal/core/util/billing/BillingResponseCode.kt b/core/util/src/main/java/org/signal/core/util/billing/BillingResponseCode.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/billing/BillingResponseCode.kt rename to core/util/src/main/java/org/signal/core/util/billing/BillingResponseCode.kt diff --git a/core-util/src/main/java/org/signal/core/util/concurrent/AnrDetector.kt b/core/util/src/main/java/org/signal/core/util/concurrent/AnrDetector.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/concurrent/AnrDetector.kt rename to core/util/src/main/java/org/signal/core/util/concurrent/AnrDetector.kt diff --git a/core-util/src/main/java/org/signal/core/util/concurrent/DeadlockDetector.kt b/core/util/src/main/java/org/signal/core/util/concurrent/DeadlockDetector.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/concurrent/DeadlockDetector.kt rename to core/util/src/main/java/org/signal/core/util/concurrent/DeadlockDetector.kt diff --git a/core-util/src/main/java/org/signal/core/util/concurrent/LatestPrioritizedSerialExecutor.java b/core/util/src/main/java/org/signal/core/util/concurrent/LatestPrioritizedSerialExecutor.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/concurrent/LatestPrioritizedSerialExecutor.java rename to core/util/src/main/java/org/signal/core/util/concurrent/LatestPrioritizedSerialExecutor.java diff --git a/core-util/src/main/java/org/signal/core/util/concurrent/LatestValueObservable.kt b/core/util/src/main/java/org/signal/core/util/concurrent/LatestValueObservable.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/concurrent/LatestValueObservable.kt rename to core/util/src/main/java/org/signal/core/util/concurrent/LatestValueObservable.kt diff --git a/core-util/src/main/java/org/signal/core/util/concurrent/LifecycleDisposable.kt b/core/util/src/main/java/org/signal/core/util/concurrent/LifecycleDisposable.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/concurrent/LifecycleDisposable.kt rename to core/util/src/main/java/org/signal/core/util/concurrent/LifecycleDisposable.kt diff --git a/core-util/src/main/java/org/signal/core/util/concurrent/LimitedWorker.kt b/core/util/src/main/java/org/signal/core/util/concurrent/LimitedWorker.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/concurrent/LimitedWorker.kt rename to core/util/src/main/java/org/signal/core/util/concurrent/LimitedWorker.kt diff --git a/core-util/src/main/java/org/signal/core/util/concurrent/MaybeCompat.kt b/core/util/src/main/java/org/signal/core/util/concurrent/MaybeCompat.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/concurrent/MaybeCompat.kt rename to core/util/src/main/java/org/signal/core/util/concurrent/MaybeCompat.kt diff --git a/core-util/src/main/java/org/signal/core/util/concurrent/RxExtensions.kt b/core/util/src/main/java/org/signal/core/util/concurrent/RxExtensions.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/concurrent/RxExtensions.kt rename to core/util/src/main/java/org/signal/core/util/concurrent/RxExtensions.kt diff --git a/core-util/src/main/java/org/signal/core/util/concurrent/SignalDispatchers.kt b/core/util/src/main/java/org/signal/core/util/concurrent/SignalDispatchers.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/concurrent/SignalDispatchers.kt rename to core/util/src/main/java/org/signal/core/util/concurrent/SignalDispatchers.kt diff --git a/core-util/src/main/java/org/signal/core/util/concurrent/SignalExecutors.java b/core/util/src/main/java/org/signal/core/util/concurrent/SignalExecutors.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/concurrent/SignalExecutors.java rename to core/util/src/main/java/org/signal/core/util/concurrent/SignalExecutors.java diff --git a/core-util/src/main/java/org/signal/core/util/concurrent/SimpleTask.java b/core/util/src/main/java/org/signal/core/util/concurrent/SimpleTask.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/concurrent/SimpleTask.java rename to core/util/src/main/java/org/signal/core/util/concurrent/SimpleTask.java diff --git a/core-util/src/main/java/org/signal/core/util/logging/AndroidLogger.kt b/core/util/src/main/java/org/signal/core/util/logging/AndroidLogger.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/logging/AndroidLogger.kt rename to core/util/src/main/java/org/signal/core/util/logging/AndroidLogger.kt diff --git a/core-util/src/main/java/org/signal/core/util/money/FiatMoney.java b/core/util/src/main/java/org/signal/core/util/money/FiatMoney.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/money/FiatMoney.java rename to core/util/src/main/java/org/signal/core/util/money/FiatMoney.java diff --git a/core-util/src/main/java/org/signal/core/util/money/PlatformCurrencyUtil.kt b/core/util/src/main/java/org/signal/core/util/money/PlatformCurrencyUtil.kt similarity index 100% rename from core-util/src/main/java/org/signal/core/util/money/PlatformCurrencyUtil.kt rename to core/util/src/main/java/org/signal/core/util/money/PlatformCurrencyUtil.kt diff --git a/core-util/src/main/java/org/signal/core/util/tracing/Tracer.java b/core/util/src/main/java/org/signal/core/util/tracing/Tracer.java similarity index 100% rename from core-util/src/main/java/org/signal/core/util/tracing/Tracer.java rename to core/util/src/main/java/org/signal/core/util/tracing/Tracer.java diff --git a/core-util/src/main/protowire/Trace.proto b/core/util/src/main/protowire/Trace.proto similarity index 100% rename from core-util/src/main/protowire/Trace.proto rename to core/util/src/main/protowire/Trace.proto diff --git a/core-util/src/main/res/drawable/ic_trash_white_24.xml b/core/util/src/main/res/drawable/ic_trash_white_24.xml similarity index 100% rename from core-util/src/main/res/drawable/ic_trash_white_24.xml rename to core/util/src/main/res/drawable/ic_trash_white_24.xml diff --git a/core-util/src/test/java/org/signal/core/util/BitmaskTest.java b/core/util/src/test/java/org/signal/core/util/BitmaskTest.java similarity index 100% rename from core-util/src/test/java/org/signal/core/util/BitmaskTest.java rename to core/util/src/test/java/org/signal/core/util/BitmaskTest.java diff --git a/core-util/src/test/java/org/signal/core/util/BreakIteratorCompatTest.kt b/core/util/src/test/java/org/signal/core/util/BreakIteratorCompatTest.kt similarity index 100% rename from core-util/src/test/java/org/signal/core/util/BreakIteratorCompatTest.kt rename to core/util/src/test/java/org/signal/core/util/BreakIteratorCompatTest.kt diff --git a/core-util/src/test/java/org/signal/core/util/ByteLimitInputFilterTest.kt b/core/util/src/test/java/org/signal/core/util/ByteLimitInputFilterTest.kt similarity index 100% rename from core-util/src/test/java/org/signal/core/util/ByteLimitInputFilterTest.kt rename to core/util/src/test/java/org/signal/core/util/ByteLimitInputFilterTest.kt diff --git a/core-util/src/test/java/org/signal/core/util/InMemorySqliteOpenHelper.kt b/core/util/src/test/java/org/signal/core/util/InMemorySqliteOpenHelper.kt similarity index 100% rename from core-util/src/test/java/org/signal/core/util/InMemorySqliteOpenHelper.kt rename to core/util/src/test/java/org/signal/core/util/InMemorySqliteOpenHelper.kt diff --git a/core-util/src/test/java/org/signal/core/util/InputStreamExtensionTests.kt b/core/util/src/test/java/org/signal/core/util/InputStreamExtensionTests.kt similarity index 100% rename from core-util/src/test/java/org/signal/core/util/InputStreamExtensionTests.kt rename to core/util/src/test/java/org/signal/core/util/InputStreamExtensionTests.kt diff --git a/core-util/src/test/java/org/signal/core/util/ListUtilTest.kt b/core/util/src/test/java/org/signal/core/util/ListUtilTest.kt similarity index 100% rename from core-util/src/test/java/org/signal/core/util/ListUtilTest.kt rename to core/util/src/test/java/org/signal/core/util/ListUtilTest.kt diff --git a/core-util/src/test/java/org/signal/core/util/SQLiteDatabaseExtensionsTest.kt b/core/util/src/test/java/org/signal/core/util/SQLiteDatabaseExtensionsTest.kt similarity index 100% rename from core-util/src/test/java/org/signal/core/util/SQLiteDatabaseExtensionsTest.kt rename to core/util/src/test/java/org/signal/core/util/SQLiteDatabaseExtensionsTest.kt diff --git a/core-util/src/test/java/org/signal/core/util/SqlUtilTest.java b/core/util/src/test/java/org/signal/core/util/SqlUtilTest.java similarity index 100% rename from core-util/src/test/java/org/signal/core/util/SqlUtilTest.java rename to core/util/src/test/java/org/signal/core/util/SqlUtilTest.java diff --git a/core-util/src/test/java/org/signal/core/util/StringExtensionsTest.kt b/core/util/src/test/java/org/signal/core/util/StringExtensionsTest.kt similarity index 100% rename from core-util/src/test/java/org/signal/core/util/StringExtensionsTest.kt rename to core/util/src/test/java/org/signal/core/util/StringExtensionsTest.kt diff --git a/core-util/src/test/java/org/signal/core/util/StringExtensions_asListContains.kt b/core/util/src/test/java/org/signal/core/util/StringExtensions_asListContains.kt similarity index 100% rename from core-util/src/test/java/org/signal/core/util/StringExtensions_asListContains.kt rename to core/util/src/test/java/org/signal/core/util/StringExtensions_asListContains.kt diff --git a/core-util/src/test/java/org/signal/core/util/StringExtensions_splitByByteLength.kt b/core/util/src/test/java/org/signal/core/util/StringExtensions_splitByByteLength.kt similarity index 100% rename from core-util/src/test/java/org/signal/core/util/StringExtensions_splitByByteLength.kt rename to core/util/src/test/java/org/signal/core/util/StringExtensions_splitByByteLength.kt diff --git a/core-util/src/test/java/org/signal/core/util/StringUtilTest_abbreviateInMiddle.java b/core/util/src/test/java/org/signal/core/util/StringUtilTest_abbreviateInMiddle.java similarity index 100% rename from core-util/src/test/java/org/signal/core/util/StringUtilTest_abbreviateInMiddle.java rename to core/util/src/test/java/org/signal/core/util/StringUtilTest_abbreviateInMiddle.java diff --git a/core-util/src/test/java/org/signal/core/util/StringUtilTest_endsWith.kt b/core/util/src/test/java/org/signal/core/util/StringUtilTest_endsWith.kt similarity index 100% rename from core-util/src/test/java/org/signal/core/util/StringUtilTest_endsWith.kt rename to core/util/src/test/java/org/signal/core/util/StringUtilTest_endsWith.kt diff --git a/core-util/src/test/java/org/signal/core/util/StringUtilTest_hasMixedTextDirection.java b/core/util/src/test/java/org/signal/core/util/StringUtilTest_hasMixedTextDirection.java similarity index 100% rename from core-util/src/test/java/org/signal/core/util/StringUtilTest_hasMixedTextDirection.java rename to core/util/src/test/java/org/signal/core/util/StringUtilTest_hasMixedTextDirection.java diff --git a/core-util/src/test/java/org/signal/core/util/StringUtilTest_replace.kt b/core/util/src/test/java/org/signal/core/util/StringUtilTest_replace.kt similarity index 100% rename from core-util/src/test/java/org/signal/core/util/StringUtilTest_replace.kt rename to core/util/src/test/java/org/signal/core/util/StringUtilTest_replace.kt diff --git a/core-util/src/test/java/org/signal/core/util/StringUtilTest_startsWith.kt b/core/util/src/test/java/org/signal/core/util/StringUtilTest_startsWith.kt similarity index 100% rename from core-util/src/test/java/org/signal/core/util/StringUtilTest_startsWith.kt rename to core/util/src/test/java/org/signal/core/util/StringUtilTest_startsWith.kt diff --git a/core-util/src/test/java/org/signal/core/util/StringUtilTest_trim.java b/core/util/src/test/java/org/signal/core/util/StringUtilTest_trim.java similarity index 100% rename from core-util/src/test/java/org/signal/core/util/StringUtilTest_trim.java rename to core/util/src/test/java/org/signal/core/util/StringUtilTest_trim.java diff --git a/core-util/src/test/java/org/signal/core/util/StringUtilTest_trimToFit.java b/core/util/src/test/java/org/signal/core/util/StringUtilTest_trimToFit.java similarity index 100% rename from core-util/src/test/java/org/signal/core/util/StringUtilTest_trimToFit.java rename to core/util/src/test/java/org/signal/core/util/StringUtilTest_trimToFit.java diff --git a/core-util/src/test/java/org/signal/core/util/StringUtilTest_whitespace_handling.java b/core/util/src/test/java/org/signal/core/util/StringUtilTest_whitespace_handling.java similarity index 100% rename from core-util/src/test/java/org/signal/core/util/StringUtilTest_whitespace_handling.java rename to core/util/src/test/java/org/signal/core/util/StringUtilTest_whitespace_handling.java diff --git a/core-util/src/test/java/org/signal/core/util/concurrent/LatestPrioritizedSerialExecutorTest.kt b/core/util/src/test/java/org/signal/core/util/concurrent/LatestPrioritizedSerialExecutorTest.kt similarity index 100% rename from core-util/src/test/java/org/signal/core/util/concurrent/LatestPrioritizedSerialExecutorTest.kt rename to core/util/src/test/java/org/signal/core/util/concurrent/LatestPrioritizedSerialExecutorTest.kt diff --git a/core-util/src/test/java/org/signal/core/util/concurrent/RxExtensionsTest.kt b/core/util/src/test/java/org/signal/core/util/concurrent/RxExtensionsTest.kt similarity index 100% rename from core-util/src/test/java/org/signal/core/util/concurrent/RxExtensionsTest.kt rename to core/util/src/test/java/org/signal/core/util/concurrent/RxExtensionsTest.kt diff --git a/core-util/src/test/java/org/signal/core/util/money/FiatMoneyTest.kt b/core/util/src/test/java/org/signal/core/util/money/FiatMoneyTest.kt similarity index 100% rename from core-util/src/test/java/org/signal/core/util/money/FiatMoneyTest.kt rename to core/util/src/test/java/org/signal/core/util/money/FiatMoneyTest.kt diff --git a/contacts/app/build.gradle b/demo/contacts/build.gradle similarity index 83% rename from contacts/app/build.gradle rename to demo/contacts/build.gradle index fc7c8c2b14..78d40364df 100644 --- a/contacts/app/build.gradle +++ b/demo/contacts/build.gradle @@ -12,5 +12,5 @@ android { } dependencies { - implementation project(':contacts') + implementation project(':lib:contacts') } \ No newline at end of file diff --git a/contacts/app/src/main/AndroidManifest.xml b/demo/contacts/src/main/AndroidManifest.xml similarity index 100% rename from contacts/app/src/main/AndroidManifest.xml rename to demo/contacts/src/main/AndroidManifest.xml diff --git a/contacts/app/src/main/java/org/signal/contactstest/AccountAuthenticatorService.kt b/demo/contacts/src/main/java/org/signal/contactstest/AccountAuthenticatorService.kt similarity index 100% rename from contacts/app/src/main/java/org/signal/contactstest/AccountAuthenticatorService.kt rename to demo/contacts/src/main/java/org/signal/contactstest/AccountAuthenticatorService.kt diff --git a/contacts/app/src/main/java/org/signal/contactstest/ContactListActivity.kt b/demo/contacts/src/main/java/org/signal/contactstest/ContactListActivity.kt similarity index 100% rename from contacts/app/src/main/java/org/signal/contactstest/ContactListActivity.kt rename to demo/contacts/src/main/java/org/signal/contactstest/ContactListActivity.kt diff --git a/contacts/app/src/main/java/org/signal/contactstest/ContactListViewModel.kt b/demo/contacts/src/main/java/org/signal/contactstest/ContactListViewModel.kt similarity index 100% rename from contacts/app/src/main/java/org/signal/contactstest/ContactListViewModel.kt rename to demo/contacts/src/main/java/org/signal/contactstest/ContactListViewModel.kt diff --git a/contacts/app/src/main/java/org/signal/contactstest/ContactLookupActivity.kt b/demo/contacts/src/main/java/org/signal/contactstest/ContactLookupActivity.kt similarity index 100% rename from contacts/app/src/main/java/org/signal/contactstest/ContactLookupActivity.kt rename to demo/contacts/src/main/java/org/signal/contactstest/ContactLookupActivity.kt diff --git a/contacts/app/src/main/java/org/signal/contactstest/ContactLookupViewModel.kt b/demo/contacts/src/main/java/org/signal/contactstest/ContactLookupViewModel.kt similarity index 100% rename from contacts/app/src/main/java/org/signal/contactstest/ContactLookupViewModel.kt rename to demo/contacts/src/main/java/org/signal/contactstest/ContactLookupViewModel.kt diff --git a/contacts/app/src/main/java/org/signal/contactstest/ContactsAdapter.kt b/demo/contacts/src/main/java/org/signal/contactstest/ContactsAdapter.kt similarity index 100% rename from contacts/app/src/main/java/org/signal/contactstest/ContactsAdapter.kt rename to demo/contacts/src/main/java/org/signal/contactstest/ContactsAdapter.kt diff --git a/contacts/app/src/main/java/org/signal/contactstest/ContactsSyncAdapter.kt b/demo/contacts/src/main/java/org/signal/contactstest/ContactsSyncAdapter.kt similarity index 100% rename from contacts/app/src/main/java/org/signal/contactstest/ContactsSyncAdapter.kt rename to demo/contacts/src/main/java/org/signal/contactstest/ContactsSyncAdapter.kt diff --git a/contacts/app/src/main/java/org/signal/contactstest/ContactsSyncAdapterService.kt b/demo/contacts/src/main/java/org/signal/contactstest/ContactsSyncAdapterService.kt similarity index 100% rename from contacts/app/src/main/java/org/signal/contactstest/ContactsSyncAdapterService.kt rename to demo/contacts/src/main/java/org/signal/contactstest/ContactsSyncAdapterService.kt diff --git a/contacts/app/src/main/java/org/signal/contactstest/MainActivity.kt b/demo/contacts/src/main/java/org/signal/contactstest/MainActivity.kt similarity index 100% rename from contacts/app/src/main/java/org/signal/contactstest/MainActivity.kt rename to demo/contacts/src/main/java/org/signal/contactstest/MainActivity.kt diff --git a/contacts/app/src/main/java/org/signal/contactstest/PhoneAdapter.kt b/demo/contacts/src/main/java/org/signal/contactstest/PhoneAdapter.kt similarity index 100% rename from contacts/app/src/main/java/org/signal/contactstest/PhoneAdapter.kt rename to demo/contacts/src/main/java/org/signal/contactstest/PhoneAdapter.kt diff --git a/contacts/app/src/main/res/drawable/ic_launcher_foreground.xml b/demo/contacts/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from contacts/app/src/main/res/drawable/ic_launcher_foreground.xml rename to demo/contacts/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/contacts/app/src/main/res/layout/activity_contact_list.xml b/demo/contacts/src/main/res/layout/activity_contact_list.xml similarity index 100% rename from contacts/app/src/main/res/layout/activity_contact_list.xml rename to demo/contacts/src/main/res/layout/activity_contact_list.xml diff --git a/contacts/app/src/main/res/layout/activity_contact_lookup.xml b/demo/contacts/src/main/res/layout/activity_contact_lookup.xml similarity index 100% rename from contacts/app/src/main/res/layout/activity_contact_lookup.xml rename to demo/contacts/src/main/res/layout/activity_contact_lookup.xml diff --git a/contacts/app/src/main/res/layout/activity_main.xml b/demo/contacts/src/main/res/layout/activity_main.xml similarity index 100% rename from contacts/app/src/main/res/layout/activity_main.xml rename to demo/contacts/src/main/res/layout/activity_main.xml diff --git a/contacts/app/src/main/res/layout/child_item.xml b/demo/contacts/src/main/res/layout/child_item.xml similarity index 100% rename from contacts/app/src/main/res/layout/child_item.xml rename to demo/contacts/src/main/res/layout/child_item.xml diff --git a/contacts/app/src/main/res/layout/parent_item.xml b/demo/contacts/src/main/res/layout/parent_item.xml similarity index 100% rename from contacts/app/src/main/res/layout/parent_item.xml rename to demo/contacts/src/main/res/layout/parent_item.xml diff --git a/contacts/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/demo/contacts/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from contacts/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to demo/contacts/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/contacts/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/demo/contacts/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from contacts/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to demo/contacts/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/contacts/app/src/main/res/values-night/themes.xml b/demo/contacts/src/main/res/values-night/themes.xml similarity index 100% rename from contacts/app/src/main/res/values-night/themes.xml rename to demo/contacts/src/main/res/values-night/themes.xml diff --git a/contacts/app/src/main/res/values/colors.xml b/demo/contacts/src/main/res/values/colors.xml similarity index 100% rename from contacts/app/src/main/res/values/colors.xml rename to demo/contacts/src/main/res/values/colors.xml diff --git a/contacts/app/src/main/res/values/ic_launcher_background.xml b/demo/contacts/src/main/res/values/ic_launcher_background.xml similarity index 100% rename from contacts/app/src/main/res/values/ic_launcher_background.xml rename to demo/contacts/src/main/res/values/ic_launcher_background.xml diff --git a/contacts/app/src/main/res/values/strings.xml b/demo/contacts/src/main/res/values/strings.xml similarity index 100% rename from contacts/app/src/main/res/values/strings.xml rename to demo/contacts/src/main/res/values/strings.xml diff --git a/contacts/app/src/main/res/values/themes.xml b/demo/contacts/src/main/res/values/themes.xml similarity index 100% rename from contacts/app/src/main/res/values/themes.xml rename to demo/contacts/src/main/res/values/themes.xml diff --git a/contacts/app/src/main/res/xml/authenticator.xml b/demo/contacts/src/main/res/xml/authenticator.xml similarity index 100% rename from contacts/app/src/main/res/xml/authenticator.xml rename to demo/contacts/src/main/res/xml/authenticator.xml diff --git a/contacts/app/src/main/res/xml/contactsformat.xml b/demo/contacts/src/main/res/xml/contactsformat.xml similarity index 100% rename from contacts/app/src/main/res/xml/contactsformat.xml rename to demo/contacts/src/main/res/xml/contactsformat.xml diff --git a/contacts/app/src/main/res/xml/syncadapter.xml b/demo/contacts/src/main/res/xml/syncadapter.xml similarity index 100% rename from contacts/app/src/main/res/xml/syncadapter.xml rename to demo/contacts/src/main/res/xml/syncadapter.xml diff --git a/debuglogs-viewer/app/build.gradle.kts b/demo/debuglogs-viewer/build.gradle.kts similarity index 71% rename from debuglogs-viewer/app/build.gradle.kts rename to demo/debuglogs-viewer/build.gradle.kts index b871f009ae..f9bbc8ecbe 100644 --- a/debuglogs-viewer/app/build.gradle.kts +++ b/demo/debuglogs-viewer/build.gradle.kts @@ -12,6 +12,6 @@ android { } dependencies { - implementation(project(":debuglogs-viewer")) - implementation(project(":core-util")) + implementation(project(":lib:debuglogs-viewer")) + implementation(project(":core:util")) } diff --git a/debuglogs-viewer/app/src/main/AndroidManifest.xml b/demo/debuglogs-viewer/src/main/AndroidManifest.xml similarity index 100% rename from debuglogs-viewer/app/src/main/AndroidManifest.xml rename to demo/debuglogs-viewer/src/main/AndroidManifest.xml diff --git a/debuglogs-viewer/app/src/main/assets/WebView.html b/demo/debuglogs-viewer/src/main/assets/WebView.html similarity index 100% rename from debuglogs-viewer/app/src/main/assets/WebView.html rename to demo/debuglogs-viewer/src/main/assets/WebView.html diff --git a/debuglogs-viewer/app/src/main/assets/WebView.js b/demo/debuglogs-viewer/src/main/assets/WebView.js similarity index 100% rename from debuglogs-viewer/app/src/main/assets/WebView.js rename to demo/debuglogs-viewer/src/main/assets/WebView.js diff --git a/debuglogs-viewer/app/src/main/assets/log.txt b/demo/debuglogs-viewer/src/main/assets/log.txt similarity index 100% rename from debuglogs-viewer/app/src/main/assets/log.txt rename to demo/debuglogs-viewer/src/main/assets/log.txt diff --git a/debuglogs-viewer/app/src/main/java/org/signal/debuglogsviewer/app/MainActivity.kt b/demo/debuglogs-viewer/src/main/java/org/signal/debuglogsviewer/app/MainActivity.kt similarity index 100% rename from debuglogs-viewer/app/src/main/java/org/signal/debuglogsviewer/app/MainActivity.kt rename to demo/debuglogs-viewer/src/main/java/org/signal/debuglogsviewer/app/MainActivity.kt diff --git a/debuglogs-viewer/app/src/main/java/org/signal/debuglogsviewer/app/webview/WebView.kt b/demo/debuglogs-viewer/src/main/java/org/signal/debuglogsviewer/app/webview/WebView.kt similarity index 100% rename from debuglogs-viewer/app/src/main/java/org/signal/debuglogsviewer/app/webview/WebView.kt rename to demo/debuglogs-viewer/src/main/java/org/signal/debuglogsviewer/app/webview/WebView.kt diff --git a/debuglogs-viewer/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/demo/debuglogs-viewer/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from debuglogs-viewer/app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to demo/debuglogs-viewer/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/debuglogs-viewer/app/src/main/res/drawable/ic_launcher_background.xml b/demo/debuglogs-viewer/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from debuglogs-viewer/app/src/main/res/drawable/ic_launcher_background.xml rename to demo/debuglogs-viewer/src/main/res/drawable/ic_launcher_background.xml diff --git a/debuglogs-viewer/app/src/main/res/drawable/ic_refresh_20.xml b/demo/debuglogs-viewer/src/main/res/drawable/ic_refresh_20.xml similarity index 100% rename from debuglogs-viewer/app/src/main/res/drawable/ic_refresh_20.xml rename to demo/debuglogs-viewer/src/main/res/drawable/ic_refresh_20.xml diff --git a/debuglogs-viewer/app/src/main/res/layout/activity_main.xml b/demo/debuglogs-viewer/src/main/res/layout/activity_main.xml similarity index 100% rename from debuglogs-viewer/app/src/main/res/layout/activity_main.xml rename to demo/debuglogs-viewer/src/main/res/layout/activity_main.xml diff --git a/debuglogs-viewer/app/src/main/res/values-night/colors.xml b/demo/debuglogs-viewer/src/main/res/values-night/colors.xml similarity index 100% rename from debuglogs-viewer/app/src/main/res/values-night/colors.xml rename to demo/debuglogs-viewer/src/main/res/values-night/colors.xml diff --git a/debuglogs-viewer/app/src/main/res/values-night/themes.xml b/demo/debuglogs-viewer/src/main/res/values-night/themes.xml similarity index 100% rename from debuglogs-viewer/app/src/main/res/values-night/themes.xml rename to demo/debuglogs-viewer/src/main/res/values-night/themes.xml diff --git a/debuglogs-viewer/app/src/main/res/values/colors.xml b/demo/debuglogs-viewer/src/main/res/values/colors.xml similarity index 100% rename from debuglogs-viewer/app/src/main/res/values/colors.xml rename to demo/debuglogs-viewer/src/main/res/values/colors.xml diff --git a/debuglogs-viewer/app/src/main/res/values/strings.xml b/demo/debuglogs-viewer/src/main/res/values/strings.xml similarity index 100% rename from debuglogs-viewer/app/src/main/res/values/strings.xml rename to demo/debuglogs-viewer/src/main/res/values/strings.xml diff --git a/debuglogs-viewer/app/src/main/res/values/themes.xml b/demo/debuglogs-viewer/src/main/res/values/themes.xml similarity index 100% rename from debuglogs-viewer/app/src/main/res/values/themes.xml rename to demo/debuglogs-viewer/src/main/res/values/themes.xml diff --git a/device-transfer/app/build.gradle.kts b/demo/device-transfer/build.gradle.kts similarity index 89% rename from device-transfer/app/build.gradle.kts rename to demo/device-transfer/build.gradle.kts index 6d9c16f615..cf8bfbdb54 100644 --- a/device-transfer/app/build.gradle.kts +++ b/demo/device-transfer/build.gradle.kts @@ -18,5 +18,5 @@ android { } dependencies { - implementation(project(":device-transfer")) + implementation(project(":lib:device-transfer")) } diff --git a/device-transfer/app/proguard/proguard.cfg b/demo/device-transfer/proguard/proguard.cfg similarity index 100% rename from device-transfer/app/proguard/proguard.cfg rename to demo/device-transfer/proguard/proguard.cfg diff --git a/device-transfer/app/src/main/AndroidManifest.xml b/demo/device-transfer/src/main/AndroidManifest.xml similarity index 100% rename from device-transfer/app/src/main/AndroidManifest.xml rename to demo/device-transfer/src/main/AndroidManifest.xml diff --git a/device-transfer/app/src/main/java/org/signal/devicetransfer/app/MainActivity.java b/demo/device-transfer/src/main/java/org/signal/devicetransfer/app/MainActivity.java similarity index 100% rename from device-transfer/app/src/main/java/org/signal/devicetransfer/app/MainActivity.java rename to demo/device-transfer/src/main/java/org/signal/devicetransfer/app/MainActivity.java diff --git a/device-transfer/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/demo/device-transfer/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from device-transfer/app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to demo/device-transfer/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/device-transfer/app/src/main/res/drawable/ic_launcher_background.xml b/demo/device-transfer/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from device-transfer/app/src/main/res/drawable/ic_launcher_background.xml rename to demo/device-transfer/src/main/res/drawable/ic_launcher_background.xml diff --git a/device-transfer/app/src/main/res/drawable/ic_refresh_20.xml b/demo/device-transfer/src/main/res/drawable/ic_refresh_20.xml similarity index 100% rename from device-transfer/app/src/main/res/drawable/ic_refresh_20.xml rename to demo/device-transfer/src/main/res/drawable/ic_refresh_20.xml diff --git a/device-transfer/app/src/main/res/layout/activity_main.xml b/demo/device-transfer/src/main/res/layout/activity_main.xml similarity index 100% rename from device-transfer/app/src/main/res/layout/activity_main.xml rename to demo/device-transfer/src/main/res/layout/activity_main.xml diff --git a/device-transfer/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/demo/device-transfer/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from device-transfer/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to demo/device-transfer/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/device-transfer/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/demo/device-transfer/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from device-transfer/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to demo/device-transfer/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/device-transfer/app/src/main/res/mipmap-hdpi/ic_launcher.png b/demo/device-transfer/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from device-transfer/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to demo/device-transfer/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/device-transfer/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/demo/device-transfer/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from device-transfer/app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to demo/device-transfer/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/device-transfer/app/src/main/res/mipmap-mdpi/ic_launcher.png b/demo/device-transfer/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from device-transfer/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to demo/device-transfer/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/device-transfer/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/demo/device-transfer/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from device-transfer/app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to demo/device-transfer/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/device-transfer/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/demo/device-transfer/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from device-transfer/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to demo/device-transfer/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/device-transfer/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/demo/device-transfer/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from device-transfer/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to demo/device-transfer/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/device-transfer/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/demo/device-transfer/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from device-transfer/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to demo/device-transfer/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/device-transfer/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/demo/device-transfer/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from device-transfer/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to demo/device-transfer/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/device-transfer/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/demo/device-transfer/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from device-transfer/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to demo/device-transfer/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/device-transfer/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/demo/device-transfer/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from device-transfer/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to demo/device-transfer/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/device-transfer/app/src/main/res/values-night/themes.xml b/demo/device-transfer/src/main/res/values-night/themes.xml similarity index 100% rename from device-transfer/app/src/main/res/values-night/themes.xml rename to demo/device-transfer/src/main/res/values-night/themes.xml diff --git a/device-transfer/app/src/main/res/values/colors.xml b/demo/device-transfer/src/main/res/values/colors.xml similarity index 100% rename from device-transfer/app/src/main/res/values/colors.xml rename to demo/device-transfer/src/main/res/values/colors.xml diff --git a/device-transfer/app/src/main/res/values/strings.xml b/demo/device-transfer/src/main/res/values/strings.xml similarity index 100% rename from device-transfer/app/src/main/res/values/strings.xml rename to demo/device-transfer/src/main/res/values/strings.xml diff --git a/device-transfer/app/src/main/res/values/themes.xml b/demo/device-transfer/src/main/res/values/themes.xml similarity index 100% rename from device-transfer/app/src/main/res/values/themes.xml rename to demo/device-transfer/src/main/res/values/themes.xml diff --git a/donations/app/build.gradle.kts b/demo/donations/build.gradle.kts similarity index 72% rename from donations/app/build.gradle.kts rename to demo/donations/build.gradle.kts index 988d9fcb33..d44d2a4a25 100644 --- a/donations/app/build.gradle.kts +++ b/demo/donations/build.gradle.kts @@ -12,6 +12,6 @@ android { } dependencies { - implementation(project(":donations")) - implementation(project(":core-util")) + implementation(project(":lib:donations")) + implementation(project(":core:util")) } diff --git a/donations/app/src/main/AndroidManifest.xml b/demo/donations/src/main/AndroidManifest.xml similarity index 100% rename from donations/app/src/main/AndroidManifest.xml rename to demo/donations/src/main/AndroidManifest.xml diff --git a/donations/app/src/main/java/org/signal/donations/app/MainActivity.java b/demo/donations/src/main/java/org/signal/donations/app/MainActivity.java similarity index 100% rename from donations/app/src/main/java/org/signal/donations/app/MainActivity.java rename to demo/donations/src/main/java/org/signal/donations/app/MainActivity.java diff --git a/donations/app/src/main/java/org/signal/donations/app/TestUtil.kt b/demo/donations/src/main/java/org/signal/donations/app/TestUtil.kt similarity index 100% rename from donations/app/src/main/java/org/signal/donations/app/TestUtil.kt rename to demo/donations/src/main/java/org/signal/donations/app/TestUtil.kt diff --git a/donations/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/demo/donations/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from donations/app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to demo/donations/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/donations/app/src/main/res/drawable/ic_launcher_background.xml b/demo/donations/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from donations/app/src/main/res/drawable/ic_launcher_background.xml rename to demo/donations/src/main/res/drawable/ic_launcher_background.xml diff --git a/donations/app/src/main/res/drawable/ic_refresh_20.xml b/demo/donations/src/main/res/drawable/ic_refresh_20.xml similarity index 100% rename from donations/app/src/main/res/drawable/ic_refresh_20.xml rename to demo/donations/src/main/res/drawable/ic_refresh_20.xml diff --git a/donations/app/src/main/res/layout/activity_main.xml b/demo/donations/src/main/res/layout/activity_main.xml similarity index 100% rename from donations/app/src/main/res/layout/activity_main.xml rename to demo/donations/src/main/res/layout/activity_main.xml diff --git a/donations/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/demo/donations/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from donations/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to demo/donations/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/donations/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/demo/donations/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from donations/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to demo/donations/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/donations/app/src/main/res/mipmap-hdpi/ic_launcher.png b/demo/donations/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from donations/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to demo/donations/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/donations/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/demo/donations/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from donations/app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to demo/donations/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/donations/app/src/main/res/mipmap-mdpi/ic_launcher.png b/demo/donations/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from donations/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to demo/donations/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/donations/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/demo/donations/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from donations/app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to demo/donations/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/donations/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/demo/donations/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from donations/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to demo/donations/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/donations/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/demo/donations/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from donations/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to demo/donations/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/donations/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/demo/donations/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from donations/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to demo/donations/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/donations/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/demo/donations/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from donations/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to demo/donations/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/donations/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/demo/donations/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from donations/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to demo/donations/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/donations/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/demo/donations/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from donations/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to demo/donations/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/donations/app/src/main/res/values-night/themes.xml b/demo/donations/src/main/res/values-night/themes.xml similarity index 100% rename from donations/app/src/main/res/values-night/themes.xml rename to demo/donations/src/main/res/values-night/themes.xml diff --git a/donations/app/src/main/res/values/colors.xml b/demo/donations/src/main/res/values/colors.xml similarity index 100% rename from donations/app/src/main/res/values/colors.xml rename to demo/donations/src/main/res/values/colors.xml diff --git a/donations/app/src/main/res/values/strings.xml b/demo/donations/src/main/res/values/strings.xml similarity index 100% rename from donations/app/src/main/res/values/strings.xml rename to demo/donations/src/main/res/values/strings.xml diff --git a/donations/app/src/main/res/values/themes.xml b/demo/donations/src/main/res/values/themes.xml similarity index 100% rename from donations/app/src/main/res/values/themes.xml rename to demo/donations/src/main/res/values/themes.xml diff --git a/glide-config/.gitignore b/demo/image-editor/.gitignore similarity index 100% rename from glide-config/.gitignore rename to demo/image-editor/.gitignore diff --git a/image-editor/app/build.gradle b/demo/image-editor/build.gradle similarity index 75% rename from image-editor/app/build.gradle rename to demo/image-editor/build.gradle index faa90f97fb..c88b6d45f7 100644 --- a/image-editor/app/build.gradle +++ b/demo/image-editor/build.gradle @@ -10,10 +10,14 @@ android { defaultConfig { applicationId = "org.signal.imageeditor.app" } + + lint { + disable += "NotificationPermission" + } } dependencies { - implementation(project(":image-editor")) + implementation(project(":lib:image-editor")) implementation(libs.glide.glide) ksp(libs.glide.ksp) diff --git a/image-editor/app/proguard-rules.pro b/demo/image-editor/proguard-rules.pro similarity index 100% rename from image-editor/app/proguard-rules.pro rename to demo/image-editor/proguard-rules.pro diff --git a/image-editor/app/src/main/AndroidManifest.xml b/demo/image-editor/src/main/AndroidManifest.xml similarity index 100% rename from image-editor/app/src/main/AndroidManifest.xml rename to demo/image-editor/src/main/AndroidManifest.xml diff --git a/image-editor/app/src/main/java/org/signal/imageeditor/app/MainActivity.java b/demo/image-editor/src/main/java/org/signal/imageeditor/app/MainActivity.java similarity index 100% rename from image-editor/app/src/main/java/org/signal/imageeditor/app/MainActivity.java rename to demo/image-editor/src/main/java/org/signal/imageeditor/app/MainActivity.java diff --git a/image-editor/app/src/main/java/org/signal/imageeditor/app/TheAppGlideModule.java b/demo/image-editor/src/main/java/org/signal/imageeditor/app/TheAppGlideModule.java similarity index 100% rename from image-editor/app/src/main/java/org/signal/imageeditor/app/TheAppGlideModule.java rename to demo/image-editor/src/main/java/org/signal/imageeditor/app/TheAppGlideModule.java diff --git a/image-editor/app/src/main/java/org/signal/imageeditor/app/renderers/StandardHitTestRenderer.java b/demo/image-editor/src/main/java/org/signal/imageeditor/app/renderers/StandardHitTestRenderer.java similarity index 100% rename from image-editor/app/src/main/java/org/signal/imageeditor/app/renderers/StandardHitTestRenderer.java rename to demo/image-editor/src/main/java/org/signal/imageeditor/app/renderers/StandardHitTestRenderer.java diff --git a/image-editor/app/src/main/java/org/signal/imageeditor/app/renderers/UriRenderer.java b/demo/image-editor/src/main/java/org/signal/imageeditor/app/renderers/UriRenderer.java similarity index 100% rename from image-editor/app/src/main/java/org/signal/imageeditor/app/renderers/UriRenderer.java rename to demo/image-editor/src/main/java/org/signal/imageeditor/app/renderers/UriRenderer.java diff --git a/image-editor/app/src/main/java/org/signal/imageeditor/app/renderers/UrlRenderer.java b/demo/image-editor/src/main/java/org/signal/imageeditor/app/renderers/UrlRenderer.java similarity index 100% rename from image-editor/app/src/main/java/org/signal/imageeditor/app/renderers/UrlRenderer.java rename to demo/image-editor/src/main/java/org/signal/imageeditor/app/renderers/UrlRenderer.java diff --git a/image-editor/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/demo/image-editor/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from image-editor/app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to demo/image-editor/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/image-editor/app/src/main/res/drawable/ic_check_black_24dp.xml b/demo/image-editor/src/main/res/drawable/ic_check_black_24dp.xml similarity index 100% rename from image-editor/app/src/main/res/drawable/ic_check_black_24dp.xml rename to demo/image-editor/src/main/res/drawable/ic_check_black_24dp.xml diff --git a/image-editor/app/src/main/res/drawable/ic_crop_black_24dp.xml b/demo/image-editor/src/main/res/drawable/ic_crop_black_24dp.xml similarity index 100% rename from image-editor/app/src/main/res/drawable/ic_crop_black_24dp.xml rename to demo/image-editor/src/main/res/drawable/ic_crop_black_24dp.xml diff --git a/image-editor/app/src/main/res/drawable/ic_flip_black_24dp.xml b/demo/image-editor/src/main/res/drawable/ic_flip_black_24dp.xml similarity index 100% rename from image-editor/app/src/main/res/drawable/ic_flip_black_24dp.xml rename to demo/image-editor/src/main/res/drawable/ic_flip_black_24dp.xml diff --git a/image-editor/app/src/main/res/drawable/ic_launcher_background.xml b/demo/image-editor/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from image-editor/app/src/main/res/drawable/ic_launcher_background.xml rename to demo/image-editor/src/main/res/drawable/ic_launcher_background.xml diff --git a/image-editor/app/src/main/res/drawable/ic_redo_black_24dp.xml b/demo/image-editor/src/main/res/drawable/ic_redo_black_24dp.xml similarity index 100% rename from image-editor/app/src/main/res/drawable/ic_redo_black_24dp.xml rename to demo/image-editor/src/main/res/drawable/ic_redo_black_24dp.xml diff --git a/image-editor/app/src/main/res/drawable/ic_rotate_left_black_24dp.xml b/demo/image-editor/src/main/res/drawable/ic_rotate_left_black_24dp.xml similarity index 100% rename from image-editor/app/src/main/res/drawable/ic_rotate_left_black_24dp.xml rename to demo/image-editor/src/main/res/drawable/ic_rotate_left_black_24dp.xml diff --git a/image-editor/app/src/main/res/drawable/ic_rotate_right_black_24dp.xml b/demo/image-editor/src/main/res/drawable/ic_rotate_right_black_24dp.xml similarity index 100% rename from image-editor/app/src/main/res/drawable/ic_rotate_right_black_24dp.xml rename to demo/image-editor/src/main/res/drawable/ic_rotate_right_black_24dp.xml diff --git a/image-editor/app/src/main/res/drawable/ic_save_black_24dp.xml b/demo/image-editor/src/main/res/drawable/ic_save_black_24dp.xml similarity index 100% rename from image-editor/app/src/main/res/drawable/ic_save_black_24dp.xml rename to demo/image-editor/src/main/res/drawable/ic_save_black_24dp.xml diff --git a/image-editor/app/src/main/res/drawable/ic_undo_black_24dp.xml b/demo/image-editor/src/main/res/drawable/ic_undo_black_24dp.xml similarity index 100% rename from image-editor/app/src/main/res/drawable/ic_undo_black_24dp.xml rename to demo/image-editor/src/main/res/drawable/ic_undo_black_24dp.xml diff --git a/image-editor/app/src/main/res/layout/main_activity.xml b/demo/image-editor/src/main/res/layout/main_activity.xml similarity index 100% rename from image-editor/app/src/main/res/layout/main_activity.xml rename to demo/image-editor/src/main/res/layout/main_activity.xml diff --git a/image-editor/app/src/main/res/menu/action_menu.xml b/demo/image-editor/src/main/res/menu/action_menu.xml similarity index 100% rename from image-editor/app/src/main/res/menu/action_menu.xml rename to demo/image-editor/src/main/res/menu/action_menu.xml diff --git a/image-editor/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/demo/image-editor/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from image-editor/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to demo/image-editor/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/image-editor/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/demo/image-editor/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from image-editor/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to demo/image-editor/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/image-editor/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/demo/image-editor/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from image-editor/app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to demo/image-editor/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/image-editor/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/demo/image-editor/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from image-editor/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to demo/image-editor/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/image-editor/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/demo/image-editor/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from image-editor/app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to demo/image-editor/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/image-editor/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/demo/image-editor/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from image-editor/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to demo/image-editor/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/image-editor/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/demo/image-editor/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from image-editor/app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to demo/image-editor/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/image-editor/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/demo/image-editor/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from image-editor/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to demo/image-editor/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/image-editor/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/demo/image-editor/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from image-editor/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to demo/image-editor/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/image-editor/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/demo/image-editor/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from image-editor/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to demo/image-editor/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/image-editor/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/demo/image-editor/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from image-editor/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to demo/image-editor/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/image-editor/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/demo/image-editor/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from image-editor/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to demo/image-editor/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/image-editor/app/src/main/res/values/colors.xml b/demo/image-editor/src/main/res/values/colors.xml similarity index 100% rename from image-editor/app/src/main/res/values/colors.xml rename to demo/image-editor/src/main/res/values/colors.xml diff --git a/image-editor/app/src/main/res/values/strings.xml b/demo/image-editor/src/main/res/values/strings.xml similarity index 100% rename from image-editor/app/src/main/res/values/strings.xml rename to demo/image-editor/src/main/res/values/strings.xml diff --git a/image-editor/app/src/main/res/values/themes.xml b/demo/image-editor/src/main/res/values/themes.xml similarity index 100% rename from image-editor/app/src/main/res/values/themes.xml rename to demo/image-editor/src/main/res/values/themes.xml diff --git a/image-editor/app/src/test/java/com/example/imageeditor/app/ExampleUnitTest.kt b/demo/image-editor/src/test/java/com/example/imageeditor/app/ExampleUnitTest.kt similarity index 100% rename from image-editor/app/src/test/java/com/example/imageeditor/app/ExampleUnitTest.kt rename to demo/image-editor/src/test/java/com/example/imageeditor/app/ExampleUnitTest.kt diff --git a/paging/app/build.gradle.kts b/demo/paging/build.gradle.kts similarity index 83% rename from paging/app/build.gradle.kts rename to demo/paging/build.gradle.kts index 600e81e1f9..3c646206f3 100644 --- a/paging/app/build.gradle.kts +++ b/demo/paging/build.gradle.kts @@ -12,5 +12,5 @@ android { } dependencies { - implementation(project(":paging")) + implementation(project(":lib:paging")) } diff --git a/paging/app/src/main/AndroidManifest.xml b/demo/paging/src/main/AndroidManifest.xml similarity index 100% rename from paging/app/src/main/AndroidManifest.xml rename to demo/paging/src/main/AndroidManifest.xml diff --git a/paging/app/src/main/java/org/signal/pagingtest/EventListener.java b/demo/paging/src/main/java/org/signal/pagingtest/EventListener.java similarity index 100% rename from paging/app/src/main/java/org/signal/pagingtest/EventListener.java rename to demo/paging/src/main/java/org/signal/pagingtest/EventListener.java diff --git a/paging/app/src/main/java/org/signal/pagingtest/Item.java b/demo/paging/src/main/java/org/signal/pagingtest/Item.java similarity index 100% rename from paging/app/src/main/java/org/signal/pagingtest/Item.java rename to demo/paging/src/main/java/org/signal/pagingtest/Item.java diff --git a/paging/app/src/main/java/org/signal/pagingtest/MainActivity.java b/demo/paging/src/main/java/org/signal/pagingtest/MainActivity.java similarity index 100% rename from paging/app/src/main/java/org/signal/pagingtest/MainActivity.java rename to demo/paging/src/main/java/org/signal/pagingtest/MainActivity.java diff --git a/paging/app/src/main/java/org/signal/pagingtest/MainDataSource.java b/demo/paging/src/main/java/org/signal/pagingtest/MainDataSource.java similarity index 100% rename from paging/app/src/main/java/org/signal/pagingtest/MainDataSource.java rename to demo/paging/src/main/java/org/signal/pagingtest/MainDataSource.java diff --git a/paging/app/src/main/java/org/signal/pagingtest/MainViewModel.java b/demo/paging/src/main/java/org/signal/pagingtest/MainViewModel.java similarity index 100% rename from paging/app/src/main/java/org/signal/pagingtest/MainViewModel.java rename to demo/paging/src/main/java/org/signal/pagingtest/MainViewModel.java diff --git a/paging/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/demo/paging/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from paging/app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to demo/paging/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/paging/app/src/main/res/drawable/ic_launcher_background.xml b/demo/paging/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from paging/app/src/main/res/drawable/ic_launcher_background.xml rename to demo/paging/src/main/res/drawable/ic_launcher_background.xml diff --git a/paging/app/src/main/res/layout/activity_main.xml b/demo/paging/src/main/res/layout/activity_main.xml similarity index 100% rename from paging/app/src/main/res/layout/activity_main.xml rename to demo/paging/src/main/res/layout/activity_main.xml diff --git a/paging/app/src/main/res/layout/item.xml b/demo/paging/src/main/res/layout/item.xml similarity index 100% rename from paging/app/src/main/res/layout/item.xml rename to demo/paging/src/main/res/layout/item.xml diff --git a/paging/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/demo/paging/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from paging/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to demo/paging/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/paging/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/demo/paging/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from paging/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to demo/paging/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/paging/app/src/main/res/mipmap-hdpi/ic_launcher.png b/demo/paging/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from paging/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to demo/paging/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/paging/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/demo/paging/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from paging/app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to demo/paging/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/paging/app/src/main/res/mipmap-mdpi/ic_launcher.png b/demo/paging/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from paging/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to demo/paging/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/paging/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/demo/paging/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from paging/app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to demo/paging/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/paging/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/demo/paging/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from paging/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to demo/paging/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/paging/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/demo/paging/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from paging/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to demo/paging/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/paging/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/demo/paging/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from paging/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to demo/paging/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/paging/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/demo/paging/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from paging/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to demo/paging/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/paging/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/demo/paging/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from paging/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to demo/paging/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/paging/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/demo/paging/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from paging/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to demo/paging/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/paging/app/src/main/res/values-night/themes.xml b/demo/paging/src/main/res/values-night/themes.xml similarity index 100% rename from paging/app/src/main/res/values-night/themes.xml rename to demo/paging/src/main/res/values-night/themes.xml diff --git a/paging/app/src/main/res/values/colors.xml b/demo/paging/src/main/res/values/colors.xml similarity index 100% rename from paging/app/src/main/res/values/colors.xml rename to demo/paging/src/main/res/values/colors.xml diff --git a/paging/app/src/main/res/values/strings.xml b/demo/paging/src/main/res/values/strings.xml similarity index 100% rename from paging/app/src/main/res/values/strings.xml rename to demo/paging/src/main/res/values/strings.xml diff --git a/paging/app/src/main/res/values/themes.xml b/demo/paging/src/main/res/values/themes.xml similarity index 100% rename from paging/app/src/main/res/values/themes.xml rename to demo/paging/src/main/res/values/themes.xml diff --git a/qr/app/build.gradle.kts b/demo/qr/build.gradle.kts similarity index 89% rename from qr/app/build.gradle.kts rename to demo/qr/build.gradle.kts index c343d0279f..c4626eecd0 100644 --- a/qr/app/build.gradle.kts +++ b/demo/qr/build.gradle.kts @@ -12,7 +12,7 @@ android { } dependencies { - implementation(project(":qr")) + implementation(project(":lib:qr")) implementation(libs.google.zxing.android.integration) implementation(libs.google.zxing.core) diff --git a/qr/app/src/main/AndroidManifest.xml b/demo/qr/src/main/AndroidManifest.xml similarity index 100% rename from qr/app/src/main/AndroidManifest.xml rename to demo/qr/src/main/AndroidManifest.xml diff --git a/qr/app/src/main/ic_launcher-playstore.png b/demo/qr/src/main/ic_launcher-playstore.png similarity index 100% rename from qr/app/src/main/ic_launcher-playstore.png rename to demo/qr/src/main/ic_launcher-playstore.png diff --git a/qr/app/src/main/java/org/signal/qrtest/QrMainActivity.kt b/demo/qr/src/main/java/org/signal/qrtest/QrMainActivity.kt similarity index 100% rename from qr/app/src/main/java/org/signal/qrtest/QrMainActivity.kt rename to demo/qr/src/main/java/org/signal/qrtest/QrMainActivity.kt diff --git a/qr/app/src/main/res/drawable/ic_launcher_background.xml b/demo/qr/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from qr/app/src/main/res/drawable/ic_launcher_background.xml rename to demo/qr/src/main/res/drawable/ic_launcher_background.xml diff --git a/qr/app/src/main/res/drawable/ic_launcher_foreground.xml b/demo/qr/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from qr/app/src/main/res/drawable/ic_launcher_foreground.xml rename to demo/qr/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/qr/app/src/main/res/layout/activity_main.xml b/demo/qr/src/main/res/layout/activity_main.xml similarity index 100% rename from qr/app/src/main/res/layout/activity_main.xml rename to demo/qr/src/main/res/layout/activity_main.xml diff --git a/qr/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/demo/qr/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from qr/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to demo/qr/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/qr/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/demo/qr/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from qr/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to demo/qr/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/qr/app/src/main/res/mipmap-hdpi/ic_launcher.png b/demo/qr/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from qr/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to demo/qr/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/qr/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/demo/qr/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from qr/app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to demo/qr/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/qr/app/src/main/res/mipmap-mdpi/ic_launcher.png b/demo/qr/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from qr/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to demo/qr/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/qr/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/demo/qr/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from qr/app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to demo/qr/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/qr/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/demo/qr/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from qr/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to demo/qr/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/qr/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/demo/qr/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from qr/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to demo/qr/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/qr/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/demo/qr/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from qr/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to demo/qr/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/qr/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/demo/qr/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from qr/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to demo/qr/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/qr/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/demo/qr/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from qr/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to demo/qr/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/qr/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/demo/qr/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from qr/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to demo/qr/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/qr/app/src/main/res/values-night/themes.xml b/demo/qr/src/main/res/values-night/themes.xml similarity index 100% rename from qr/app/src/main/res/values-night/themes.xml rename to demo/qr/src/main/res/values-night/themes.xml diff --git a/qr/app/src/main/res/values/colors.xml b/demo/qr/src/main/res/values/colors.xml similarity index 100% rename from qr/app/src/main/res/values/colors.xml rename to demo/qr/src/main/res/values/colors.xml diff --git a/qr/app/src/main/res/values/strings.xml b/demo/qr/src/main/res/values/strings.xml similarity index 100% rename from qr/app/src/main/res/values/strings.xml rename to demo/qr/src/main/res/values/strings.xml diff --git a/qr/app/src/main/res/values/themes.xml b/demo/qr/src/main/res/values/themes.xml similarity index 100% rename from qr/app/src/main/res/values/themes.xml rename to demo/qr/src/main/res/values/themes.xml diff --git a/registration/app/build.gradle.kts b/demo/registration/build.gradle.kts similarity index 93% rename from registration/app/build.gradle.kts rename to demo/registration/build.gradle.kts index a7fd765eee..0f0099f2ba 100644 --- a/registration/app/build.gradle.kts +++ b/demo/registration/build.gradle.kts @@ -52,13 +52,13 @@ dependencies { lintChecks(project(":lintchecks")) // Registration library - implementation(project(":registration")) + implementation(project(":feature:registration")) // Core dependencies - implementation(project(":core-ui")) - implementation(project(":core-util")) - implementation(project(":core-models")) - implementation(project(":libsignal-service")) + implementation(project(":core:ui")) + implementation(project(":core:util")) + implementation(project(":core:models")) + implementation(project(":lib:libsignal-service")) // libsignal-protocol for PreKeyCollection types implementation(libs.libsignal.client) diff --git a/registration/app/src/main/AndroidManifest.xml b/demo/registration/src/main/AndroidManifest.xml similarity index 100% rename from registration/app/src/main/AndroidManifest.xml rename to demo/registration/src/main/AndroidManifest.xml diff --git a/registration/app/src/main/java/org/signal/registration/sample/MainActivity.kt b/demo/registration/src/main/java/org/signal/registration/sample/MainActivity.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/MainActivity.kt rename to demo/registration/src/main/java/org/signal/registration/sample/MainActivity.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/RegistrationApplication.kt b/demo/registration/src/main/java/org/signal/registration/sample/RegistrationApplication.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/RegistrationApplication.kt rename to demo/registration/src/main/java/org/signal/registration/sample/RegistrationApplication.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/debug/DebugNetworkController.kt b/demo/registration/src/main/java/org/signal/registration/sample/debug/DebugNetworkController.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/debug/DebugNetworkController.kt rename to demo/registration/src/main/java/org/signal/registration/sample/debug/DebugNetworkController.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/debug/DebugNetworkMockData.kt b/demo/registration/src/main/java/org/signal/registration/sample/debug/DebugNetworkMockData.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/debug/DebugNetworkMockData.kt rename to demo/registration/src/main/java/org/signal/registration/sample/debug/DebugNetworkMockData.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/debug/NetworkDebugOverlay.kt b/demo/registration/src/main/java/org/signal/registration/sample/debug/NetworkDebugOverlay.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/debug/NetworkDebugOverlay.kt rename to demo/registration/src/main/java/org/signal/registration/sample/debug/NetworkDebugOverlay.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/debug/NetworkDebugState.kt b/demo/registration/src/main/java/org/signal/registration/sample/debug/NetworkDebugState.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/debug/NetworkDebugState.kt rename to demo/registration/src/main/java/org/signal/registration/sample/debug/NetworkDebugState.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/dependencies/RealNetworkController.kt b/demo/registration/src/main/java/org/signal/registration/sample/dependencies/RealNetworkController.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/dependencies/RealNetworkController.kt rename to demo/registration/src/main/java/org/signal/registration/sample/dependencies/RealNetworkController.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/dependencies/RealStorageController.kt b/demo/registration/src/main/java/org/signal/registration/sample/dependencies/RealStorageController.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/dependencies/RealStorageController.kt rename to demo/registration/src/main/java/org/signal/registration/sample/dependencies/RealStorageController.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/fcm/FcmReceiveService.kt b/demo/registration/src/main/java/org/signal/registration/sample/fcm/FcmReceiveService.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/fcm/FcmReceiveService.kt rename to demo/registration/src/main/java/org/signal/registration/sample/fcm/FcmReceiveService.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/fcm/FcmUtil.kt b/demo/registration/src/main/java/org/signal/registration/sample/fcm/FcmUtil.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/fcm/FcmUtil.kt rename to demo/registration/src/main/java/org/signal/registration/sample/fcm/FcmUtil.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/fcm/PushChallengeReceiver.kt b/demo/registration/src/main/java/org/signal/registration/sample/fcm/PushChallengeReceiver.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/fcm/PushChallengeReceiver.kt rename to demo/registration/src/main/java/org/signal/registration/sample/fcm/PushChallengeReceiver.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/screens/RegistrationCompleteScreen.kt b/demo/registration/src/main/java/org/signal/registration/sample/screens/RegistrationCompleteScreen.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/screens/RegistrationCompleteScreen.kt rename to demo/registration/src/main/java/org/signal/registration/sample/screens/RegistrationCompleteScreen.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/screens/main/MainScreen.kt b/demo/registration/src/main/java/org/signal/registration/sample/screens/main/MainScreen.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/screens/main/MainScreen.kt rename to demo/registration/src/main/java/org/signal/registration/sample/screens/main/MainScreen.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/screens/main/MainScreenEvents.kt b/demo/registration/src/main/java/org/signal/registration/sample/screens/main/MainScreenEvents.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/screens/main/MainScreenEvents.kt rename to demo/registration/src/main/java/org/signal/registration/sample/screens/main/MainScreenEvents.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/screens/main/MainScreenState.kt b/demo/registration/src/main/java/org/signal/registration/sample/screens/main/MainScreenState.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/screens/main/MainScreenState.kt rename to demo/registration/src/main/java/org/signal/registration/sample/screens/main/MainScreenState.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/screens/main/MainScreenViewModel.kt b/demo/registration/src/main/java/org/signal/registration/sample/screens/main/MainScreenViewModel.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/screens/main/MainScreenViewModel.kt rename to demo/registration/src/main/java/org/signal/registration/sample/screens/main/MainScreenViewModel.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/screens/pinsettings/PinSettingsEvents.kt b/demo/registration/src/main/java/org/signal/registration/sample/screens/pinsettings/PinSettingsEvents.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/screens/pinsettings/PinSettingsEvents.kt rename to demo/registration/src/main/java/org/signal/registration/sample/screens/pinsettings/PinSettingsEvents.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/screens/pinsettings/PinSettingsScreen.kt b/demo/registration/src/main/java/org/signal/registration/sample/screens/pinsettings/PinSettingsScreen.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/screens/pinsettings/PinSettingsScreen.kt rename to demo/registration/src/main/java/org/signal/registration/sample/screens/pinsettings/PinSettingsScreen.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/screens/pinsettings/PinSettingsState.kt b/demo/registration/src/main/java/org/signal/registration/sample/screens/pinsettings/PinSettingsState.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/screens/pinsettings/PinSettingsState.kt rename to demo/registration/src/main/java/org/signal/registration/sample/screens/pinsettings/PinSettingsState.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/screens/pinsettings/PinSettingsViewModel.kt b/demo/registration/src/main/java/org/signal/registration/sample/screens/pinsettings/PinSettingsViewModel.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/screens/pinsettings/PinSettingsViewModel.kt rename to demo/registration/src/main/java/org/signal/registration/sample/screens/pinsettings/PinSettingsViewModel.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/storage/RegistrationDatabase.kt b/demo/registration/src/main/java/org/signal/registration/sample/storage/RegistrationDatabase.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/storage/RegistrationDatabase.kt rename to demo/registration/src/main/java/org/signal/registration/sample/storage/RegistrationDatabase.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/storage/RegistrationPreferences.kt b/demo/registration/src/main/java/org/signal/registration/sample/storage/RegistrationPreferences.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/storage/RegistrationPreferences.kt rename to demo/registration/src/main/java/org/signal/registration/sample/storage/RegistrationPreferences.kt diff --git a/registration/app/src/main/java/org/signal/registration/sample/util/PreviewRegistrationDependencies.kt b/demo/registration/src/main/java/org/signal/registration/sample/util/PreviewRegistrationDependencies.kt similarity index 100% rename from registration/app/src/main/java/org/signal/registration/sample/util/PreviewRegistrationDependencies.kt rename to demo/registration/src/main/java/org/signal/registration/sample/util/PreviewRegistrationDependencies.kt diff --git a/registration/app/src/main/res/drawable/ic_launcher_foreground.xml b/demo/registration/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from registration/app/src/main/res/drawable/ic_launcher_foreground.xml rename to demo/registration/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/registration/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/demo/registration/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from registration/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to demo/registration/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/registration/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/demo/registration/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from registration/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to demo/registration/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/registration/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/demo/registration/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from registration/app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to demo/registration/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/registration/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/demo/registration/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from registration/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to demo/registration/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/registration/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/demo/registration/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from registration/app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to demo/registration/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/registration/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/demo/registration/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from registration/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to demo/registration/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/registration/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/demo/registration/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from registration/app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to demo/registration/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/registration/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/demo/registration/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from registration/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to demo/registration/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/registration/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/demo/registration/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from registration/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to demo/registration/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/registration/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/demo/registration/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from registration/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to demo/registration/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/registration/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/demo/registration/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from registration/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to demo/registration/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/registration/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/demo/registration/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from registration/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to demo/registration/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/registration/app/src/main/res/raw/whisper.store b/demo/registration/src/main/res/raw/whisper.store similarity index 100% rename from registration/app/src/main/res/raw/whisper.store rename to demo/registration/src/main/res/raw/whisper.store diff --git a/registration/app/src/main/res/values/firebase_messaging.xml b/demo/registration/src/main/res/values/firebase_messaging.xml similarity index 100% rename from registration/app/src/main/res/values/firebase_messaging.xml rename to demo/registration/src/main/res/values/firebase_messaging.xml diff --git a/registration/app/src/main/res/values/ic_launcher_background.xml b/demo/registration/src/main/res/values/ic_launcher_background.xml similarity index 100% rename from registration/app/src/main/res/values/ic_launcher_background.xml rename to demo/registration/src/main/res/values/ic_launcher_background.xml diff --git a/spinner/app/build.gradle.kts b/demo/spinner/build.gradle.kts similarity index 88% rename from spinner/app/build.gradle.kts rename to demo/spinner/build.gradle.kts index 519ecc6bec..4bb3c052a7 100644 --- a/spinner/app/build.gradle.kts +++ b/demo/spinner/build.gradle.kts @@ -12,7 +12,7 @@ android { } dependencies { - implementation(project(":spinner")) + implementation(project(":lib:spinner")) implementation(libs.androidx.sqlite) implementation(libs.signal.android.database.sqlcipher) diff --git a/spinner/app/src/main/AndroidManifest.xml b/demo/spinner/src/main/AndroidManifest.xml similarity index 100% rename from spinner/app/src/main/AndroidManifest.xml rename to demo/spinner/src/main/AndroidManifest.xml diff --git a/spinner/app/src/main/java/org/signal/spinnertest/MainActivity.kt b/demo/spinner/src/main/java/org/signal/spinnertest/MainActivity.kt similarity index 100% rename from spinner/app/src/main/java/org/signal/spinnertest/MainActivity.kt rename to demo/spinner/src/main/java/org/signal/spinnertest/MainActivity.kt diff --git a/spinner/app/src/main/java/org/signal/spinnertest/SpinnerTestSqliteOpenHelper.kt b/demo/spinner/src/main/java/org/signal/spinnertest/SpinnerTestSqliteOpenHelper.kt similarity index 100% rename from spinner/app/src/main/java/org/signal/spinnertest/SpinnerTestSqliteOpenHelper.kt rename to demo/spinner/src/main/java/org/signal/spinnertest/SpinnerTestSqliteOpenHelper.kt diff --git a/spinner/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/demo/spinner/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from spinner/app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to demo/spinner/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/spinner/app/src/main/res/drawable/ic_launcher_background.xml b/demo/spinner/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from spinner/app/src/main/res/drawable/ic_launcher_background.xml rename to demo/spinner/src/main/res/drawable/ic_launcher_background.xml diff --git a/spinner/app/src/main/res/layout/activity_main.xml b/demo/spinner/src/main/res/layout/activity_main.xml similarity index 100% rename from spinner/app/src/main/res/layout/activity_main.xml rename to demo/spinner/src/main/res/layout/activity_main.xml diff --git a/spinner/app/src/main/res/layout/item.xml b/demo/spinner/src/main/res/layout/item.xml similarity index 100% rename from spinner/app/src/main/res/layout/item.xml rename to demo/spinner/src/main/res/layout/item.xml diff --git a/spinner/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/demo/spinner/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from spinner/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to demo/spinner/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/spinner/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/demo/spinner/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from spinner/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to demo/spinner/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/spinner/app/src/main/res/mipmap-hdpi/ic_launcher.png b/demo/spinner/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from spinner/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to demo/spinner/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/spinner/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/demo/spinner/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from spinner/app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to demo/spinner/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/spinner/app/src/main/res/mipmap-mdpi/ic_launcher.png b/demo/spinner/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from spinner/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to demo/spinner/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/spinner/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/demo/spinner/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from spinner/app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to demo/spinner/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/spinner/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/demo/spinner/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from spinner/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to demo/spinner/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/spinner/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/demo/spinner/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from spinner/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to demo/spinner/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/spinner/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/demo/spinner/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from spinner/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to demo/spinner/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/spinner/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/demo/spinner/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from spinner/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to demo/spinner/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/spinner/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/demo/spinner/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from spinner/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to demo/spinner/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/spinner/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/demo/spinner/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from spinner/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to demo/spinner/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/spinner/app/src/main/res/values-night/themes.xml b/demo/spinner/src/main/res/values-night/themes.xml similarity index 100% rename from spinner/app/src/main/res/values-night/themes.xml rename to demo/spinner/src/main/res/values-night/themes.xml diff --git a/spinner/app/src/main/res/values/colors.xml b/demo/spinner/src/main/res/values/colors.xml similarity index 100% rename from spinner/app/src/main/res/values/colors.xml rename to demo/spinner/src/main/res/values/colors.xml diff --git a/spinner/app/src/main/res/values/strings.xml b/demo/spinner/src/main/res/values/strings.xml similarity index 100% rename from spinner/app/src/main/res/values/strings.xml rename to demo/spinner/src/main/res/values/strings.xml diff --git a/spinner/app/src/main/res/values/themes.xml b/demo/spinner/src/main/res/values/themes.xml similarity index 100% rename from spinner/app/src/main/res/values/themes.xml rename to demo/spinner/src/main/res/values/themes.xml diff --git a/image-editor/app/.gitignore b/demo/video/.gitignore similarity index 100% rename from image-editor/app/.gitignore rename to demo/video/.gitignore diff --git a/video/app/build.gradle.kts b/demo/video/build.gradle.kts similarity index 95% rename from video/app/build.gradle.kts rename to demo/video/build.gradle.kts index 52ffc2b526..be919a3d78 100644 --- a/video/app/build.gradle.kts +++ b/demo/video/build.gradle.kts @@ -57,8 +57,8 @@ dependencies { implementation(platform(libs.androidx.compose.bom)) implementation(libs.androidx.compose.material3) implementation(libs.bundles.media3) - implementation(project(":video")) - implementation(project(":core-util")) + implementation(project(":lib:video")) + implementation(project(":core:util")) implementation("androidx.work:work-runtime-ktx:2.9.1") implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.8.4") implementation(libs.androidx.compose.ui.tooling.core) diff --git a/image-editor/lib/proguard-rules.pro b/demo/video/proguard-rules.pro similarity index 100% rename from image-editor/lib/proguard-rules.pro rename to demo/video/proguard-rules.pro diff --git a/video/app/src/androidTest/java/org/thoughtcrime/video/app/ExampleInstrumentedTest.kt b/demo/video/src/androidTest/java/org/thoughtcrime/video/app/ExampleInstrumentedTest.kt similarity index 100% rename from video/app/src/androidTest/java/org/thoughtcrime/video/app/ExampleInstrumentedTest.kt rename to demo/video/src/androidTest/java/org/thoughtcrime/video/app/ExampleInstrumentedTest.kt diff --git a/video/app/src/main/AndroidManifest.xml b/demo/video/src/main/AndroidManifest.xml similarity index 100% rename from video/app/src/main/AndroidManifest.xml rename to demo/video/src/main/AndroidManifest.xml diff --git a/video/app/src/main/java/org/thoughtcrime/video/app/MainActivity.kt b/demo/video/src/main/java/org/thoughtcrime/video/app/MainActivity.kt similarity index 100% rename from video/app/src/main/java/org/thoughtcrime/video/app/MainActivity.kt rename to demo/video/src/main/java/org/thoughtcrime/video/app/MainActivity.kt diff --git a/video/app/src/main/java/org/thoughtcrime/video/app/playback/PlaybackTestActivity.kt b/demo/video/src/main/java/org/thoughtcrime/video/app/playback/PlaybackTestActivity.kt similarity index 100% rename from video/app/src/main/java/org/thoughtcrime/video/app/playback/PlaybackTestActivity.kt rename to demo/video/src/main/java/org/thoughtcrime/video/app/playback/PlaybackTestActivity.kt diff --git a/video/app/src/main/java/org/thoughtcrime/video/app/playback/PlaybackTestViewModel.kt b/demo/video/src/main/java/org/thoughtcrime/video/app/playback/PlaybackTestViewModel.kt similarity index 100% rename from video/app/src/main/java/org/thoughtcrime/video/app/playback/PlaybackTestViewModel.kt rename to demo/video/src/main/java/org/thoughtcrime/video/app/playback/PlaybackTestViewModel.kt diff --git a/video/app/src/main/java/org/thoughtcrime/video/app/playback/SlowDataSource.kt b/demo/video/src/main/java/org/thoughtcrime/video/app/playback/SlowDataSource.kt similarity index 100% rename from video/app/src/main/java/org/thoughtcrime/video/app/playback/SlowDataSource.kt rename to demo/video/src/main/java/org/thoughtcrime/video/app/playback/SlowDataSource.kt diff --git a/video/app/src/main/java/org/thoughtcrime/video/app/transcode/Constants.kt b/demo/video/src/main/java/org/thoughtcrime/video/app/transcode/Constants.kt similarity index 100% rename from video/app/src/main/java/org/thoughtcrime/video/app/transcode/Constants.kt rename to demo/video/src/main/java/org/thoughtcrime/video/app/transcode/Constants.kt diff --git a/video/app/src/main/java/org/thoughtcrime/video/app/transcode/TranscodeTestActivity.kt b/demo/video/src/main/java/org/thoughtcrime/video/app/transcode/TranscodeTestActivity.kt similarity index 100% rename from video/app/src/main/java/org/thoughtcrime/video/app/transcode/TranscodeTestActivity.kt rename to demo/video/src/main/java/org/thoughtcrime/video/app/transcode/TranscodeTestActivity.kt diff --git a/video/app/src/main/java/org/thoughtcrime/video/app/transcode/TranscodeTestRepository.kt b/demo/video/src/main/java/org/thoughtcrime/video/app/transcode/TranscodeTestRepository.kt similarity index 100% rename from video/app/src/main/java/org/thoughtcrime/video/app/transcode/TranscodeTestRepository.kt rename to demo/video/src/main/java/org/thoughtcrime/video/app/transcode/TranscodeTestRepository.kt diff --git a/video/app/src/main/java/org/thoughtcrime/video/app/transcode/TranscodeTestViewModel.kt b/demo/video/src/main/java/org/thoughtcrime/video/app/transcode/TranscodeTestViewModel.kt similarity index 100% rename from video/app/src/main/java/org/thoughtcrime/video/app/transcode/TranscodeTestViewModel.kt rename to demo/video/src/main/java/org/thoughtcrime/video/app/transcode/TranscodeTestViewModel.kt diff --git a/video/app/src/main/java/org/thoughtcrime/video/app/transcode/TranscodeWorker.kt b/demo/video/src/main/java/org/thoughtcrime/video/app/transcode/TranscodeWorker.kt similarity index 100% rename from video/app/src/main/java/org/thoughtcrime/video/app/transcode/TranscodeWorker.kt rename to demo/video/src/main/java/org/thoughtcrime/video/app/transcode/TranscodeWorker.kt diff --git a/video/app/src/main/java/org/thoughtcrime/video/app/transcode/composables/ConfigurationSelection.kt b/demo/video/src/main/java/org/thoughtcrime/video/app/transcode/composables/ConfigurationSelection.kt similarity index 100% rename from video/app/src/main/java/org/thoughtcrime/video/app/transcode/composables/ConfigurationSelection.kt rename to demo/video/src/main/java/org/thoughtcrime/video/app/transcode/composables/ConfigurationSelection.kt diff --git a/video/app/src/main/java/org/thoughtcrime/video/app/transcode/composables/InputSelection.kt b/demo/video/src/main/java/org/thoughtcrime/video/app/transcode/composables/InputSelection.kt similarity index 100% rename from video/app/src/main/java/org/thoughtcrime/video/app/transcode/composables/InputSelection.kt rename to demo/video/src/main/java/org/thoughtcrime/video/app/transcode/composables/InputSelection.kt diff --git a/video/app/src/main/java/org/thoughtcrime/video/app/transcode/composables/OutputSelection.kt b/demo/video/src/main/java/org/thoughtcrime/video/app/transcode/composables/OutputSelection.kt similarity index 100% rename from video/app/src/main/java/org/thoughtcrime/video/app/transcode/composables/OutputSelection.kt rename to demo/video/src/main/java/org/thoughtcrime/video/app/transcode/composables/OutputSelection.kt diff --git a/video/app/src/main/java/org/thoughtcrime/video/app/transcode/composables/Progress.kt b/demo/video/src/main/java/org/thoughtcrime/video/app/transcode/composables/Progress.kt similarity index 100% rename from video/app/src/main/java/org/thoughtcrime/video/app/transcode/composables/Progress.kt rename to demo/video/src/main/java/org/thoughtcrime/video/app/transcode/composables/Progress.kt diff --git a/video/app/src/main/java/org/thoughtcrime/video/app/ui/composables/LabeledButton.kt b/demo/video/src/main/java/org/thoughtcrime/video/app/ui/composables/LabeledButton.kt similarity index 100% rename from video/app/src/main/java/org/thoughtcrime/video/app/ui/composables/LabeledButton.kt rename to demo/video/src/main/java/org/thoughtcrime/video/app/ui/composables/LabeledButton.kt diff --git a/video/app/src/main/java/org/thoughtcrime/video/app/ui/theme/Color.kt b/demo/video/src/main/java/org/thoughtcrime/video/app/ui/theme/Color.kt similarity index 100% rename from video/app/src/main/java/org/thoughtcrime/video/app/ui/theme/Color.kt rename to demo/video/src/main/java/org/thoughtcrime/video/app/ui/theme/Color.kt diff --git a/video/app/src/main/java/org/thoughtcrime/video/app/ui/theme/Theme.kt b/demo/video/src/main/java/org/thoughtcrime/video/app/ui/theme/Theme.kt similarity index 100% rename from video/app/src/main/java/org/thoughtcrime/video/app/ui/theme/Theme.kt rename to demo/video/src/main/java/org/thoughtcrime/video/app/ui/theme/Theme.kt diff --git a/video/app/src/main/java/org/thoughtcrime/video/app/ui/theme/Type.kt b/demo/video/src/main/java/org/thoughtcrime/video/app/ui/theme/Type.kt similarity index 100% rename from video/app/src/main/java/org/thoughtcrime/video/app/ui/theme/Type.kt rename to demo/video/src/main/java/org/thoughtcrime/video/app/ui/theme/Type.kt diff --git a/video/app/src/main/res/drawable-anydpi-v24/ic_work_notification.xml b/demo/video/src/main/res/drawable-anydpi-v24/ic_work_notification.xml similarity index 100% rename from video/app/src/main/res/drawable-anydpi-v24/ic_work_notification.xml rename to demo/video/src/main/res/drawable-anydpi-v24/ic_work_notification.xml diff --git a/video/app/src/main/res/drawable-hdpi/ic_work_notification.png b/demo/video/src/main/res/drawable-hdpi/ic_work_notification.png similarity index 100% rename from video/app/src/main/res/drawable-hdpi/ic_work_notification.png rename to demo/video/src/main/res/drawable-hdpi/ic_work_notification.png diff --git a/video/app/src/main/res/drawable-mdpi/ic_work_notification.png b/demo/video/src/main/res/drawable-mdpi/ic_work_notification.png similarity index 100% rename from video/app/src/main/res/drawable-mdpi/ic_work_notification.png rename to demo/video/src/main/res/drawable-mdpi/ic_work_notification.png diff --git a/video/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/demo/video/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from video/app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to demo/video/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/video/app/src/main/res/drawable-xhdpi/ic_work_notification.png b/demo/video/src/main/res/drawable-xhdpi/ic_work_notification.png similarity index 100% rename from video/app/src/main/res/drawable-xhdpi/ic_work_notification.png rename to demo/video/src/main/res/drawable-xhdpi/ic_work_notification.png diff --git a/video/app/src/main/res/drawable-xxhdpi/ic_work_notification.png b/demo/video/src/main/res/drawable-xxhdpi/ic_work_notification.png similarity index 100% rename from video/app/src/main/res/drawable-xxhdpi/ic_work_notification.png rename to demo/video/src/main/res/drawable-xxhdpi/ic_work_notification.png diff --git a/video/app/src/main/res/drawable/ic_launcher_background.xml b/demo/video/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from video/app/src/main/res/drawable/ic_launcher_background.xml rename to demo/video/src/main/res/drawable/ic_launcher_background.xml diff --git a/video/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/demo/video/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from video/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to demo/video/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/video/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/demo/video/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from video/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to demo/video/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/video/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/demo/video/src/main/res/mipmap-hdpi/ic_launcher.webp similarity index 100% rename from video/app/src/main/res/mipmap-hdpi/ic_launcher.webp rename to demo/video/src/main/res/mipmap-hdpi/ic_launcher.webp diff --git a/video/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/demo/video/src/main/res/mipmap-hdpi/ic_launcher_round.webp similarity index 100% rename from video/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp rename to demo/video/src/main/res/mipmap-hdpi/ic_launcher_round.webp diff --git a/video/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/demo/video/src/main/res/mipmap-mdpi/ic_launcher.webp similarity index 100% rename from video/app/src/main/res/mipmap-mdpi/ic_launcher.webp rename to demo/video/src/main/res/mipmap-mdpi/ic_launcher.webp diff --git a/video/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/demo/video/src/main/res/mipmap-mdpi/ic_launcher_round.webp similarity index 100% rename from video/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp rename to demo/video/src/main/res/mipmap-mdpi/ic_launcher_round.webp diff --git a/video/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/demo/video/src/main/res/mipmap-xhdpi/ic_launcher.webp similarity index 100% rename from video/app/src/main/res/mipmap-xhdpi/ic_launcher.webp rename to demo/video/src/main/res/mipmap-xhdpi/ic_launcher.webp diff --git a/video/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/demo/video/src/main/res/mipmap-xhdpi/ic_launcher_round.webp similarity index 100% rename from video/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp rename to demo/video/src/main/res/mipmap-xhdpi/ic_launcher_round.webp diff --git a/video/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/demo/video/src/main/res/mipmap-xxhdpi/ic_launcher.webp similarity index 100% rename from video/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp rename to demo/video/src/main/res/mipmap-xxhdpi/ic_launcher.webp diff --git a/video/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/demo/video/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp similarity index 100% rename from video/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp rename to demo/video/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp diff --git a/video/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/demo/video/src/main/res/mipmap-xxxhdpi/ic_launcher.webp similarity index 100% rename from video/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp rename to demo/video/src/main/res/mipmap-xxxhdpi/ic_launcher.webp diff --git a/video/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/demo/video/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp similarity index 100% rename from video/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp rename to demo/video/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp diff --git a/video/app/src/main/res/values/colors.xml b/demo/video/src/main/res/values/colors.xml similarity index 100% rename from video/app/src/main/res/values/colors.xml rename to demo/video/src/main/res/values/colors.xml diff --git a/video/app/src/main/res/values/strings.xml b/demo/video/src/main/res/values/strings.xml similarity index 100% rename from video/app/src/main/res/values/strings.xml rename to demo/video/src/main/res/values/strings.xml diff --git a/video/app/src/main/res/values/themes.xml b/demo/video/src/main/res/values/themes.xml similarity index 100% rename from video/app/src/main/res/values/themes.xml rename to demo/video/src/main/res/values/themes.xml diff --git a/video/app/src/test/java/org/thoughtcrime/video/app/ExampleUnitTest.kt b/demo/video/src/test/java/org/thoughtcrime/video/app/ExampleUnitTest.kt similarity index 100% rename from video/app/src/test/java/org/thoughtcrime/video/app/ExampleUnitTest.kt rename to demo/video/src/test/java/org/thoughtcrime/video/app/ExampleUnitTest.kt diff --git a/registration/lib/build.gradle.kts b/feature/registration/build.gradle.kts similarity index 94% rename from registration/lib/build.gradle.kts rename to feature/registration/build.gradle.kts index 32cd59aa1d..c45904da54 100644 --- a/registration/lib/build.gradle.kts +++ b/feature/registration/build.gradle.kts @@ -24,9 +24,9 @@ dependencies { lintChecks(project(":lintchecks")) // Project dependencies - implementation(project(":core-ui")) - implementation(project(":core-util")) - implementation(project(":core-models")) + implementation(project(":core:ui")) + implementation(project(":core:util")) + implementation(project(":core:models")) implementation(libs.libsignal.android) // Compose BOM diff --git a/registration/lib/src/main/AndroidManifest.xml b/feature/registration/src/main/AndroidManifest.xml similarity index 100% rename from registration/lib/src/main/AndroidManifest.xml rename to feature/registration/src/main/AndroidManifest.xml diff --git a/registration/lib/src/main/java/org/signal/registration/NetworkController.kt b/feature/registration/src/main/java/org/signal/registration/NetworkController.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/NetworkController.kt rename to feature/registration/src/main/java/org/signal/registration/NetworkController.kt diff --git a/registration/lib/src/main/java/org/signal/registration/RegistrationActivity.kt b/feature/registration/src/main/java/org/signal/registration/RegistrationActivity.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/RegistrationActivity.kt rename to feature/registration/src/main/java/org/signal/registration/RegistrationActivity.kt diff --git a/registration/lib/src/main/java/org/signal/registration/RegistrationDependencies.kt b/feature/registration/src/main/java/org/signal/registration/RegistrationDependencies.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/RegistrationDependencies.kt rename to feature/registration/src/main/java/org/signal/registration/RegistrationDependencies.kt diff --git a/registration/lib/src/main/java/org/signal/registration/RegistrationFlowEvent.kt b/feature/registration/src/main/java/org/signal/registration/RegistrationFlowEvent.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/RegistrationFlowEvent.kt rename to feature/registration/src/main/java/org/signal/registration/RegistrationFlowEvent.kt diff --git a/registration/lib/src/main/java/org/signal/registration/RegistrationFlowState.kt b/feature/registration/src/main/java/org/signal/registration/RegistrationFlowState.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/RegistrationFlowState.kt rename to feature/registration/src/main/java/org/signal/registration/RegistrationFlowState.kt diff --git a/registration/lib/src/main/java/org/signal/registration/RegistrationNavigation.kt b/feature/registration/src/main/java/org/signal/registration/RegistrationNavigation.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/RegistrationNavigation.kt rename to feature/registration/src/main/java/org/signal/registration/RegistrationNavigation.kt diff --git a/registration/lib/src/main/java/org/signal/registration/RegistrationRepository.kt b/feature/registration/src/main/java/org/signal/registration/RegistrationRepository.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/RegistrationRepository.kt rename to feature/registration/src/main/java/org/signal/registration/RegistrationRepository.kt diff --git a/registration/lib/src/main/java/org/signal/registration/RegistrationViewModel.kt b/feature/registration/src/main/java/org/signal/registration/RegistrationViewModel.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/RegistrationViewModel.kt rename to feature/registration/src/main/java/org/signal/registration/RegistrationViewModel.kt diff --git a/registration/lib/src/main/java/org/signal/registration/StorageController.kt b/feature/registration/src/main/java/org/signal/registration/StorageController.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/StorageController.kt rename to feature/registration/src/main/java/org/signal/registration/StorageController.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/accountlocked/AccountLockedScreen.kt b/feature/registration/src/main/java/org/signal/registration/screens/accountlocked/AccountLockedScreen.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/accountlocked/AccountLockedScreen.kt rename to feature/registration/src/main/java/org/signal/registration/screens/accountlocked/AccountLockedScreen.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/accountlocked/AccountLockedScreenEvents.kt b/feature/registration/src/main/java/org/signal/registration/screens/accountlocked/AccountLockedScreenEvents.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/accountlocked/AccountLockedScreenEvents.kt rename to feature/registration/src/main/java/org/signal/registration/screens/accountlocked/AccountLockedScreenEvents.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/accountlocked/AccountLockedState.kt b/feature/registration/src/main/java/org/signal/registration/screens/accountlocked/AccountLockedState.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/accountlocked/AccountLockedState.kt rename to feature/registration/src/main/java/org/signal/registration/screens/accountlocked/AccountLockedState.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/captcha/CaptchaScreen.kt b/feature/registration/src/main/java/org/signal/registration/screens/captcha/CaptchaScreen.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/captcha/CaptchaScreen.kt rename to feature/registration/src/main/java/org/signal/registration/screens/captcha/CaptchaScreen.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/captcha/CaptchaScreenEvents.kt b/feature/registration/src/main/java/org/signal/registration/screens/captcha/CaptchaScreenEvents.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/captcha/CaptchaScreenEvents.kt rename to feature/registration/src/main/java/org/signal/registration/screens/captcha/CaptchaScreenEvents.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/captcha/CaptchaState.kt b/feature/registration/src/main/java/org/signal/registration/screens/captcha/CaptchaState.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/captcha/CaptchaState.kt rename to feature/registration/src/main/java/org/signal/registration/screens/captcha/CaptchaState.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/permissions/PermissionsScreen.kt b/feature/registration/src/main/java/org/signal/registration/screens/permissions/PermissionsScreen.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/permissions/PermissionsScreen.kt rename to feature/registration/src/main/java/org/signal/registration/screens/permissions/PermissionsScreen.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryScreen.kt b/feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryScreen.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryScreen.kt rename to feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryScreen.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryScreenEvents.kt b/feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryScreenEvents.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryScreenEvents.kt rename to feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryScreenEvents.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryState.kt b/feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryState.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryState.kt rename to feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryState.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryViewModel.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryViewModel.kt rename to feature/registration/src/main/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryViewModel.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/pincreation/PinCreationScreen.kt b/feature/registration/src/main/java/org/signal/registration/screens/pincreation/PinCreationScreen.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/pincreation/PinCreationScreen.kt rename to feature/registration/src/main/java/org/signal/registration/screens/pincreation/PinCreationScreen.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/pincreation/PinCreationScreenEvents.kt b/feature/registration/src/main/java/org/signal/registration/screens/pincreation/PinCreationScreenEvents.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/pincreation/PinCreationScreenEvents.kt rename to feature/registration/src/main/java/org/signal/registration/screens/pincreation/PinCreationScreenEvents.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/pincreation/PinCreationState.kt b/feature/registration/src/main/java/org/signal/registration/screens/pincreation/PinCreationState.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/pincreation/PinCreationState.kt rename to feature/registration/src/main/java/org/signal/registration/screens/pincreation/PinCreationState.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/pincreation/PinCreationViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/pincreation/PinCreationViewModel.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/pincreation/PinCreationViewModel.kt rename to feature/registration/src/main/java/org/signal/registration/screens/pincreation/PinCreationViewModel.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/pinentry/PinEntryForRegistrationLockViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForRegistrationLockViewModel.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/pinentry/PinEntryForRegistrationLockViewModel.kt rename to feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForRegistrationLockViewModel.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSvrRestoreViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSvrRestoreViewModel.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSvrRestoreViewModel.kt rename to feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryForSvrRestoreViewModel.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/pinentry/PinEntryScreen.kt b/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryScreen.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/pinentry/PinEntryScreen.kt rename to feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryScreen.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/pinentry/PinEntryScreenEventHandler.kt b/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryScreenEventHandler.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/pinentry/PinEntryScreenEventHandler.kt rename to feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryScreenEventHandler.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/pinentry/PinEntryScreenEvents.kt b/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryScreenEvents.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/pinentry/PinEntryScreenEvents.kt rename to feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryScreenEvents.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/pinentry/PinEntryState.kt b/feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryState.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/pinentry/PinEntryState.kt rename to feature/registration/src/main/java/org/signal/registration/screens/pinentry/PinEntryState.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/restore/RestoreViaQrScreen.kt b/feature/registration/src/main/java/org/signal/registration/screens/restore/RestoreViaQrScreen.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/restore/RestoreViaQrScreen.kt rename to feature/registration/src/main/java/org/signal/registration/screens/restore/RestoreViaQrScreen.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/restore/RestoreViaQrScreenEvents.kt b/feature/registration/src/main/java/org/signal/registration/screens/restore/RestoreViaQrScreenEvents.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/restore/RestoreViaQrScreenEvents.kt rename to feature/registration/src/main/java/org/signal/registration/screens/restore/RestoreViaQrScreenEvents.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/restore/RestoreViaQrState.kt b/feature/registration/src/main/java/org/signal/registration/screens/restore/RestoreViaQrState.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/restore/RestoreViaQrState.kt rename to feature/registration/src/main/java/org/signal/registration/screens/restore/RestoreViaQrState.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/util/EmitterExtensions.kt b/feature/registration/src/main/java/org/signal/registration/screens/util/EmitterExtensions.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/util/EmitterExtensions.kt rename to feature/registration/src/main/java/org/signal/registration/screens/util/EmitterExtensions.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/util/MockMultiplePermissionsState.kt b/feature/registration/src/main/java/org/signal/registration/screens/util/MockMultiplePermissionsState.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/util/MockMultiplePermissionsState.kt rename to feature/registration/src/main/java/org/signal/registration/screens/util/MockMultiplePermissionsState.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/util/MockPermissionsState.kt b/feature/registration/src/main/java/org/signal/registration/screens/util/MockPermissionsState.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/util/MockPermissionsState.kt rename to feature/registration/src/main/java/org/signal/registration/screens/util/MockPermissionsState.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeScreen.kt b/feature/registration/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeScreen.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeScreen.kt rename to feature/registration/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeScreen.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeScreenEvents.kt b/feature/registration/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeScreenEvents.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeScreenEvents.kt rename to feature/registration/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeScreenEvents.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeState.kt b/feature/registration/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeState.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeState.kt rename to feature/registration/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeState.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeViewModel.kt b/feature/registration/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeViewModel.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeViewModel.kt rename to feature/registration/src/main/java/org/signal/registration/screens/verificationcode/VerificationCodeViewModel.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/welcome/WelcomeScreen.kt b/feature/registration/src/main/java/org/signal/registration/screens/welcome/WelcomeScreen.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/welcome/WelcomeScreen.kt rename to feature/registration/src/main/java/org/signal/registration/screens/welcome/WelcomeScreen.kt diff --git a/registration/lib/src/main/java/org/signal/registration/screens/welcome/WelcomeScreenEvents.kt b/feature/registration/src/main/java/org/signal/registration/screens/welcome/WelcomeScreenEvents.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/screens/welcome/WelcomeScreenEvents.kt rename to feature/registration/src/main/java/org/signal/registration/screens/welcome/WelcomeScreenEvents.kt diff --git a/registration/lib/src/main/java/org/signal/registration/test/TestTags.kt b/feature/registration/src/main/java/org/signal/registration/test/TestTags.kt similarity index 100% rename from registration/lib/src/main/java/org/signal/registration/test/TestTags.kt rename to feature/registration/src/main/java/org/signal/registration/test/TestTags.kt diff --git a/registration/lib/src/test/java/org/signal/registration/RegistrationNavigationTest.kt b/feature/registration/src/test/java/org/signal/registration/RegistrationNavigationTest.kt similarity index 100% rename from registration/lib/src/test/java/org/signal/registration/RegistrationNavigationTest.kt rename to feature/registration/src/test/java/org/signal/registration/RegistrationNavigationTest.kt diff --git a/registration/lib/src/test/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryViewModelTest.kt b/feature/registration/src/test/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryViewModelTest.kt similarity index 100% rename from registration/lib/src/test/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryViewModelTest.kt rename to feature/registration/src/test/java/org/signal/registration/screens/phonenumber/PhoneNumberEntryViewModelTest.kt diff --git a/registration/lib/src/test/java/org/signal/registration/screens/phonenumber/PhoneNumberScreenTest.kt b/feature/registration/src/test/java/org/signal/registration/screens/phonenumber/PhoneNumberScreenTest.kt similarity index 100% rename from registration/lib/src/test/java/org/signal/registration/screens/phonenumber/PhoneNumberScreenTest.kt rename to feature/registration/src/test/java/org/signal/registration/screens/phonenumber/PhoneNumberScreenTest.kt diff --git a/registration/lib/src/test/java/org/signal/registration/screens/pinentry/PinEntryForRegistrationLockViewModelTest.kt b/feature/registration/src/test/java/org/signal/registration/screens/pinentry/PinEntryForRegistrationLockViewModelTest.kt similarity index 100% rename from registration/lib/src/test/java/org/signal/registration/screens/pinentry/PinEntryForRegistrationLockViewModelTest.kt rename to feature/registration/src/test/java/org/signal/registration/screens/pinentry/PinEntryForRegistrationLockViewModelTest.kt diff --git a/registration/lib/src/test/java/org/signal/registration/screens/pinentry/PinEntryForSvrRestoreViewModelTest.kt b/feature/registration/src/test/java/org/signal/registration/screens/pinentry/PinEntryForSvrRestoreViewModelTest.kt similarity index 100% rename from registration/lib/src/test/java/org/signal/registration/screens/pinentry/PinEntryForSvrRestoreViewModelTest.kt rename to feature/registration/src/test/java/org/signal/registration/screens/pinentry/PinEntryForSvrRestoreViewModelTest.kt diff --git a/registration/lib/src/test/java/org/signal/registration/screens/verificationcode/VerificationCodeScreenTest.kt b/feature/registration/src/test/java/org/signal/registration/screens/verificationcode/VerificationCodeScreenTest.kt similarity index 100% rename from registration/lib/src/test/java/org/signal/registration/screens/verificationcode/VerificationCodeScreenTest.kt rename to feature/registration/src/test/java/org/signal/registration/screens/verificationcode/VerificationCodeScreenTest.kt diff --git a/registration/lib/src/test/java/org/signal/registration/screens/verificationcode/VerificationCodeViewModelTest.kt b/feature/registration/src/test/java/org/signal/registration/screens/verificationcode/VerificationCodeViewModelTest.kt similarity index 100% rename from registration/lib/src/test/java/org/signal/registration/screens/verificationcode/VerificationCodeViewModelTest.kt rename to feature/registration/src/test/java/org/signal/registration/screens/verificationcode/VerificationCodeViewModelTest.kt diff --git a/registration/lib/src/test/java/org/signal/registration/screens/welcome/WelcomeScreenTest.kt b/feature/registration/src/test/java/org/signal/registration/screens/welcome/WelcomeScreenTest.kt similarity index 100% rename from registration/lib/src/test/java/org/signal/registration/screens/welcome/WelcomeScreenTest.kt rename to feature/registration/src/test/java/org/signal/registration/screens/welcome/WelcomeScreenTest.kt diff --git a/billing/build.gradle.kts b/lib/billing/build.gradle.kts similarity index 81% rename from billing/build.gradle.kts rename to lib/billing/build.gradle.kts index c9005a1f3a..0977a8e779 100644 --- a/billing/build.gradle.kts +++ b/lib/billing/build.gradle.kts @@ -10,5 +10,5 @@ dependencies { lintChecks(project(":lintchecks")) implementation(libs.android.billing) - implementation(project(":core-util")) + implementation(project(":core:util")) } diff --git a/core-util/src/main/AndroidManifest.xml b/lib/billing/src/main/AndroidManifest.xml similarity index 100% rename from core-util/src/main/AndroidManifest.xml rename to lib/billing/src/main/AndroidManifest.xml diff --git a/billing/src/main/java/org/signal/billing/BillingApiImpl.kt b/lib/billing/src/main/java/org/signal/billing/BillingApiImpl.kt similarity index 100% rename from billing/src/main/java/org/signal/billing/BillingApiImpl.kt rename to lib/billing/src/main/java/org/signal/billing/BillingApiImpl.kt diff --git a/billing/src/main/java/org/signal/billing/BillingFactory.kt b/lib/billing/src/main/java/org/signal/billing/BillingFactory.kt similarity index 100% rename from billing/src/main/java/org/signal/billing/BillingFactory.kt rename to lib/billing/src/main/java/org/signal/billing/BillingFactory.kt diff --git a/contacts/lib/build.gradle b/lib/contacts/build.gradle similarity index 71% rename from contacts/lib/build.gradle rename to lib/contacts/build.gradle index cede9f34dd..9cb33248cb 100644 --- a/contacts/lib/build.gradle +++ b/lib/contacts/build.gradle @@ -7,5 +7,5 @@ android { } dependencies { - implementation project(':core-util') + implementation project(':core:util') } \ No newline at end of file diff --git a/contacts/lib/src/main/AndroidManifest.xml b/lib/contacts/src/main/AndroidManifest.xml similarity index 100% rename from contacts/lib/src/main/AndroidManifest.xml rename to lib/contacts/src/main/AndroidManifest.xml diff --git a/contacts/lib/src/main/java/org/signal/contacts/ContactLinkConfiguration.kt b/lib/contacts/src/main/java/org/signal/contacts/ContactLinkConfiguration.kt similarity index 100% rename from contacts/lib/src/main/java/org/signal/contacts/ContactLinkConfiguration.kt rename to lib/contacts/src/main/java/org/signal/contacts/ContactLinkConfiguration.kt diff --git a/contacts/lib/src/main/java/org/signal/contacts/SystemContactsRepository.kt b/lib/contacts/src/main/java/org/signal/contacts/SystemContactsRepository.kt similarity index 100% rename from contacts/lib/src/main/java/org/signal/contacts/SystemContactsRepository.kt rename to lib/contacts/src/main/java/org/signal/contacts/SystemContactsRepository.kt diff --git a/debuglogs-viewer/lib/build.gradle.kts b/lib/debuglogs-viewer/build.gradle.kts similarity index 85% rename from debuglogs-viewer/lib/build.gradle.kts rename to lib/debuglogs-viewer/build.gradle.kts index b7a4c1177d..011fd1d342 100644 --- a/debuglogs-viewer/lib/build.gradle.kts +++ b/lib/debuglogs-viewer/build.gradle.kts @@ -12,8 +12,8 @@ android { } dependencies { - implementation(project(":core-util")) - implementation(project(":core-util-jvm")) + implementation(project(":core:util")) + implementation(project(":core:util-jvm")) implementation(libs.kotlin.reflect) implementation(libs.jackson.module.kotlin) diff --git a/debuglogs-viewer/lib/src/main/AndroidManifest.xml b/lib/debuglogs-viewer/src/main/AndroidManifest.xml similarity index 100% rename from debuglogs-viewer/lib/src/main/AndroidManifest.xml rename to lib/debuglogs-viewer/src/main/AndroidManifest.xml diff --git a/debuglogs-viewer/lib/src/main/assets/ace.min.js b/lib/debuglogs-viewer/src/main/assets/ace.min.js similarity index 100% rename from debuglogs-viewer/lib/src/main/assets/ace.min.js rename to lib/debuglogs-viewer/src/main/assets/ace.min.js diff --git a/debuglogs-viewer/lib/src/main/assets/debuglogs-viewer.html b/lib/debuglogs-viewer/src/main/assets/debuglogs-viewer.html similarity index 100% rename from debuglogs-viewer/lib/src/main/assets/debuglogs-viewer.html rename to lib/debuglogs-viewer/src/main/assets/debuglogs-viewer.html diff --git a/debuglogs-viewer/lib/src/main/assets/debuglogs-viewer.js b/lib/debuglogs-viewer/src/main/assets/debuglogs-viewer.js similarity index 100% rename from debuglogs-viewer/lib/src/main/assets/debuglogs-viewer.js rename to lib/debuglogs-viewer/src/main/assets/debuglogs-viewer.js diff --git a/debuglogs-viewer/lib/src/main/java/org/signal/debuglogsviewer/DebugLogsViewer.kt b/lib/debuglogs-viewer/src/main/java/org/signal/debuglogsviewer/DebugLogsViewer.kt similarity index 100% rename from debuglogs-viewer/lib/src/main/java/org/signal/debuglogsviewer/DebugLogsViewer.kt rename to lib/debuglogs-viewer/src/main/java/org/signal/debuglogsviewer/DebugLogsViewer.kt diff --git a/device-transfer/lib/build.gradle.kts b/lib/device-transfer/build.gradle.kts similarity index 73% rename from device-transfer/lib/build.gradle.kts rename to lib/device-transfer/build.gradle.kts index 78a919cf94..c7a4e348ea 100644 --- a/device-transfer/lib/build.gradle.kts +++ b/lib/device-transfer/build.gradle.kts @@ -7,12 +7,12 @@ android { } dependencies { - implementation(project(":core-util")) + implementation(project(":core:util")) implementation(libs.libsignal.android) api(libs.greenrobot.eventbus) testImplementation(testLibs.robolectric.robolectric) { exclude(group = "com.google.protobuf", module = "protobuf-java") } - testImplementation(testFixtures(project(":libsignal-service"))) + testImplementation(testFixtures(project(":lib:libsignal-service"))) } diff --git a/device-transfer/lib/src/main/AndroidManifest.xml b/lib/device-transfer/src/main/AndroidManifest.xml similarity index 100% rename from device-transfer/lib/src/main/AndroidManifest.xml rename to lib/device-transfer/src/main/AndroidManifest.xml diff --git a/device-transfer/lib/src/main/java/org/signal/devicetransfer/ClientTask.java b/lib/device-transfer/src/main/java/org/signal/devicetransfer/ClientTask.java similarity index 100% rename from device-transfer/lib/src/main/java/org/signal/devicetransfer/ClientTask.java rename to lib/device-transfer/src/main/java/org/signal/devicetransfer/ClientTask.java diff --git a/device-transfer/lib/src/main/java/org/signal/devicetransfer/DeviceToDeviceTransferService.java b/lib/device-transfer/src/main/java/org/signal/devicetransfer/DeviceToDeviceTransferService.java similarity index 100% rename from device-transfer/lib/src/main/java/org/signal/devicetransfer/DeviceToDeviceTransferService.java rename to lib/device-transfer/src/main/java/org/signal/devicetransfer/DeviceToDeviceTransferService.java diff --git a/device-transfer/lib/src/main/java/org/signal/devicetransfer/DeviceTransferAuthentication.java b/lib/device-transfer/src/main/java/org/signal/devicetransfer/DeviceTransferAuthentication.java similarity index 100% rename from device-transfer/lib/src/main/java/org/signal/devicetransfer/DeviceTransferAuthentication.java rename to lib/device-transfer/src/main/java/org/signal/devicetransfer/DeviceTransferAuthentication.java diff --git a/device-transfer/lib/src/main/java/org/signal/devicetransfer/DeviceTransferClient.java b/lib/device-transfer/src/main/java/org/signal/devicetransfer/DeviceTransferClient.java similarity index 100% rename from device-transfer/lib/src/main/java/org/signal/devicetransfer/DeviceTransferClient.java rename to lib/device-transfer/src/main/java/org/signal/devicetransfer/DeviceTransferClient.java diff --git a/device-transfer/lib/src/main/java/org/signal/devicetransfer/DeviceTransferServer.java b/lib/device-transfer/src/main/java/org/signal/devicetransfer/DeviceTransferServer.java similarity index 100% rename from device-transfer/lib/src/main/java/org/signal/devicetransfer/DeviceTransferServer.java rename to lib/device-transfer/src/main/java/org/signal/devicetransfer/DeviceTransferServer.java diff --git a/device-transfer/lib/src/main/java/org/signal/devicetransfer/IpExchange.java b/lib/device-transfer/src/main/java/org/signal/devicetransfer/IpExchange.java similarity index 100% rename from device-transfer/lib/src/main/java/org/signal/devicetransfer/IpExchange.java rename to lib/device-transfer/src/main/java/org/signal/devicetransfer/IpExchange.java diff --git a/device-transfer/lib/src/main/java/org/signal/devicetransfer/KeyGenerationFailedException.java b/lib/device-transfer/src/main/java/org/signal/devicetransfer/KeyGenerationFailedException.java similarity index 100% rename from device-transfer/lib/src/main/java/org/signal/devicetransfer/KeyGenerationFailedException.java rename to lib/device-transfer/src/main/java/org/signal/devicetransfer/KeyGenerationFailedException.java diff --git a/device-transfer/lib/src/main/java/org/signal/devicetransfer/NetworkClientThread.java b/lib/device-transfer/src/main/java/org/signal/devicetransfer/NetworkClientThread.java similarity index 100% rename from device-transfer/lib/src/main/java/org/signal/devicetransfer/NetworkClientThread.java rename to lib/device-transfer/src/main/java/org/signal/devicetransfer/NetworkClientThread.java diff --git a/device-transfer/lib/src/main/java/org/signal/devicetransfer/NetworkServerThread.java b/lib/device-transfer/src/main/java/org/signal/devicetransfer/NetworkServerThread.java similarity index 100% rename from device-transfer/lib/src/main/java/org/signal/devicetransfer/NetworkServerThread.java rename to lib/device-transfer/src/main/java/org/signal/devicetransfer/NetworkServerThread.java diff --git a/device-transfer/lib/src/main/java/org/signal/devicetransfer/SelfSignedIdentity.java b/lib/device-transfer/src/main/java/org/signal/devicetransfer/SelfSignedIdentity.java similarity index 100% rename from device-transfer/lib/src/main/java/org/signal/devicetransfer/SelfSignedIdentity.java rename to lib/device-transfer/src/main/java/org/signal/devicetransfer/SelfSignedIdentity.java diff --git a/device-transfer/lib/src/main/java/org/signal/devicetransfer/ServerTask.java b/lib/device-transfer/src/main/java/org/signal/devicetransfer/ServerTask.java similarity index 100% rename from device-transfer/lib/src/main/java/org/signal/devicetransfer/ServerTask.java rename to lib/device-transfer/src/main/java/org/signal/devicetransfer/ServerTask.java diff --git a/device-transfer/lib/src/main/java/org/signal/devicetransfer/ShutdownCallback.java b/lib/device-transfer/src/main/java/org/signal/devicetransfer/ShutdownCallback.java similarity index 100% rename from device-transfer/lib/src/main/java/org/signal/devicetransfer/ShutdownCallback.java rename to lib/device-transfer/src/main/java/org/signal/devicetransfer/ShutdownCallback.java diff --git a/device-transfer/lib/src/main/java/org/signal/devicetransfer/TransferStatus.java b/lib/device-transfer/src/main/java/org/signal/devicetransfer/TransferStatus.java similarity index 100% rename from device-transfer/lib/src/main/java/org/signal/devicetransfer/TransferStatus.java rename to lib/device-transfer/src/main/java/org/signal/devicetransfer/TransferStatus.java diff --git a/device-transfer/lib/src/main/java/org/signal/devicetransfer/WifiDirect.java b/lib/device-transfer/src/main/java/org/signal/devicetransfer/WifiDirect.java similarity index 100% rename from device-transfer/lib/src/main/java/org/signal/devicetransfer/WifiDirect.java rename to lib/device-transfer/src/main/java/org/signal/devicetransfer/WifiDirect.java diff --git a/device-transfer/lib/src/main/java/org/signal/devicetransfer/WifiDirectUnavailableException.java b/lib/device-transfer/src/main/java/org/signal/devicetransfer/WifiDirectUnavailableException.java similarity index 100% rename from device-transfer/lib/src/main/java/org/signal/devicetransfer/WifiDirectUnavailableException.java rename to lib/device-transfer/src/main/java/org/signal/devicetransfer/WifiDirectUnavailableException.java diff --git a/device-transfer/lib/src/main/res/values/strings.xml b/lib/device-transfer/src/main/res/values/strings.xml similarity index 100% rename from device-transfer/lib/src/main/res/values/strings.xml rename to lib/device-transfer/src/main/res/values/strings.xml diff --git a/device-transfer/lib/src/test/java/org/signal/devicetransfer/DeviceTransferAuthenticationTest.kt b/lib/device-transfer/src/test/java/org/signal/devicetransfer/DeviceTransferAuthenticationTest.kt similarity index 100% rename from device-transfer/lib/src/test/java/org/signal/devicetransfer/DeviceTransferAuthenticationTest.kt rename to lib/device-transfer/src/test/java/org/signal/devicetransfer/DeviceTransferAuthenticationTest.kt diff --git a/device-transfer/lib/src/test/java/org/signal/devicetransfer/WifiDirectTest.kt b/lib/device-transfer/src/test/java/org/signal/devicetransfer/WifiDirectTest.kt similarity index 100% rename from device-transfer/lib/src/test/java/org/signal/devicetransfer/WifiDirectTest.kt rename to lib/device-transfer/src/test/java/org/signal/devicetransfer/WifiDirectTest.kt diff --git a/donations/lib/build.gradle.kts b/lib/donations/build.gradle.kts similarity index 93% rename from donations/lib/build.gradle.kts rename to lib/donations/build.gradle.kts index e264665ffe..6bf25c854d 100644 --- a/donations/lib/build.gradle.kts +++ b/lib/donations/build.gradle.kts @@ -16,7 +16,7 @@ android { } dependencies { - implementation(project(":core-util")) + implementation(project(":core:util")) implementation(libs.kotlin.reflect) implementation(libs.jackson.module.kotlin) diff --git a/donations/lib/src/main/AndroidManifest.xml b/lib/donations/src/main/AndroidManifest.xml similarity index 100% rename from donations/lib/src/main/AndroidManifest.xml rename to lib/donations/src/main/AndroidManifest.xml diff --git a/donations/lib/src/main/java/org/signal/donations/CreditCardPaymentSource.kt b/lib/donations/src/main/java/org/signal/donations/CreditCardPaymentSource.kt similarity index 100% rename from donations/lib/src/main/java/org/signal/donations/CreditCardPaymentSource.kt rename to lib/donations/src/main/java/org/signal/donations/CreditCardPaymentSource.kt diff --git a/donations/lib/src/main/java/org/signal/donations/GooglePayApi.kt b/lib/donations/src/main/java/org/signal/donations/GooglePayApi.kt similarity index 100% rename from donations/lib/src/main/java/org/signal/donations/GooglePayApi.kt rename to lib/donations/src/main/java/org/signal/donations/GooglePayApi.kt diff --git a/donations/lib/src/main/java/org/signal/donations/GooglePayPaymentSource.kt b/lib/donations/src/main/java/org/signal/donations/GooglePayPaymentSource.kt similarity index 100% rename from donations/lib/src/main/java/org/signal/donations/GooglePayPaymentSource.kt rename to lib/donations/src/main/java/org/signal/donations/GooglePayPaymentSource.kt diff --git a/donations/lib/src/main/java/org/signal/donations/IDEALPaymentSource.kt b/lib/donations/src/main/java/org/signal/donations/IDEALPaymentSource.kt similarity index 100% rename from donations/lib/src/main/java/org/signal/donations/IDEALPaymentSource.kt rename to lib/donations/src/main/java/org/signal/donations/IDEALPaymentSource.kt diff --git a/donations/lib/src/main/java/org/signal/donations/InAppPaymentType.kt b/lib/donations/src/main/java/org/signal/donations/InAppPaymentType.kt similarity index 100% rename from donations/lib/src/main/java/org/signal/donations/InAppPaymentType.kt rename to lib/donations/src/main/java/org/signal/donations/InAppPaymentType.kt diff --git a/donations/lib/src/main/java/org/signal/donations/PayPalPaymentSource.kt b/lib/donations/src/main/java/org/signal/donations/PayPalPaymentSource.kt similarity index 100% rename from donations/lib/src/main/java/org/signal/donations/PayPalPaymentSource.kt rename to lib/donations/src/main/java/org/signal/donations/PayPalPaymentSource.kt diff --git a/donations/lib/src/main/java/org/signal/donations/PaymentSource.kt b/lib/donations/src/main/java/org/signal/donations/PaymentSource.kt similarity index 100% rename from donations/lib/src/main/java/org/signal/donations/PaymentSource.kt rename to lib/donations/src/main/java/org/signal/donations/PaymentSource.kt diff --git a/donations/lib/src/main/java/org/signal/donations/PaymentSourceType.kt b/lib/donations/src/main/java/org/signal/donations/PaymentSourceType.kt similarity index 100% rename from donations/lib/src/main/java/org/signal/donations/PaymentSourceType.kt rename to lib/donations/src/main/java/org/signal/donations/PaymentSourceType.kt diff --git a/donations/lib/src/main/java/org/signal/donations/ResponseFieldLogger.kt b/lib/donations/src/main/java/org/signal/donations/ResponseFieldLogger.kt similarity index 100% rename from donations/lib/src/main/java/org/signal/donations/ResponseFieldLogger.kt rename to lib/donations/src/main/java/org/signal/donations/ResponseFieldLogger.kt diff --git a/donations/lib/src/main/java/org/signal/donations/SEPADebitPaymentSource.kt b/lib/donations/src/main/java/org/signal/donations/SEPADebitPaymentSource.kt similarity index 100% rename from donations/lib/src/main/java/org/signal/donations/SEPADebitPaymentSource.kt rename to lib/donations/src/main/java/org/signal/donations/SEPADebitPaymentSource.kt diff --git a/donations/lib/src/main/java/org/signal/donations/StripeApi.kt b/lib/donations/src/main/java/org/signal/donations/StripeApi.kt similarity index 100% rename from donations/lib/src/main/java/org/signal/donations/StripeApi.kt rename to lib/donations/src/main/java/org/signal/donations/StripeApi.kt diff --git a/donations/lib/src/main/java/org/signal/donations/StripeDeclineCode.kt b/lib/donations/src/main/java/org/signal/donations/StripeDeclineCode.kt similarity index 100% rename from donations/lib/src/main/java/org/signal/donations/StripeDeclineCode.kt rename to lib/donations/src/main/java/org/signal/donations/StripeDeclineCode.kt diff --git a/donations/lib/src/main/java/org/signal/donations/StripeError.kt b/lib/donations/src/main/java/org/signal/donations/StripeError.kt similarity index 100% rename from donations/lib/src/main/java/org/signal/donations/StripeError.kt rename to lib/donations/src/main/java/org/signal/donations/StripeError.kt diff --git a/donations/lib/src/main/java/org/signal/donations/StripeFailureCode.kt b/lib/donations/src/main/java/org/signal/donations/StripeFailureCode.kt similarity index 100% rename from donations/lib/src/main/java/org/signal/donations/StripeFailureCode.kt rename to lib/donations/src/main/java/org/signal/donations/StripeFailureCode.kt diff --git a/donations/lib/src/main/java/org/signal/donations/StripeIntentAccessor.kt b/lib/donations/src/main/java/org/signal/donations/StripeIntentAccessor.kt similarity index 100% rename from donations/lib/src/main/java/org/signal/donations/StripeIntentAccessor.kt rename to lib/donations/src/main/java/org/signal/donations/StripeIntentAccessor.kt diff --git a/donations/lib/src/main/java/org/signal/donations/StripePaths.kt b/lib/donations/src/main/java/org/signal/donations/StripePaths.kt similarity index 100% rename from donations/lib/src/main/java/org/signal/donations/StripePaths.kt rename to lib/donations/src/main/java/org/signal/donations/StripePaths.kt diff --git a/donations/lib/src/main/java/org/signal/donations/TokenPaymentSource.kt b/lib/donations/src/main/java/org/signal/donations/TokenPaymentSource.kt similarity index 100% rename from donations/lib/src/main/java/org/signal/donations/TokenPaymentSource.kt rename to lib/donations/src/main/java/org/signal/donations/TokenPaymentSource.kt diff --git a/donations/lib/src/main/java/org/signal/donations/json/StripeIntentStatus.kt b/lib/donations/src/main/java/org/signal/donations/json/StripeIntentStatus.kt similarity index 100% rename from donations/lib/src/main/java/org/signal/donations/json/StripeIntentStatus.kt rename to lib/donations/src/main/java/org/signal/donations/json/StripeIntentStatus.kt diff --git a/donations/lib/src/main/java/org/signal/donations/json/StripePaymentIntent.kt b/lib/donations/src/main/java/org/signal/donations/json/StripePaymentIntent.kt similarity index 100% rename from donations/lib/src/main/java/org/signal/donations/json/StripePaymentIntent.kt rename to lib/donations/src/main/java/org/signal/donations/json/StripePaymentIntent.kt diff --git a/donations/lib/src/main/java/org/signal/donations/json/StripeSetupIntent.kt b/lib/donations/src/main/java/org/signal/donations/json/StripeSetupIntent.kt similarity index 100% rename from donations/lib/src/main/java/org/signal/donations/json/StripeSetupIntent.kt rename to lib/donations/src/main/java/org/signal/donations/json/StripeSetupIntent.kt diff --git a/donations/lib/src/main/res/drawable-ar-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-ar-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-ar-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-ar-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-ar/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-ar/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-ar/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-ar/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-bg-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-bg-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-bg-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-bg-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-bg/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-bg/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-bg/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-bg/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-ca-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-ca-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-ca-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-ca-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-ca/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-ca/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-ca/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-ca/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-cs-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-cs-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-cs-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-cs-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-cs/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-cs/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-cs/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-cs/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-da-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-da-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-da-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-da-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-da/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-da/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-da/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-da/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-de-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-de-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-de-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-de-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-de/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-de/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-de/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-de/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-el-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-el-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-el-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-el-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-el/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-el/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-el/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-el/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-es-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-es-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-es-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-es-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-es/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-es/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-es/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-es/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-et-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-et-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-et-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-et-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-et/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-et/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-et/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-et/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-eu-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-eu-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-eu-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-eu-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-eu/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-eu/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-eu/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-eu/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-fi-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-fi-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-fi-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-fi-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-fi/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-fi/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-fi/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-fi/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-fr-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-fr-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-fr-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-fr-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-fr/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-fr/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-fr/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-fr/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-hdpi/googlepay_button_background_image.9.png b/lib/donations/src/main/res/drawable-hdpi/googlepay_button_background_image.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-hdpi/googlepay_button_background_image.9.png rename to lib/donations/src/main/res/drawable-hdpi/googlepay_button_background_image.9.png diff --git a/donations/lib/src/main/res/drawable-hdpi/googlepay_button_background_image_focused.9.png b/lib/donations/src/main/res/drawable-hdpi/googlepay_button_background_image_focused.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-hdpi/googlepay_button_background_image_focused.9.png rename to lib/donations/src/main/res/drawable-hdpi/googlepay_button_background_image_focused.9.png diff --git a/donations/lib/src/main/res/drawable-hdpi/googlepay_button_background_image_pressed.9.png b/lib/donations/src/main/res/drawable-hdpi/googlepay_button_background_image_pressed.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-hdpi/googlepay_button_background_image_pressed.9.png rename to lib/donations/src/main/res/drawable-hdpi/googlepay_button_background_image_pressed.9.png diff --git a/donations/lib/src/main/res/drawable-hdpi/googlepay_button_no_shadow_background_image.9.png b/lib/donations/src/main/res/drawable-hdpi/googlepay_button_no_shadow_background_image.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-hdpi/googlepay_button_no_shadow_background_image.9.png rename to lib/donations/src/main/res/drawable-hdpi/googlepay_button_no_shadow_background_image.9.png diff --git a/donations/lib/src/main/res/drawable-hdpi/googlepay_button_no_shadow_background_image_focused.9.png b/lib/donations/src/main/res/drawable-hdpi/googlepay_button_no_shadow_background_image_focused.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-hdpi/googlepay_button_no_shadow_background_image_focused.9.png rename to lib/donations/src/main/res/drawable-hdpi/googlepay_button_no_shadow_background_image_focused.9.png diff --git a/donations/lib/src/main/res/drawable-hdpi/googlepay_button_no_shadow_background_image_pressed.9.png b/lib/donations/src/main/res/drawable-hdpi/googlepay_button_no_shadow_background_image_pressed.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-hdpi/googlepay_button_no_shadow_background_image_pressed.9.png rename to lib/donations/src/main/res/drawable-hdpi/googlepay_button_no_shadow_background_image_pressed.9.png diff --git a/donations/lib/src/main/res/drawable-hr-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-hr-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-hr-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-hr-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-hr/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-hr/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-hr/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-hr/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-id-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-id-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-id-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-id-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-id/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-id/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-id/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-id/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-it-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-it-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-it-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-it-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-it/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-it/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-it/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-it/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-ja-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-ja-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-ja-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-ja-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-ja/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-ja/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-ja/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-ja/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-ko-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-ko-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-ko-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-ko-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-ko/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-ko/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-ko/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-ko/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-mdpi/googlepay_button_background_image.9.png b/lib/donations/src/main/res/drawable-mdpi/googlepay_button_background_image.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-mdpi/googlepay_button_background_image.9.png rename to lib/donations/src/main/res/drawable-mdpi/googlepay_button_background_image.9.png diff --git a/donations/lib/src/main/res/drawable-mdpi/googlepay_button_background_image_focused.9.png b/lib/donations/src/main/res/drawable-mdpi/googlepay_button_background_image_focused.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-mdpi/googlepay_button_background_image_focused.9.png rename to lib/donations/src/main/res/drawable-mdpi/googlepay_button_background_image_focused.9.png diff --git a/donations/lib/src/main/res/drawable-mdpi/googlepay_button_background_image_pressed.9.png b/lib/donations/src/main/res/drawable-mdpi/googlepay_button_background_image_pressed.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-mdpi/googlepay_button_background_image_pressed.9.png rename to lib/donations/src/main/res/drawable-mdpi/googlepay_button_background_image_pressed.9.png diff --git a/donations/lib/src/main/res/drawable-mdpi/googlepay_button_no_shadow_background_image.9.png b/lib/donations/src/main/res/drawable-mdpi/googlepay_button_no_shadow_background_image.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-mdpi/googlepay_button_no_shadow_background_image.9.png rename to lib/donations/src/main/res/drawable-mdpi/googlepay_button_no_shadow_background_image.9.png diff --git a/donations/lib/src/main/res/drawable-mdpi/googlepay_button_no_shadow_background_image_focused.9.png b/lib/donations/src/main/res/drawable-mdpi/googlepay_button_no_shadow_background_image_focused.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-mdpi/googlepay_button_no_shadow_background_image_focused.9.png rename to lib/donations/src/main/res/drawable-mdpi/googlepay_button_no_shadow_background_image_focused.9.png diff --git a/donations/lib/src/main/res/drawable-mdpi/googlepay_button_no_shadow_background_image_pressed.9.png b/lib/donations/src/main/res/drawable-mdpi/googlepay_button_no_shadow_background_image_pressed.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-mdpi/googlepay_button_no_shadow_background_image_pressed.9.png rename to lib/donations/src/main/res/drawable-mdpi/googlepay_button_no_shadow_background_image_pressed.9.png diff --git a/donations/lib/src/main/res/drawable-ms-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-ms-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-ms-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-ms-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-ms/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-ms/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-ms/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-ms/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-night-hdpi/googlepay_button_background_image.9.png b/lib/donations/src/main/res/drawable-night-hdpi/googlepay_button_background_image.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-night-hdpi/googlepay_button_background_image.9.png rename to lib/donations/src/main/res/drawable-night-hdpi/googlepay_button_background_image.9.png diff --git a/donations/lib/src/main/res/drawable-night-hdpi/googlepay_button_no_shadow_background_image.9.png b/lib/donations/src/main/res/drawable-night-hdpi/googlepay_button_no_shadow_background_image.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-night-hdpi/googlepay_button_no_shadow_background_image.9.png rename to lib/donations/src/main/res/drawable-night-hdpi/googlepay_button_no_shadow_background_image.9.png diff --git a/donations/lib/src/main/res/drawable-night-mdpi/googlepay_button_background_image.9.png b/lib/donations/src/main/res/drawable-night-mdpi/googlepay_button_background_image.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-night-mdpi/googlepay_button_background_image.9.png rename to lib/donations/src/main/res/drawable-night-mdpi/googlepay_button_background_image.9.png diff --git a/donations/lib/src/main/res/drawable-night-mdpi/googlepay_button_no_shadow_background_image.9.png b/lib/donations/src/main/res/drawable-night-mdpi/googlepay_button_no_shadow_background_image.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-night-mdpi/googlepay_button_no_shadow_background_image.9.png rename to lib/donations/src/main/res/drawable-night-mdpi/googlepay_button_no_shadow_background_image.9.png diff --git a/donations/lib/src/main/res/drawable-night-v21/googlepay_button_background.xml b/lib/donations/src/main/res/drawable-night-v21/googlepay_button_background.xml similarity index 100% rename from donations/lib/src/main/res/drawable-night-v21/googlepay_button_background.xml rename to lib/donations/src/main/res/drawable-night-v21/googlepay_button_background.xml diff --git a/donations/lib/src/main/res/drawable-night-v21/googlepay_button_no_shadow_background.xml b/lib/donations/src/main/res/drawable-night-v21/googlepay_button_no_shadow_background.xml similarity index 100% rename from donations/lib/src/main/res/drawable-night-v21/googlepay_button_no_shadow_background.xml rename to lib/donations/src/main/res/drawable-night-v21/googlepay_button_no_shadow_background.xml diff --git a/donations/lib/src/main/res/drawable-night-xhdpi/googlepay_button_background_image.9.png b/lib/donations/src/main/res/drawable-night-xhdpi/googlepay_button_background_image.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-night-xhdpi/googlepay_button_background_image.9.png rename to lib/donations/src/main/res/drawable-night-xhdpi/googlepay_button_background_image.9.png diff --git a/donations/lib/src/main/res/drawable-night-xhdpi/googlepay_button_no_shadow_background_image.9.png b/lib/donations/src/main/res/drawable-night-xhdpi/googlepay_button_no_shadow_background_image.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-night-xhdpi/googlepay_button_no_shadow_background_image.9.png rename to lib/donations/src/main/res/drawable-night-xhdpi/googlepay_button_no_shadow_background_image.9.png diff --git a/donations/lib/src/main/res/drawable-night-xxhdpi/googlepay_button_background_image.9.png b/lib/donations/src/main/res/drawable-night-xxhdpi/googlepay_button_background_image.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-night-xxhdpi/googlepay_button_background_image.9.png rename to lib/donations/src/main/res/drawable-night-xxhdpi/googlepay_button_background_image.9.png diff --git a/donations/lib/src/main/res/drawable-night-xxhdpi/googlepay_button_no_shadow_background_image.9.png b/lib/donations/src/main/res/drawable-night-xxhdpi/googlepay_button_no_shadow_background_image.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-night-xxhdpi/googlepay_button_no_shadow_background_image.9.png rename to lib/donations/src/main/res/drawable-night-xxhdpi/googlepay_button_no_shadow_background_image.9.png diff --git a/donations/lib/src/main/res/drawable-night-xxxhdpi/googlepay_button_background_image.9.png b/lib/donations/src/main/res/drawable-night-xxxhdpi/googlepay_button_background_image.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-night-xxxhdpi/googlepay_button_background_image.9.png rename to lib/donations/src/main/res/drawable-night-xxxhdpi/googlepay_button_background_image.9.png diff --git a/donations/lib/src/main/res/drawable-night-xxxhdpi/googlepay_button_no_shadow_background_image.9.png b/lib/donations/src/main/res/drawable-night-xxxhdpi/googlepay_button_no_shadow_background_image.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-night-xxxhdpi/googlepay_button_no_shadow_background_image.9.png rename to lib/donations/src/main/res/drawable-night-xxxhdpi/googlepay_button_no_shadow_background_image.9.png diff --git a/donations/lib/src/main/res/drawable-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-night/googlepay_button_background.xml b/lib/donations/src/main/res/drawable-night/googlepay_button_background.xml similarity index 100% rename from donations/lib/src/main/res/drawable-night/googlepay_button_background.xml rename to lib/donations/src/main/res/drawable-night/googlepay_button_background.xml diff --git a/donations/lib/src/main/res/drawable-night/googlepay_button_content.xml b/lib/donations/src/main/res/drawable-night/googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-night/googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-night/googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-night/googlepay_button_no_shadow_background.xml b/lib/donations/src/main/res/drawable-night/googlepay_button_no_shadow_background.xml similarity index 100% rename from donations/lib/src/main/res/drawable-night/googlepay_button_no_shadow_background.xml rename to lib/donations/src/main/res/drawable-night/googlepay_button_no_shadow_background.xml diff --git a/donations/lib/src/main/res/drawable-night/googlepay_button_overlay.xml b/lib/donations/src/main/res/drawable-night/googlepay_button_overlay.xml similarity index 100% rename from donations/lib/src/main/res/drawable-night/googlepay_button_overlay.xml rename to lib/donations/src/main/res/drawable-night/googlepay_button_overlay.xml diff --git a/donations/lib/src/main/res/drawable-nl-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-nl-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-nl-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-nl-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-nl/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-nl/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-nl/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-nl/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-no-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-no-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-no-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-no-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-no/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-no/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-no/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-no/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-pl-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-pl-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-pl-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-pl-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-pl/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-pl/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-pl/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-pl/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-pt-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-pt-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-pt-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-pt-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-pt/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-pt/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-pt/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-pt/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-ru-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-ru-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-ru-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-ru-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-ru/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-ru/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-ru/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-ru/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-sk-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-sk-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-sk-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-sk-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-sk/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-sk/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-sk/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-sk/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-sl-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-sl-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-sl-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-sl-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-sl/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-sl/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-sl/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-sl/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-sr-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-sr-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-sr-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-sr-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-sr/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-sr/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-sr/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-sr/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-sv-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-sv-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-sv-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-sv-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-sv/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-sv/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-sv/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-sv/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-th-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-th-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-th-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-th-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-th/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-th/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-th/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-th/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-tr-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-tr-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-tr-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-tr-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-tr/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-tr/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-tr/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-tr/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-uk-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-uk-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-uk-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-uk-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-uk/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-uk/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-uk/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-uk/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-v21/googlepay_button_background.xml b/lib/donations/src/main/res/drawable-v21/googlepay_button_background.xml similarity index 100% rename from donations/lib/src/main/res/drawable-v21/googlepay_button_background.xml rename to lib/donations/src/main/res/drawable-v21/googlepay_button_background.xml diff --git a/donations/lib/src/main/res/drawable-v21/googlepay_button_no_shadow_background.xml b/lib/donations/src/main/res/drawable-v21/googlepay_button_no_shadow_background.xml similarity index 100% rename from donations/lib/src/main/res/drawable-v21/googlepay_button_no_shadow_background.xml rename to lib/donations/src/main/res/drawable-v21/googlepay_button_no_shadow_background.xml diff --git a/donations/lib/src/main/res/drawable-xhdpi/googlepay_button_background_image.9.png b/lib/donations/src/main/res/drawable-xhdpi/googlepay_button_background_image.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-xhdpi/googlepay_button_background_image.9.png rename to lib/donations/src/main/res/drawable-xhdpi/googlepay_button_background_image.9.png diff --git a/donations/lib/src/main/res/drawable-xhdpi/googlepay_button_background_image_focused.9.png b/lib/donations/src/main/res/drawable-xhdpi/googlepay_button_background_image_focused.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-xhdpi/googlepay_button_background_image_focused.9.png rename to lib/donations/src/main/res/drawable-xhdpi/googlepay_button_background_image_focused.9.png diff --git a/donations/lib/src/main/res/drawable-xhdpi/googlepay_button_background_image_pressed.9.png b/lib/donations/src/main/res/drawable-xhdpi/googlepay_button_background_image_pressed.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-xhdpi/googlepay_button_background_image_pressed.9.png rename to lib/donations/src/main/res/drawable-xhdpi/googlepay_button_background_image_pressed.9.png diff --git a/donations/lib/src/main/res/drawable-xhdpi/googlepay_button_no_shadow_background_image.9.png b/lib/donations/src/main/res/drawable-xhdpi/googlepay_button_no_shadow_background_image.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-xhdpi/googlepay_button_no_shadow_background_image.9.png rename to lib/donations/src/main/res/drawable-xhdpi/googlepay_button_no_shadow_background_image.9.png diff --git a/donations/lib/src/main/res/drawable-xhdpi/googlepay_button_no_shadow_background_image_focused.9.png b/lib/donations/src/main/res/drawable-xhdpi/googlepay_button_no_shadow_background_image_focused.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-xhdpi/googlepay_button_no_shadow_background_image_focused.9.png rename to lib/donations/src/main/res/drawable-xhdpi/googlepay_button_no_shadow_background_image_focused.9.png diff --git a/donations/lib/src/main/res/drawable-xhdpi/googlepay_button_no_shadow_background_image_pressed.9.png b/lib/donations/src/main/res/drawable-xhdpi/googlepay_button_no_shadow_background_image_pressed.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-xhdpi/googlepay_button_no_shadow_background_image_pressed.9.png rename to lib/donations/src/main/res/drawable-xhdpi/googlepay_button_no_shadow_background_image_pressed.9.png diff --git a/donations/lib/src/main/res/drawable-xxhdpi/googlepay_button_background_image.9.png b/lib/donations/src/main/res/drawable-xxhdpi/googlepay_button_background_image.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-xxhdpi/googlepay_button_background_image.9.png rename to lib/donations/src/main/res/drawable-xxhdpi/googlepay_button_background_image.9.png diff --git a/donations/lib/src/main/res/drawable-xxhdpi/googlepay_button_background_image_focused.9.png b/lib/donations/src/main/res/drawable-xxhdpi/googlepay_button_background_image_focused.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-xxhdpi/googlepay_button_background_image_focused.9.png rename to lib/donations/src/main/res/drawable-xxhdpi/googlepay_button_background_image_focused.9.png diff --git a/donations/lib/src/main/res/drawable-xxhdpi/googlepay_button_background_image_pressed.9.png b/lib/donations/src/main/res/drawable-xxhdpi/googlepay_button_background_image_pressed.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-xxhdpi/googlepay_button_background_image_pressed.9.png rename to lib/donations/src/main/res/drawable-xxhdpi/googlepay_button_background_image_pressed.9.png diff --git a/donations/lib/src/main/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image.9.png b/lib/donations/src/main/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image.9.png rename to lib/donations/src/main/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image.9.png diff --git a/donations/lib/src/main/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image_focused.9.png b/lib/donations/src/main/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image_focused.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image_focused.9.png rename to lib/donations/src/main/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image_focused.9.png diff --git a/donations/lib/src/main/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image_pressed.9.png b/lib/donations/src/main/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image_pressed.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image_pressed.9.png rename to lib/donations/src/main/res/drawable-xxhdpi/googlepay_button_no_shadow_background_image_pressed.9.png diff --git a/donations/lib/src/main/res/drawable-xxxhdpi/googlepay_button_background_image.9.png b/lib/donations/src/main/res/drawable-xxxhdpi/googlepay_button_background_image.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-xxxhdpi/googlepay_button_background_image.9.png rename to lib/donations/src/main/res/drawable-xxxhdpi/googlepay_button_background_image.9.png diff --git a/donations/lib/src/main/res/drawable-xxxhdpi/googlepay_button_background_image_focused.9.png b/lib/donations/src/main/res/drawable-xxxhdpi/googlepay_button_background_image_focused.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-xxxhdpi/googlepay_button_background_image_focused.9.png rename to lib/donations/src/main/res/drawable-xxxhdpi/googlepay_button_background_image_focused.9.png diff --git a/donations/lib/src/main/res/drawable-xxxhdpi/googlepay_button_background_image_pressed.9.png b/lib/donations/src/main/res/drawable-xxxhdpi/googlepay_button_background_image_pressed.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-xxxhdpi/googlepay_button_background_image_pressed.9.png rename to lib/donations/src/main/res/drawable-xxxhdpi/googlepay_button_background_image_pressed.9.png diff --git a/donations/lib/src/main/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image.9.png b/lib/donations/src/main/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image.9.png rename to lib/donations/src/main/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image.9.png diff --git a/donations/lib/src/main/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image_focused.9.png b/lib/donations/src/main/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image_focused.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image_focused.9.png rename to lib/donations/src/main/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image_focused.9.png diff --git a/donations/lib/src/main/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image_pressed.9.png b/lib/donations/src/main/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image_pressed.9.png similarity index 100% rename from donations/lib/src/main/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image_pressed.9.png rename to lib/donations/src/main/res/drawable-xxxhdpi/googlepay_button_no_shadow_background_image_pressed.9.png diff --git a/donations/lib/src/main/res/drawable-zh-night/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-zh-night/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-zh-night/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-zh-night/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable-zh/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable-zh/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable-zh/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable-zh/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable/donate_with_google_pay_rounded_background.xml b/lib/donations/src/main/res/drawable/donate_with_google_pay_rounded_background.xml similarity index 100% rename from donations/lib/src/main/res/drawable/donate_with_google_pay_rounded_background.xml rename to lib/donations/src/main/res/drawable/donate_with_google_pay_rounded_background.xml diff --git a/donations/lib/src/main/res/drawable/donate_with_googlepay_button_content.xml b/lib/donations/src/main/res/drawable/donate_with_googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable/donate_with_googlepay_button_content.xml rename to lib/donations/src/main/res/drawable/donate_with_googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable/googlepay_button_background.xml b/lib/donations/src/main/res/drawable/googlepay_button_background.xml similarity index 100% rename from donations/lib/src/main/res/drawable/googlepay_button_background.xml rename to lib/donations/src/main/res/drawable/googlepay_button_background.xml diff --git a/donations/lib/src/main/res/drawable/googlepay_button_content.xml b/lib/donations/src/main/res/drawable/googlepay_button_content.xml similarity index 100% rename from donations/lib/src/main/res/drawable/googlepay_button_content.xml rename to lib/donations/src/main/res/drawable/googlepay_button_content.xml diff --git a/donations/lib/src/main/res/drawable/googlepay_button_no_shadow_background.xml b/lib/donations/src/main/res/drawable/googlepay_button_no_shadow_background.xml similarity index 100% rename from donations/lib/src/main/res/drawable/googlepay_button_no_shadow_background.xml rename to lib/donations/src/main/res/drawable/googlepay_button_no_shadow_background.xml diff --git a/donations/lib/src/main/res/drawable/googlepay_button_overlay.xml b/lib/donations/src/main/res/drawable/googlepay_button_overlay.xml similarity index 100% rename from donations/lib/src/main/res/drawable/googlepay_button_overlay.xml rename to lib/donations/src/main/res/drawable/googlepay_button_overlay.xml diff --git a/donations/lib/src/main/res/layout/donate_with_googlepay_button.xml b/lib/donations/src/main/res/layout/donate_with_googlepay_button.xml similarity index 100% rename from donations/lib/src/main/res/layout/donate_with_googlepay_button.xml rename to lib/donations/src/main/res/layout/donate_with_googlepay_button.xml diff --git a/donations/lib/src/main/res/values-night/colors.xml b/lib/donations/src/main/res/values-night/colors.xml similarity index 100% rename from donations/lib/src/main/res/values-night/colors.xml rename to lib/donations/src/main/res/values-night/colors.xml diff --git a/donations/lib/src/main/res/values/colors.xml b/lib/donations/src/main/res/values/colors.xml similarity index 100% rename from donations/lib/src/main/res/values/colors.xml rename to lib/donations/src/main/res/values/colors.xml diff --git a/donations/lib/src/main/res/values/googlepay_strings.xml b/lib/donations/src/main/res/values/googlepay_strings.xml similarity index 100% rename from donations/lib/src/main/res/values/googlepay_strings.xml rename to lib/donations/src/main/res/values/googlepay_strings.xml diff --git a/donations/lib/src/test/java/org/signal/donations/ResponseFieldLoggerTest.kt b/lib/donations/src/test/java/org/signal/donations/ResponseFieldLoggerTest.kt similarity index 100% rename from donations/lib/src/test/java/org/signal/donations/ResponseFieldLoggerTest.kt rename to lib/donations/src/test/java/org/signal/donations/ResponseFieldLoggerTest.kt diff --git a/donations/lib/src/test/java/org/signal/donations/StripeIntentAccessorTest.kt b/lib/donations/src/test/java/org/signal/donations/StripeIntentAccessorTest.kt similarity index 100% rename from donations/lib/src/test/java/org/signal/donations/StripeIntentAccessorTest.kt rename to lib/donations/src/test/java/org/signal/donations/StripeIntentAccessorTest.kt diff --git a/donations/lib/src/test/java/org/signal/donations/StripePaymentIntentTest.kt b/lib/donations/src/test/java/org/signal/donations/StripePaymentIntentTest.kt similarity index 100% rename from donations/lib/src/test/java/org/signal/donations/StripePaymentIntentTest.kt rename to lib/donations/src/test/java/org/signal/donations/StripePaymentIntentTest.kt diff --git a/donations/lib/src/test/java/org/signal/donations/StripeSetupIntentTest.kt b/lib/donations/src/test/java/org/signal/donations/StripeSetupIntentTest.kt similarity index 100% rename from donations/lib/src/test/java/org/signal/donations/StripeSetupIntentTest.kt rename to lib/donations/src/test/java/org/signal/donations/StripeSetupIntentTest.kt diff --git a/image-editor/lib/.gitignore b/lib/glide-config/.gitignore similarity index 100% rename from image-editor/lib/.gitignore rename to lib/glide-config/.gitignore diff --git a/glide-config/build.gradle.kts b/lib/glide-config/build.gradle.kts similarity index 100% rename from glide-config/build.gradle.kts rename to lib/glide-config/build.gradle.kts diff --git a/glide-config/src/main/AndroidManifest.xml b/lib/glide-config/src/main/AndroidManifest.xml similarity index 100% rename from glide-config/src/main/AndroidManifest.xml rename to lib/glide-config/src/main/AndroidManifest.xml diff --git a/glide-config/src/main/java/org/thoughtcrime/securesms/mms/SignalGlideModule.kt b/lib/glide-config/src/main/java/org/thoughtcrime/securesms/mms/SignalGlideModule.kt similarity index 100% rename from glide-config/src/main/java/org/thoughtcrime/securesms/mms/SignalGlideModule.kt rename to lib/glide-config/src/main/java/org/thoughtcrime/securesms/mms/SignalGlideModule.kt diff --git a/video/app/.gitignore b/lib/image-editor/.gitignore similarity index 100% rename from video/app/.gitignore rename to lib/image-editor/.gitignore diff --git a/image-editor/lib/build.gradle b/lib/image-editor/build.gradle similarity index 72% rename from image-editor/lib/build.gradle rename to lib/image-editor/build.gradle index 07f5e40235..819497f4a5 100644 --- a/image-editor/lib/build.gradle +++ b/lib/image-editor/build.gradle @@ -7,5 +7,5 @@ android { } dependencies { - implementation(project(":core-util")) + implementation(project(":core:util")) } diff --git a/image-editor/lib/consumer-rules.pro b/lib/image-editor/consumer-rules.pro similarity index 100% rename from image-editor/lib/consumer-rules.pro rename to lib/image-editor/consumer-rules.pro diff --git a/video/app/proguard-rules.pro b/lib/image-editor/proguard-rules.pro similarity index 100% rename from video/app/proguard-rules.pro rename to lib/image-editor/proguard-rules.pro diff --git a/image-editor/lib/src/main/AndroidManifest.xml b/lib/image-editor/src/main/AndroidManifest.xml similarity index 100% rename from image-editor/lib/src/main/AndroidManifest.xml rename to lib/image-editor/src/main/AndroidManifest.xml diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/Bounds.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/Bounds.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/Bounds.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/Bounds.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/CanvasMatrix.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/CanvasMatrix.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/CanvasMatrix.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/CanvasMatrix.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/ColorableRenderer.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/ColorableRenderer.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/ColorableRenderer.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/ColorableRenderer.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/DrawingSession.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/DrawingSession.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/DrawingSession.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/DrawingSession.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/EditSession.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/EditSession.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/EditSession.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/EditSession.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/ElementDragEditSession.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/ElementDragEditSession.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/ElementDragEditSession.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/ElementDragEditSession.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/ElementEditSession.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/ElementEditSession.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/ElementEditSession.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/ElementEditSession.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/ElementScaleEditSession.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/ElementScaleEditSession.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/ElementScaleEditSession.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/ElementScaleEditSession.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/HiddenEditText.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/HiddenEditText.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/HiddenEditText.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/HiddenEditText.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/ImageEditorView.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/ImageEditorView.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/ImageEditorView.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/ImageEditorView.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/MatrixUtils.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/MatrixUtils.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/MatrixUtils.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/MatrixUtils.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/Renderer.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/Renderer.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/Renderer.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/Renderer.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/RendererContext.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/RendererContext.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/RendererContext.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/RendererContext.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/SelectableRenderer.kt b/lib/image-editor/src/main/java/org/signal/imageeditor/core/SelectableRenderer.kt similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/SelectableRenderer.kt rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/SelectableRenderer.kt diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/ThumbDragEditSession.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/ThumbDragEditSession.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/ThumbDragEditSession.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/ThumbDragEditSession.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/UndoRedoStackListener.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/UndoRedoStackListener.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/UndoRedoStackListener.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/UndoRedoStackListener.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/AlphaAnimation.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/model/AlphaAnimation.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/model/AlphaAnimation.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/model/AlphaAnimation.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/AnimationMatrix.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/model/AnimationMatrix.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/model/AnimationMatrix.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/model/AnimationMatrix.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/Bisect.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/model/Bisect.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/model/Bisect.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/model/Bisect.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/CropThumbRenderer.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/model/CropThumbRenderer.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/model/CropThumbRenderer.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/model/CropThumbRenderer.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/EditorElement.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/model/EditorElement.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/model/EditorElement.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/model/EditorElement.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/EditorElementHierarchy.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/model/EditorElementHierarchy.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/model/EditorElementHierarchy.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/model/EditorElementHierarchy.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/EditorFlags.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/model/EditorFlags.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/model/EditorFlags.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/model/EditorFlags.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/EditorModel.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/model/EditorModel.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/model/EditorModel.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/model/EditorModel.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/ElementStack.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/model/ElementStack.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/model/ElementStack.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/model/ElementStack.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/InBoundsMemory.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/model/InBoundsMemory.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/model/InBoundsMemory.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/model/InBoundsMemory.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/ParcelUtils.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/model/ParcelUtils.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/model/ParcelUtils.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/model/ParcelUtils.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/ThumbRenderer.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/model/ThumbRenderer.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/model/ThumbRenderer.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/model/ThumbRenderer.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/model/UndoRedoStacks.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/model/UndoRedoStacks.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/model/UndoRedoStacks.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/model/UndoRedoStacks.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/AutomaticControlPointBezierLine.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/AutomaticControlPointBezierLine.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/AutomaticControlPointBezierLine.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/AutomaticControlPointBezierLine.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/BezierDrawingRenderer.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/BezierDrawingRenderer.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/BezierDrawingRenderer.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/BezierDrawingRenderer.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/CropAreaRenderer.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/CropAreaRenderer.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/CropAreaRenderer.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/CropAreaRenderer.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/FaceBlurRenderer.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/FaceBlurRenderer.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/FaceBlurRenderer.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/FaceBlurRenderer.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/FillRenderer.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/FillRenderer.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/FillRenderer.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/FillRenderer.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/InvalidateableRenderer.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/InvalidateableRenderer.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/InvalidateableRenderer.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/InvalidateableRenderer.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/InverseFillRenderer.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/InverseFillRenderer.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/InverseFillRenderer.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/InverseFillRenderer.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/MultiLineTextRenderer.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/MultiLineTextRenderer.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/MultiLineTextRenderer.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/MultiLineTextRenderer.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/OvalGuideRenderer.java b/lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/OvalGuideRenderer.java similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/OvalGuideRenderer.java rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/OvalGuideRenderer.java diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/SelectedElementGuideRenderer.kt b/lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/SelectedElementGuideRenderer.kt similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/SelectedElementGuideRenderer.kt rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/SelectedElementGuideRenderer.kt diff --git a/image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/TrashRenderer.kt b/lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/TrashRenderer.kt similarity index 100% rename from image-editor/lib/src/main/java/org/signal/imageeditor/core/renderers/TrashRenderer.kt rename to lib/image-editor/src/main/java/org/signal/imageeditor/core/renderers/TrashRenderer.kt diff --git a/image-editor/lib/src/main/res/values/crop_area_renderer.xml b/lib/image-editor/src/main/res/values/crop_area_renderer.xml similarity index 100% rename from image-editor/lib/src/main/res/values/crop_area_renderer.xml rename to lib/image-editor/src/main/res/values/crop_area_renderer.xml diff --git a/image-editor/lib/src/main/res/values/styles.xml b/lib/image-editor/src/main/res/values/styles.xml similarity index 100% rename from image-editor/lib/src/main/res/values/styles.xml rename to lib/image-editor/src/main/res/values/styles.xml diff --git a/libsignal-service/.gitignore b/lib/libsignal-service/.gitignore similarity index 100% rename from libsignal-service/.gitignore rename to lib/libsignal-service/.gitignore diff --git a/libsignal-service/build.gradle.kts b/lib/libsignal-service/build.gradle.kts similarity index 96% rename from libsignal-service/build.gradle.kts rename to lib/libsignal-service/build.gradle.kts index 46b1e88848..47a4d104a7 100644 --- a/libsignal-service/build.gradle.kts +++ b/lib/libsignal-service/build.gradle.kts @@ -111,8 +111,8 @@ dependencies { implementation(libs.kotlinx.coroutines.core) implementation(libs.kotlinx.coroutines.core.jvm) - implementation(project(":core-util-jvm")) - implementation(project(":core-models")) + implementation(project(":core:util-jvm")) + implementation(project(":core:models")) testImplementation(testLibs.junit.junit) testImplementation(testLibs.assertk) diff --git a/libsignal-service/lint.xml b/lib/libsignal-service/lint.xml similarity index 100% rename from libsignal-service/lint.xml rename to lib/libsignal-service/lint.xml diff --git a/libsignal-service/src/main/java/com/squareup/wire/internal/CountNonDefault.kt b/lib/libsignal-service/src/main/java/com/squareup/wire/internal/CountNonDefault.kt similarity index 100% rename from libsignal-service/src/main/java/com/squareup/wire/internal/CountNonDefault.kt rename to lib/libsignal-service/src/main/java/com/squareup/wire/internal/CountNonDefault.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/ContentTooLargeException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/ContentTooLargeException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/ContentTooLargeException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/ContentTooLargeException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/InvalidMessageStructureException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/InvalidMessageStructureException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/InvalidMessageStructureException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/InvalidMessageStructureException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/InvalidPreKeyException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/InvalidPreKeyException.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/InvalidPreKeyException.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/InvalidPreKeyException.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResult.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResult.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResult.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResult.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResultUtil.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResultUtil.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResultUtil.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResultUtil.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountDataStore.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountDataStore.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountDataStore.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountDataStore.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceAccountManager.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceDataStore.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceDataStore.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceDataStore.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceDataStore.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceKyberPreKeyStore.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceKyberPreKeyStore.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceKyberPreKeyStore.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceKyberPreKeyStore.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageReceiver.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServicePreKeyStore.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServicePreKeyStore.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServicePreKeyStore.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServicePreKeyStore.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSenderKeyStore.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSenderKeyStore.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSenderKeyStore.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSenderKeyStore.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSessionStore.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSessionStore.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSessionStore.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceSessionStore.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalSessionLock.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalSessionLock.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalSessionLock.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalSessionLock.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalUrlExtensions.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalUrlExtensions.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalUrlExtensions.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalUrlExtensions.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SvrNoDataException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SvrNoDataException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/SvrNoDataException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SvrNoDataException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountApi.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountApi.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountApi.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/AccountAttributes.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/ChangePhoneNumberRequest.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/ChangePhoneNumberRequest.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/ChangePhoneNumberRequest.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/ChangePhoneNumberRequest.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PniKeyDistributionRequest.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PniKeyDistributionRequest.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PniKeyDistributionRequest.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PniKeyDistributionRequest.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PreKeyCollection.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PreKeyCollection.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PreKeyCollection.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PreKeyCollection.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PreKeyUpload.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PreKeyUpload.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PreKeyUpload.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PreKeyUpload.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveApi.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveApi.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveApi.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveCredentialPresentation.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveCredentialPresentation.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveCredentialPresentation.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveCredentialPresentation.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveGetBackupInfoResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveGetBackupInfoResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveGetBackupInfoResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveGetBackupInfoResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveGetMediaItemsResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveGetMediaItemsResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveGetMediaItemsResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveGetMediaItemsResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveKeyRotationLimitResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveKeyRotationLimitResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveKeyRotationLimitResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveKeyRotationLimitResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaRequest.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaRequest.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaRequest.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaRequest.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaUploadFormStatusCodes.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaUploadFormStatusCodes.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaUploadFormStatusCodes.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveMediaUploadFormStatusCodes.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceAccess.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceAccess.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceAccess.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceAccess.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceAccessPair.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceAccessPair.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceAccessPair.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceAccessPair.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceCredential.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceCredential.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceCredential.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceCredential.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceCredentialsResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceCredentialsResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceCredentialsResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveServiceCredentialsResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveSetBackupIdRequest.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveSetBackupIdRequest.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveSetBackupIdRequest.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveSetBackupIdRequest.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveSetPublicKeyRequest.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveSetPublicKeyRequest.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveSetPublicKeyRequest.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/ArchiveSetPublicKeyRequest.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/BatchArchiveMediaRequest.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/BatchArchiveMediaRequest.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/BatchArchiveMediaRequest.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/BatchArchiveMediaRequest.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/BatchArchiveMediaResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/BatchArchiveMediaResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/BatchArchiveMediaResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/BatchArchiveMediaResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/DeleteArchivedMediaRequest.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/DeleteArchivedMediaRequest.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/DeleteArchivedMediaRequest.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/DeleteArchivedMediaRequest.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/GetArchiveCdnCredentialsResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/GetArchiveCdnCredentialsResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/GetArchiveCdnCredentialsResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/archive/GetArchiveCdnCredentialsResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentApi.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentApi.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentApi.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentUploadResult.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentUploadResult.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentUploadResult.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/attachment/AttachmentUploadResult.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/calling/CallingApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/calling/CallingApi.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/calling/CallingApi.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/calling/CallingApi.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/cds/CdsApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/cds/CdsApi.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/cds/CdsApi.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/cds/CdsApi.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/cds/CdsiV2Service.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/cds/CdsiV2Service.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/cds/CdsiV2Service.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/cds/CdsiV2Service.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/certificate/CertificateApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/certificate/CertificateApi.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/certificate/CertificateApi.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/certificate/CertificateApi.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherInputStream.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherInputStream.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherInputStream.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherInputStream.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherOutputStream.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherOutputStream.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherOutputStream.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherOutputStream.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherStreamUtil.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherStreamUtil.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherStreamUtil.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherStreamUtil.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/BetterCipherInputStream.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/BetterCipherInputStream.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/BetterCipherInputStream.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/BetterCipherInputStream.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ContentHint.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ContentHint.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ContentHint.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ContentHint.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/Crypto.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/Crypto.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/Crypto.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/Crypto.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/DigestValidatingInputStream.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/DigestValidatingInputStream.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/DigestValidatingInputStream.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/DigestValidatingInputStream.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/DigestingOutputStream.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/DigestingOutputStream.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/DigestingOutputStream.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/DigestingOutputStream.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeContent.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeContent.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeContent.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeContent.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeMetadata.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeMetadata.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeMetadata.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/EnvelopeMetadata.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/HmacSIV.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/HmacSIV.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/HmacSIV.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/HmacSIV.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/IncrementalMacAdditionalValidationsInputStream.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/IncrementalMacAdditionalValidationsInputStream.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/IncrementalMacAdditionalValidationsInputStream.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/IncrementalMacAdditionalValidationsInputStream.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/InvalidCiphertextException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/InvalidCiphertextException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/InvalidCiphertextException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/InvalidCiphertextException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/MacValidatingInputStream.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/MacValidatingInputStream.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/MacValidatingInputStream.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/MacValidatingInputStream.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/NoCipherOutputStream.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/NoCipherOutputStream.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/NoCipherOutputStream.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/NoCipherOutputStream.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipher.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipher.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipher.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipher.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherInputStream.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherInputStream.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherInputStream.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherInputStream.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherOutputStream.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherOutputStream.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherOutputStream.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/ProfileCipherOutputStream.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SealedSenderAccess.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SealedSenderAccess.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SealedSenderAccess.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SealedSenderAccess.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupCipher.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupCipher.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupCipher.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupCipher.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupSessionBuilder.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupSessionBuilder.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupSessionBuilder.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalGroupSessionBuilder.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSealedSessionCipher.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSealedSessionCipher.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSealedSessionCipher.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSealedSessionCipher.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipher.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipherResult.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipherResult.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipherResult.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalServiceCipherResult.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionBuilder.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionBuilder.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionBuilder.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionBuilder.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionCipher.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionCipher.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionCipher.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SignalSessionCipher.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SkippingOutputStream.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SkippingOutputStream.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SkippingOutputStream.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/SkippingOutputStream.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccess.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccess.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccess.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccess.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UntrustedIdentityException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UntrustedIdentityException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UntrustedIdentityException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/crypto/UntrustedIdentityException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/BoostReceiptCredentialRequestJson.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/BoostReceiptCredentialRequestJson.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/BoostReceiptCredentialRequestJson.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/BoostReceiptCredentialRequestJson.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/DonationsApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/DonationsApi.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/DonationsApi.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/DonationsApi.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/PayPalConfirmOneTimePaymentIntentPayload.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/PayPalConfirmOneTimePaymentIntentPayload.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/PayPalConfirmOneTimePaymentIntentPayload.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/PayPalConfirmOneTimePaymentIntentPayload.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/PayPalCreateOneTimePaymentIntentPayload.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/PayPalCreateOneTimePaymentIntentPayload.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/PayPalCreateOneTimePaymentIntentPayload.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/PayPalCreateOneTimePaymentIntentPayload.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/PayPalCreatePaymentMethodPayload.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/PayPalCreatePaymentMethodPayload.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/PayPalCreatePaymentMethodPayload.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/PayPalCreatePaymentMethodPayload.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/ReceiptCredentialRequestJson.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/ReceiptCredentialRequestJson.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/ReceiptCredentialRequestJson.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/ReceiptCredentialRequestJson.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/ReceiptCredentialResponseJson.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/ReceiptCredentialResponseJson.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/ReceiptCredentialResponseJson.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/ReceiptCredentialResponseJson.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/RedeemArchivesReceiptRequest.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/RedeemArchivesReceiptRequest.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/RedeemArchivesReceiptRequest.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/RedeemArchivesReceiptRequest.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/RedeemDonationReceiptRequest.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/RedeemDonationReceiptRequest.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/RedeemDonationReceiptRequest.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/RedeemDonationReceiptRequest.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/StripeOneTimePaymentIntentPayload.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/StripeOneTimePaymentIntentPayload.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/StripeOneTimePaymentIntentPayload.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/donations/StripeOneTimePaymentIntentPayload.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ChangeSetModifier.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ChangeSetModifier.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ChangeSetModifier.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ChangeSetModifier.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ClientZkOperations.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ClientZkOperations.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ClientZkOperations.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ClientZkOperations.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/CredentialResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/CredentialResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/CredentialResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/CredentialResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptChangeVerificationMode.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptChangeVerificationMode.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptChangeVerificationMode.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptChangeVerificationMode.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupChangeActionsBuilderChangeSetModifier.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupChangeActionsBuilderChangeSetModifier.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupChangeActionsBuilderChangeSetModifier.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupChangeActionsBuilderChangeSetModifier.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupChangeLog.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupChangeLog.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupChangeLog.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupChangeLog.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupExtensions.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupExtensions.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupExtensions.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupExtensions.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupCandidate.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupCandidate.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupCandidate.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupCandidate.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeActionsBuilderChangeSetModifier.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeActionsBuilderChangeSetModifier.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeActionsBuilderChangeSetModifier.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeActionsBuilderChangeSetModifier.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstruct.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstruct.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstruct.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstruct.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupHistoryPage.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupHistoryPage.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupHistoryPage.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupHistoryPage.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupLinkNotActiveException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupLinkNotActiveException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupLinkNotActiveException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupLinkNotActiveException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupSendEndorsements.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupSendEndorsements.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupSendEndorsements.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupSendEndorsements.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Api.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Api.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Api.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Api.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2ApiHelper.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2ApiHelper.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2ApiHelper.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2ApiHelper.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2AuthorizationString.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2AuthorizationString.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2AuthorizationString.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2AuthorizationString.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/InvalidGroupStateException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/InvalidGroupStateException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/InvalidGroupStateException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/InvalidGroupStateException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/NoCredentialForRedemptionTimeException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/NoCredentialForRedemptionTimeException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/NoCredentialForRedemptionTimeException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/NoCredentialForRedemptionTimeException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/NotAbleToApplyGroupV2ChangeException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/NotAbleToApplyGroupV2ChangeException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/NotAbleToApplyGroupV2ChangeException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/NotAbleToApplyGroupV2ChangeException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ReceivedGroupSendEndorsements.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ReceivedGroupSendEndorsements.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ReceivedGroupSendEndorsements.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/ReceivedGroupSendEndorsements.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/TemporalCredential.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/TemporalCredential.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/TemporalCredential.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/groupsv2/TemporalCredential.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/KbsData.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/KbsData.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/KbsData.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/KbsData.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/PinHashUtil.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/PinHashUtil.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/PinHashUtil.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/PinHashUtil.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/PinString.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/PinString.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/PinString.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/PinString.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/PinValidityChecker.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/PinValidityChecker.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/PinValidityChecker.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/kbs/PinValidityChecker.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/keys/KeysApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/keys/KeysApi.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/keys/KeysApi.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/keys/KeysApi.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/keys/OneTimePreKeyCounts.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/keys/OneTimePreKeyCounts.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/keys/OneTimePreKeyCounts.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/keys/OneTimePreKeyCounts.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/LinkDeviceApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/LinkDeviceApi.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/LinkDeviceApi.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/LinkDeviceApi.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/LinkedDeviceVerificationCodeResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/LinkedDeviceVerificationCodeResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/LinkedDeviceVerificationCodeResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/LinkedDeviceVerificationCodeResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/SetDeviceNameRequest.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/SetDeviceNameRequest.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/SetDeviceNameRequest.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/SetDeviceNameRequest.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/SetLinkedDeviceTransferArchiveRequest.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/SetLinkedDeviceTransferArchiveRequest.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/SetLinkedDeviceTransferArchiveRequest.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/SetLinkedDeviceTransferArchiveRequest.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/TransferArchiveError.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/TransferArchiveError.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/TransferArchiveError.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/TransferArchiveError.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/TransferArchiveResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/TransferArchiveResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/TransferArchiveResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/TransferArchiveResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/WaitForLinkedDeviceResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/WaitForLinkedDeviceResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/WaitForLinkedDeviceResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/link/WaitForLinkedDeviceResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/message/MessageApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/message/MessageApi.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/message/MessageApi.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/message/MessageApi.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/message/SpamTokenMessage.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/message/SpamTokenMessage.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/message/SpamTokenMessage.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/message/SpamTokenMessage.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidator.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/EnvelopeResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SendMessageResult.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SendMessageResult.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SendMessageResult.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SendMessageResult.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachment.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachment.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachment.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachment.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentPointer.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentPointer.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentPointer.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentPointer.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentRemoteId.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentStream.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentStream.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentStream.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceAttachmentStream.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceDataMessage.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEditMessage.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEditMessage.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEditMessage.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceEditMessage.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupV2.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupV2.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupV2.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceGroupV2.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceMetadata.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceMetadata.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceMetadata.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceMetadata.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServicePreview.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServicePreview.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServicePreview.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServicePreview.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceReceiptMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceReceiptMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceReceiptMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceReceiptMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStickerManifest.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStickerManifest.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStickerManifest.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStickerManifest.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStoryMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStoryMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStoryMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStoryMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStoryMessageRecipient.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStoryMessageRecipient.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStoryMessageRecipient.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceStoryMessageRecipient.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceTextAttachment.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceTextAttachment.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceTextAttachment.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceTextAttachment.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceTypingMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceTypingMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceTypingMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/SignalServiceTypingMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/AnswerMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/AnswerMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/AnswerMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/AnswerMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/BusyMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/BusyMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/BusyMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/BusyMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/CallingResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/CallingResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/CallingResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/CallingResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/HangupMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/HangupMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/HangupMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/HangupMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/IceUpdateMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/IceUpdateMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/IceUpdateMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/IceUpdateMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/OfferMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/OfferMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/OfferMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/OfferMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/OpaqueMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/OpaqueMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/OpaqueMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/OpaqueMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/SignalServiceCallMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/SignalServiceCallMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/SignalServiceCallMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/SignalServiceCallMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/TurnServerInfo.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/TurnServerInfo.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/TurnServerInfo.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/calls/TurnServerInfo.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/BlockedListMessage.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/BlockedListMessage.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/BlockedListMessage.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/BlockedListMessage.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ChunkedInputStream.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ChunkedInputStream.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ChunkedInputStream.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ChunkedInputStream.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ChunkedOutputStream.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ChunkedOutputStream.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ChunkedOutputStream.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ChunkedOutputStream.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ConfigurationMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ConfigurationMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ConfigurationMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ConfigurationMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ContactsMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ContactsMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ContactsMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ContactsMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContact.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContact.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContact.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContact.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactAvatar.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactAvatar.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactAvatar.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactAvatar.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsOutputStream.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsOutputStream.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsOutputStream.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsOutputStream.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceInfo.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceInfo.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceInfo.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceInfo.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/KeysMessage.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/KeysMessage.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/KeysMessage.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/KeysMessage.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/MessageRequestResponseMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/MessageRequestResponseMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/MessageRequestResponseMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/MessageRequestResponseMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/OutgoingPaymentMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/OutgoingPaymentMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/OutgoingPaymentMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/OutgoingPaymentMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ReadMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ReadMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ReadMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ReadMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/RegisterAsSecondaryDeviceResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/RegisterAsSecondaryDeviceResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/RegisterAsSecondaryDeviceResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/RegisterAsSecondaryDeviceResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/RequestMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/RequestMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/RequestMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/RequestMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/SentTranscriptMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/SentTranscriptMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/SentTranscriptMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/SentTranscriptMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/SignalServiceSyncMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/SignalServiceSyncMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/SignalServiceSyncMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/SignalServiceSyncMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/StickerPackOperationMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/StickerPackOperationMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/StickerPackOperationMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/StickerPackOperationMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/VerifiedMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/VerifiedMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/VerifiedMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/VerifiedMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ViewOnceOpenMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ViewOnceOpenMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ViewOnceOpenMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ViewOnceOpenMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ViewedMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ViewedMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ViewedMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/ViewedMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/shared/SharedContact.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/shared/SharedContact.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/shared/SharedContact.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/shared/SharedContact.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/Currency.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/Currency.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/Currency.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/Currency.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/CurrencyConversion.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/CurrencyConversion.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/CurrencyConversion.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/CurrencyConversion.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/CurrencyConversions.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/CurrencyConversions.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/CurrencyConversions.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/CurrencyConversions.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/Formatter.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/Formatter.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/Formatter.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/Formatter.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/FormatterOptions.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/FormatterOptions.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/FormatterOptions.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/FormatterOptions.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/Money.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/Money.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/Money.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/Money.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/PaymentsApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/PaymentsApi.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/PaymentsApi.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/PaymentsApi.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/PaymentsConstants.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/PaymentsConstants.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/PaymentsConstants.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/PaymentsConstants.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/UnsupportedCurrencyException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/UnsupportedCurrencyException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/UnsupportedCurrencyException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/payments/UnsupportedCurrencyException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/AvatarUploadParams.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/AvatarUploadParams.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/AvatarUploadParams.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/AvatarUploadParams.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileAndCredential.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileAndCredential.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileAndCredential.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileAndCredential.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileApi.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileApi.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileApi.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileRepository.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileRepository.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileRepository.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/ProfileRepository.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfile.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfileWrite.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfileWrite.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfileWrite.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/profiles/SignalServiceProfileWrite.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/provisioning/ProvisioningApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/provisioning/ProvisioningApi.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/provisioning/ProvisioningApi.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/provisioning/ProvisioningApi.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/provisioning/ProvisioningMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/provisioning/ProvisioningMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/provisioning/ProvisioningMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/provisioning/ProvisioningMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/provisioning/ProvisioningSocket.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/provisioning/ProvisioningSocket.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/provisioning/ProvisioningSocket.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/provisioning/ProvisioningSocket.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/provisioning/RestoreMethod.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/provisioning/RestoreMethod.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/provisioning/RestoreMethod.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/provisioning/RestoreMethod.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ContactTokenDetails.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ContactTokenDetails.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ContactTokenDetails.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ContactTokenDetails.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/DistributionId.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/DistributionId.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/DistributionId.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/DistributionId.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ServiceIdType.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ServiceIdType.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ServiceIdType.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ServiceIdType.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ServiceIds.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ServiceIds.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ServiceIds.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ServiceIds.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/SignalServiceAddress.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/SignalServiceAddress.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/SignalServiceAddress.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/SignalServiceAddress.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/SignedPreKeyEntity.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/SignedPreKeyEntity.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/SignedPreKeyEntity.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/SignedPreKeyEntity.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/TrustStore.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/TrustStore.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/TrustStore.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/TrustStore.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/UsernameLinkComponents.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/UsernameLinkComponents.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/UsernameLinkComponents.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/UsernameLinkComponents.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AlreadyVerifiedException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AlreadyVerifiedException.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AlreadyVerifiedException.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AlreadyVerifiedException.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AuthorizationFailedException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AuthorizationFailedException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AuthorizationFailedException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/AuthorizationFailedException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidArgumentException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidArgumentException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidArgumentException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidArgumentException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidTokenException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidTokenException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidTokenException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiInvalidTokenException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiResourceExhaustedException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiResourceExhaustedException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiResourceExhaustedException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/CdsiResourceExhaustedException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ChallengeRequiredException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ChallengeRequiredException.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ChallengeRequiredException.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ChallengeRequiredException.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ConflictException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ConflictException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ConflictException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ConflictException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ContactManifestMismatchException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ContactManifestMismatchException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ContactManifestMismatchException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ContactManifestMismatchException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/DeprecatedVersionException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/DeprecatedVersionException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/DeprecatedVersionException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/DeprecatedVersionException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExpectationFailedException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExpectationFailedException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExpectationFailedException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExpectationFailedException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExternalServiceFailureException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExternalServiceFailureException.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExternalServiceFailureException.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ExternalServiceFailureException.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/HttpConflictException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/HttpConflictException.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/HttpConflictException.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/HttpConflictException.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ImpossiblePhoneNumberException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ImpossiblePhoneNumberException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ImpossiblePhoneNumberException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ImpossiblePhoneNumberException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectCodeException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectCodeException.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectCodeException.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectCodeException.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectRegistrationRecoveryPasswordException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectRegistrationRecoveryPasswordException.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectRegistrationRecoveryPasswordException.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/IncorrectRegistrationRecoveryPasswordException.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/InvalidRegistrationSessionIdException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/InvalidRegistrationSessionIdException.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/InvalidRegistrationSessionIdException.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/InvalidRegistrationSessionIdException.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/InvalidTransportModeException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/InvalidTransportModeException.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/InvalidTransportModeException.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/InvalidTransportModeException.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/LocalRateLimitException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/LocalRateLimitException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/LocalRateLimitException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/LocalRateLimitException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedRequestException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedRequestException.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedRequestException.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedRequestException.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedResponseException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedResponseException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedResponseException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MalformedResponseException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MissingConfigurationException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MissingConfigurationException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MissingConfigurationException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MissingConfigurationException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MustRequestNewCodeException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MustRequestNewCodeException.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MustRequestNewCodeException.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/MustRequestNewCodeException.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoContentException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoContentException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoContentException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoContentException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoSuchSessionException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoSuchSessionException.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoSuchSessionException.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NoSuchSessionException.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonNormalizedPhoneNumberException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonNormalizedPhoneNumberException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonNormalizedPhoneNumberException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonNormalizedPhoneNumberException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResponseCodeException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResponseCodeException.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResponseCodeException.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResponseCodeException.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResumableUploadResponseCodeException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResumableUploadResponseCodeException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResumableUploadResponseCodeException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NonSuccessfulResumableUploadResponseCodeException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NotFoundException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NotFoundException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NotFoundException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/NotFoundException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/PushNetworkException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/PushNetworkException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/PushNetworkException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/PushNetworkException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RangeException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RangeException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RangeException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RangeException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RateLimitException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RateLimitException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RateLimitException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RateLimitException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RemoteAttestationResponseExpiredException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RemoteAttestationResponseExpiredException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RemoteAttestationResponseExpiredException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RemoteAttestationResponseExpiredException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RequestVerificationCodeRateLimitException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RequestVerificationCodeRateLimitException.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RequestVerificationCodeRateLimitException.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/RequestVerificationCodeRateLimitException.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ResumeLocationInvalidException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ResumeLocationInvalidException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ResumeLocationInvalidException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ResumeLocationInvalidException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ServerRejectedException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ServerRejectedException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ServerRejectedException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ServerRejectedException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/SubmitVerificationCodeRateLimitException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/SubmitVerificationCodeRateLimitException.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/SubmitVerificationCodeRateLimitException.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/SubmitVerificationCodeRateLimitException.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/TokenNotAcceptedException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/TokenNotAcceptedException.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/TokenNotAcceptedException.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/TokenNotAcceptedException.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UnregisteredUserException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UnregisteredUserException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UnregisteredUserException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UnregisteredUserException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameIsNotAssociatedWithAnAccountException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameIsNotAssociatedWithAnAccountException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameIsNotAssociatedWithAnAccountException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameIsNotAssociatedWithAnAccountException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameIsNotReservedException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameIsNotReservedException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameIsNotReservedException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameIsNotReservedException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameMalformedException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameMalformedException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameMalformedException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameMalformedException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameTakenException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameTakenException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameTakenException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/UsernameTakenException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/ratelimit/RateLimitChallengeApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/ratelimit/RateLimitChallengeApi.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/ratelimit/RateLimitChallengeApi.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/ratelimit/RateLimitChallengeApi.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/ratelimit/SubmitPushChallengePayload.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/ratelimit/SubmitPushChallengePayload.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/ratelimit/SubmitPushChallengePayload.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/ratelimit/SubmitPushChallengePayload.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/ratelimit/SubmitRecaptchaChallengePayload.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/ratelimit/SubmitRecaptchaChallengePayload.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/ratelimit/SubmitRecaptchaChallengePayload.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/ratelimit/SubmitRecaptchaChallengePayload.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/registration/RegistrationApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/registration/RegistrationApi.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/registration/RegistrationApi.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/registration/RegistrationApi.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/registration/RestoreMethodBody.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/registration/RestoreMethodBody.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/registration/RestoreMethodBody.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/registration/RestoreMethodBody.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/remoteconfig/RemoteConfigApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/remoteconfig/RemoteConfigApi.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/remoteconfig/RemoteConfigApi.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/remoteconfig/RemoteConfigApi.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/remoteconfig/RemoteConfigResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/remoteconfig/RemoteConfigResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/remoteconfig/RemoteConfigResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/remoteconfig/RemoteConfigResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/remoteconfig/RemoteConfigResult.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/remoteconfig/RemoteConfigResult.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/remoteconfig/RemoteConfigResult.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/remoteconfig/RemoteConfigResult.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/DonationsService.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/services/ProfileService.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/AccountRecordExtensions.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/AccountRecordExtensions.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/AccountRecordExtensions.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/AccountRecordExtensions.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/ContactRecordExtensions.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/ContactRecordExtensions.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/ContactRecordExtensions.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/ContactRecordExtensions.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/IAPSubscriptionId.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/IAPSubscriptionId.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/IAPSubscriptionId.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/IAPSubscriptionId.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/ManifestRecordIdentifierExtensions.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/ManifestRecordIdentifierExtensions.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/ManifestRecordIdentifierExtensions.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/ManifestRecordIdentifierExtensions.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/RecordIkm.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/RecordIkm.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/RecordIkm.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/RecordIkm.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalAccountRecord.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalAccountRecord.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalAccountRecord.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalAccountRecord.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalCallLinkRecord.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalCallLinkRecord.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalCallLinkRecord.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalCallLinkRecord.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalChatFolderRecord.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalChatFolderRecord.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalChatFolderRecord.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalChatFolderRecord.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalContactRecord.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalContactRecord.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalContactRecord.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalContactRecord.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV1Record.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV1Record.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV1Record.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV1Record.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV2Record.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV2Record.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV2Record.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalGroupV2Record.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalNotificationProfileRecord.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalNotificationProfileRecord.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalNotificationProfileRecord.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalNotificationProfileRecord.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalRecord.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalRecord.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalRecord.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalRecord.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageCipher.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageCipher.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageCipher.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageCipher.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageManifest.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageManifest.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageManifest.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageManifest.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageRecord.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageRecord.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageRecord.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStorageRecord.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStoryDistributionListRecord.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStoryDistributionListRecord.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStoryDistributionListRecord.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/SignalStoryDistributionListRecord.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageAuthResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageAuthResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageAuthResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageAuthResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageId.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageId.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageId.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageId.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageRecordConverters.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageRecordConverters.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageRecordConverters.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageRecordConverters.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageRecordProtoUtil.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageRecordProtoUtil.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageRecordProtoUtil.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageRecordProtoUtil.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageServiceApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageServiceApi.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageServiceApi.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageServiceApi.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageServiceRepository.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageServiceRepository.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageServiceRepository.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StorageServiceRepository.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StoryDistributionListRecordExtensions.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StoryDistributionListRecordExtensions.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StoryDistributionListRecordExtensions.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/storage/StoryDistributionListRecordExtensions.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscription.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscription.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscription.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscription.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/IdempotencyKey.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/IdempotencyKey.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/IdempotencyKey.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/IdempotencyKey.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalConfirmPaymentIntentResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalConfirmPaymentIntentResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalConfirmPaymentIntentResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalConfirmPaymentIntentResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalCreatePaymentIntentResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalCreatePaymentIntentResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalCreatePaymentIntentResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalCreatePaymentIntentResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalCreatePaymentMethodResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalCreatePaymentMethodResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalCreatePaymentMethodResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/PayPalCreatePaymentMethodResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/StripeClientSecret.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/StripeClientSecret.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/StripeClientSecret.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/StripeClientSecret.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriberId.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriberId.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriberId.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriberId.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriptionLevels.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriptionLevels.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriptionLevels.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriptionLevels.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecovery.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecovery.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecovery.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecovery.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV2.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV2.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV2.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV2.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV3.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV3.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV3.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SecureValueRecoveryV3.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SetShareSetRequest.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SetShareSetRequest.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SetShareSetRequest.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SetShareSetRequest.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/Svr2Socket.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/Svr2Socket.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/Svr2Socket.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/Svr2Socket.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/Svr3Credentials.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/Svr3Credentials.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/Svr3Credentials.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/Svr3Credentials.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SvrBApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SvrBApi.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SvrBApi.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/svr/SvrBApi.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/username/UsernameApi.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/username/UsernameApi.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/username/UsernameApi.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/username/UsernameApi.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/AttachmentPointerUtil.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/AttachmentPointerUtil.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/AttachmentPointerUtil.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/AttachmentPointerUtil.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/CredentialsProvider.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/CredentialsProvider.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/CredentialsProvider.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/CredentialsProvider.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/ExpiringProfileCredentialUtil.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/ExpiringProfileCredentialUtil.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/ExpiringProfileCredentialUtil.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/ExpiringProfileCredentialUtil.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/InvalidNumberException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/InvalidNumberException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/InvalidNumberException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/InvalidNumberException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/OptionalUtil.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/OptionalUtil.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/OptionalUtil.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/OptionalUtil.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Preconditions.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Preconditions.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Preconditions.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Preconditions.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/SleepTimer.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/SleepTimer.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/SleepTimer.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/SleepTimer.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/StreamDetails.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/StreamDetails.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/StreamDetails.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/StreamDetails.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Tls12SocketFactory.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Tls12SocketFactory.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Tls12SocketFactory.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Tls12SocketFactory.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/TlsProxySocketFactory.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/TlsProxySocketFactory.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/TlsProxySocketFactory.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/TlsProxySocketFactory.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Uint64RangeException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Uint64RangeException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Uint64RangeException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Uint64RangeException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Uint64Util.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Uint64Util.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Uint64Util.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Uint64Util.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/UptimeSleepTimer.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/UptimeSleepTimer.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/UptimeSleepTimer.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/UptimeSleepTimer.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/UsernameExtensions.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/UsernameExtensions.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/UsernameExtensions.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/UsernameExtensions.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Usernames.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Usernames.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Usernames.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/util/Usernames.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/HealthMonitor.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/HealthMonitor.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/HealthMonitor.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/HealthMonitor.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/SignalWebSocket.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/SignalWebSocket.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/SignalWebSocket.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/SignalWebSocket.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketConnectionState.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketConnectionState.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketConnectionState.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketConnectionState.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketFactory.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketFactory.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketFactory.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketFactory.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketUnavailableException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketUnavailableException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketUnavailableException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/websocket/WebSocketUnavailableException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/EmptyResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/EmptyResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/EmptyResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/EmptyResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponseProcessor.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponseProcessor.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponseProcessor.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/ServiceResponseProcessor.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/WebSocketRequestExt.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/WebSocketRequestExt.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/WebSocketRequestExt.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/WebSocketRequestExt.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/HttpProxy.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/HttpProxy.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/HttpProxy.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/HttpProxy.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalCdnUrl.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalCdnUrl.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalCdnUrl.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalCdnUrl.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalCdsiUrl.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalCdsiUrl.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalCdsiUrl.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalCdsiUrl.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalProxy.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalProxy.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalProxy.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalProxy.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalServiceConfiguration.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalServiceUrl.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalServiceUrl.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalServiceUrl.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalServiceUrl.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalStorageUrl.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalStorageUrl.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalStorageUrl.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalStorageUrl.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalSvr2Url.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalSvr2Url.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalSvr2Url.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalSvr2Url.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalUrl.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalUrl.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalUrl.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/configuration/SignalUrl.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/SignatureBodyEntity.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/SignatureBodyEntity.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/SignatureBodyEntity.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/SignatureBodyEntity.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryRequest.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryRequest.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryRequest.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryRequest.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupRequest.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupRequest.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupRequest.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupRequest.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/MultiRemoteAttestationResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/MultiRemoteAttestationResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/MultiRemoteAttestationResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/MultiRemoteAttestationResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/QueryEnvelope.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/QueryEnvelope.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/QueryEnvelope.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/QueryEnvelope.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationRequest.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationRequest.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationRequest.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationRequest.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/TokenResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/TokenResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/TokenResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/TokenResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/AttachmentDigest.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/AttachmentDigest.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/AttachmentDigest.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/AttachmentDigest.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/PaddingInputStream.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/PaddingInputStream.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/PaddingInputStream.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/PaddingInputStream.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/PrimaryProvisioningCipher.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/PrimaryProvisioningCipher.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/PrimaryProvisioningCipher.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/PrimaryProvisioningCipher.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/SecondaryProvisioningCipher.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/SecondaryProvisioningCipher.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/SecondaryProvisioningCipher.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/crypto/SecondaryProvisioningCipher.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentUploadForm.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentUploadForm.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentUploadForm.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentUploadForm.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentV2UploadAttributes.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentV2UploadAttributes.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentV2UploadAttributes.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentV2UploadAttributes.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AuthCredentials.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AuthCredentials.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AuthCredentials.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AuthCredentials.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupAuthCheckProcessor.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupAuthCheckProcessor.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupAuthCheckProcessor.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupAuthCheckProcessor.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupAuthCheckRequest.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupAuthCheckRequest.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupAuthCheckRequest.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupAuthCheckRequest.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupV2AuthCheckResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupV2AuthCheckResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupV2AuthCheckResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupV2AuthCheckResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupV3AuthCheckResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupV3AuthCheckResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupV3AuthCheckResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BackupV3AuthCheckResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BankMandate.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BankMandate.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BankMandate.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/BankMandate.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ByteArrayDeserializerBase64.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ByteArrayDeserializerBase64.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ByteArrayDeserializerBase64.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ByteArrayDeserializerBase64.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ByteArraySerializerBase64NoPadding.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ByteArraySerializerBase64NoPadding.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ByteArraySerializerBase64NoPadding.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ByteArraySerializerBase64NoPadding.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CdsiAuthResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CdsiAuthResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CdsiAuthResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CdsiAuthResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CdsiResourceExhaustedResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CdsiResourceExhaustedResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CdsiResourceExhaustedResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CdsiResourceExhaustedResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CheckRepeatedUsedPreKeysRequest.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CheckRepeatedUsedPreKeysRequest.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CheckRepeatedUsedPreKeysRequest.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CheckRepeatedUsedPreKeysRequest.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ConfirmUsernameRequest.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ConfirmUsernameRequest.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ConfirmUsernameRequest.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ConfirmUsernameRequest.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ConfirmUsernameResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ConfirmUsernameResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ConfirmUsernameResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ConfirmUsernameResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContactDiscoveryFailureReason.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContactDiscoveryFailureReason.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContactDiscoveryFailureReason.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContactDiscoveryFailureReason.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContactTokenDetailsList.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContactTokenDetailsList.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContactTokenDetailsList.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContactTokenDetailsList.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContentRange.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContentRange.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContentRange.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContentRange.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthRequest.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthRequest.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthRequest.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthRequest.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CreateCallLinkAuthResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceInfoList.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceInfoList.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceInfoList.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceInfoList.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceLimit.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceLimit.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceLimit.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceLimit.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceLimitExceededException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceLimitExceededException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceLimitExceededException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DeviceLimitExceededException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DonationIntentResult.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DonationIntentResult.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DonationIntentResult.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DonationIntentResult.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DonationProcessor.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DonationProcessor.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DonationProcessor.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/DonationProcessor.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GcmRegistrationId.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GcmRegistrationId.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GcmRegistrationId.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GcmRegistrationId.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetAciByUsernameResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetAciByUsernameResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetAciByUsernameResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetAciByUsernameResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetCallingRelaysResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetCallingRelaysResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetCallingRelaysResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetCallingRelaysResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetUsernameFromLinkResponseBody.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetUsernameFromLinkResponseBody.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetUsernameFromLinkResponseBody.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetUsernameFromLinkResponseBody.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GroupMismatchedDevices.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GroupMismatchedDevices.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GroupMismatchedDevices.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GroupMismatchedDevices.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GroupPatchResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GroupPatchResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GroupPatchResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GroupPatchResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GroupStaleDevices.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GroupStaleDevices.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GroupStaleDevices.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GroupStaleDevices.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckRequest.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckRequest.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckRequest.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckRequest.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/IdentityCheckResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/KyberPreKeyEntity.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/KyberPreKeyEntity.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/KyberPreKeyEntity.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/KyberPreKeyEntity.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/LockedException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/LockedException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/LockedException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/LockedException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/MismatchedDevices.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/MismatchedDevices.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/MismatchedDevices.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/MismatchedDevices.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/NowhereBufferedSink.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/NowhereBufferedSink.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/NowhereBufferedSink.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/NowhereBufferedSink.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/OutgoingPushMessage.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/OutgoingPushMessage.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/OutgoingPushMessage.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/OutgoingPushMessage.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/OutgoingPushMessageList.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/OutgoingPushMessageList.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/OutgoingPushMessageList.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/OutgoingPushMessageList.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyEntity.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyEntity.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyEntity.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyEntity.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponseItem.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponseItem.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponseItem.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyResponseItem.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyState.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyState.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyState.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PreKeyState.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProfileAvatarData.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProfileAvatarData.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProfileAvatarData.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProfileAvatarData.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProfileAvatarUploadAttributes.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProfileAvatarUploadAttributes.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProfileAvatarUploadAttributes.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProfileAvatarUploadAttributes.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProofRequiredResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProofRequiredResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProofRequiredResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ProofRequiredResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushAttachmentData.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushAttachmentData.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushAttachmentData.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushAttachmentData.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushTransportDetails.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushTransportDetails.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushTransportDetails.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/PushTransportDetails.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RegisterAsSecondaryDeviceRequest.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RegisterAsSecondaryDeviceRequest.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RegisterAsSecondaryDeviceRequest.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RegisterAsSecondaryDeviceRequest.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RegistrationSessionMetadataResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RegistrationSessionMetadataResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RegistrationSessionMetadataResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RegistrationSessionMetadataResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RegistrationSessionRequestBody.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RegistrationSessionRequestBody.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RegistrationSessionRequestBody.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RegistrationSessionRequestBody.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RequestVerificationCodeResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RequestVerificationCodeResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RequestVerificationCodeResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/RequestVerificationCodeResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ReserveUsernameRequest.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ReserveUsernameRequest.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ReserveUsernameRequest.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ReserveUsernameRequest.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ReserveUsernameResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ReserveUsernameResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ReserveUsernameResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ReserveUsernameResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SendGroupMessageResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SendGroupMessageResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SendGroupMessageResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SendGroupMessageResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SendMessageResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SendMessageResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SendMessageResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SendMessageResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SenderCertificate.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SenderCertificate.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SenderCertificate.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SenderCertificate.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkRequestBody.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkRequestBody.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkRequestBody.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkRequestBody.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkResponseBody.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkResponseBody.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkResponseBody.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameLinkResponseBody.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameRequest.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameRequest.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameRequest.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameRequest.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceEnvelopeEntity.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceEnvelopeEntity.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceEnvelopeEntity.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceEnvelopeEntity.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/StaleDevices.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/StaleDevices.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/StaleDevices.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/StaleDevices.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SubscriptionsConfiguration.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SubscriptionsConfiguration.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SubscriptionsConfiguration.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SubscriptionsConfiguration.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/UpdateVerificationSessionRequestBody.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/UpdateVerificationSessionRequestBody.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/UpdateVerificationSessionRequestBody.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/UpdateVerificationSessionRequestBody.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerificationCodeFailureResponseBody.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerificationCodeFailureResponseBody.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerificationCodeFailureResponseBody.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerificationCodeFailureResponseBody.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerificationSessionMetadataRequestBody.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerificationSessionMetadataRequestBody.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerificationSessionMetadataRequestBody.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerificationSessionMetadataRequestBody.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerifyAccountResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerifyAccountResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerifyAccountResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/VerifyAccountResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/WhoAmIResponse.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/WhoAmIResponse.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/WhoAmIResponse.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/WhoAmIResponse.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/CaptchaRejectedException.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/CaptchaRejectedException.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/CaptchaRejectedException.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/CaptchaRejectedException.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/ForbiddenException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/ForbiddenException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/ForbiddenException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/ForbiddenException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupExistsException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupExistsException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupExistsException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupExistsException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupMismatchedDevicesException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupMismatchedDevicesException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupMismatchedDevicesException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupMismatchedDevicesException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupNotFoundException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupNotFoundException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupNotFoundException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupNotFoundException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupPatchNotAcceptedException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupPatchNotAcceptedException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupPatchNotAcceptedException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupPatchNotAcceptedException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupStaleDevicesException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupStaleDevicesException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupStaleDevicesException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/GroupStaleDevicesException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentProcessorError.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentProcessorError.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentProcessorError.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentProcessorError.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentReceiptCredentialError.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentReceiptCredentialError.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentReceiptCredentialError.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentReceiptCredentialError.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InvalidUnidentifiedAccessHeaderException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InvalidUnidentifiedAccessHeaderException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InvalidUnidentifiedAccessHeaderException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/InvalidUnidentifiedAccessHeaderException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/MismatchedDevicesException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/MismatchedDevicesException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/MismatchedDevicesException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/MismatchedDevicesException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/NotInGroupException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/NotInGroupException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/NotInGroupException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/NotInGroupException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/PaymentsRegionException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/PaymentsRegionException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/PaymentsRegionException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/PaymentsRegionException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/StaleDevicesException.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/StaleDevicesException.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/StaleDevicesException.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/exceptions/StaleDevicesException.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/AcceptLanguagesUtil.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/AcceptLanguagesUtil.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/AcceptLanguagesUtil.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/AcceptLanguagesUtil.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/AttachmentCipherOutputStreamFactory.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/AttachmentCipherOutputStreamFactory.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/AttachmentCipherOutputStreamFactory.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/AttachmentCipherOutputStreamFactory.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/CancelationSignal.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/CancelationSignal.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/CancelationSignal.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/CancelationSignal.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBody.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBody.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBody.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBody.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/NoCipherOutputStreamFactory.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/NoCipherOutputStreamFactory.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/NoCipherOutputStreamFactory.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/NoCipherOutputStreamFactory.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/OutputStreamFactory.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/OutputStreamFactory.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/OutputStreamFactory.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/OutputStreamFactory.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/PartialSendBatchCompleteListener.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/PartialSendBatchCompleteListener.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/PartialSendBatchCompleteListener.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/PartialSendBatchCompleteListener.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/PartialSendCompleteListener.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/PartialSendCompleteListener.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/PartialSendCompleteListener.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/PartialSendCompleteListener.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/ProfileCipherOutputStreamFactory.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/ProfileCipherOutputStreamFactory.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/ProfileCipherOutputStreamFactory.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/ProfileCipherOutputStreamFactory.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/ResumableUploadSpec.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/ResumableUploadSpec.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/ResumableUploadSpec.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/http/ResumableUploadSpec.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/BlacklistingTrustManager.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/BlacklistingTrustManager.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/BlacklistingTrustManager.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/BlacklistingTrustManager.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/CompletableFutureExtensions.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/CompletableFutureExtensions.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/CompletableFutureExtensions.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/CompletableFutureExtensions.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/JsonUtil.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/JsonUtil.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/JsonUtil.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/JsonUtil.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/StaticCredentialsProvider.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/StaticCredentialsProvider.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/StaticCredentialsProvider.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/StaticCredentialsProvider.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/Util.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/Util.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/Util.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/util/Util.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultErrorMapper.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultErrorMapper.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultErrorMapper.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultErrorMapper.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultResponseMapper.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultResponseMapper.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultResponseMapper.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/DefaultResponseMapper.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ErrorMapper.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ErrorMapper.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ErrorMapper.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ErrorMapper.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnection.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnection.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnection.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnection.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalNetworkExtensions.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalNetworkExtensions.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalNetworkExtensions.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalNetworkExtensions.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalResponseExtension.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalResponseExtension.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalResponseExtension.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/LibSignalResponseExtension.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ResponseMapper.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ResponseMapper.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ResponseMapper.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/ResponseMapper.java diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.kt b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.kt similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.kt rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebSocketConnection.kt diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebsocketResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebsocketResponse.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebsocketResponse.java rename to lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/WebsocketResponse.java diff --git a/libsignal-service/src/main/java/org/whispersystems/util/ByteArrayUtil.java b/lib/libsignal-service/src/main/java/org/whispersystems/util/ByteArrayUtil.java similarity index 100% rename from libsignal-service/src/main/java/org/whispersystems/util/ByteArrayUtil.java rename to lib/libsignal-service/src/main/java/org/whispersystems/util/ByteArrayUtil.java diff --git a/libsignal-service/src/main/protowire/CDSI.proto b/lib/libsignal-service/src/main/protowire/CDSI.proto similarity index 100% rename from libsignal-service/src/main/protowire/CDSI.proto rename to lib/libsignal-service/src/main/protowire/CDSI.proto diff --git a/libsignal-service/src/main/protowire/CallQualitySurvey.proto b/lib/libsignal-service/src/main/protowire/CallQualitySurvey.proto similarity index 100% rename from libsignal-service/src/main/protowire/CallQualitySurvey.proto rename to lib/libsignal-service/src/main/protowire/CallQualitySurvey.proto diff --git a/libsignal-service/src/main/protowire/DecryptedGroups.proto b/lib/libsignal-service/src/main/protowire/DecryptedGroups.proto similarity index 100% rename from libsignal-service/src/main/protowire/DecryptedGroups.proto rename to lib/libsignal-service/src/main/protowire/DecryptedGroups.proto diff --git a/libsignal-service/src/main/protowire/Groups.proto b/lib/libsignal-service/src/main/protowire/Groups.proto similarity index 100% rename from libsignal-service/src/main/protowire/Groups.proto rename to lib/libsignal-service/src/main/protowire/Groups.proto diff --git a/libsignal-service/src/main/protowire/InternalSerialization.proto b/lib/libsignal-service/src/main/protowire/InternalSerialization.proto similarity index 100% rename from libsignal-service/src/main/protowire/InternalSerialization.proto rename to lib/libsignal-service/src/main/protowire/InternalSerialization.proto diff --git a/libsignal-service/src/main/protowire/MessageProcessing.proto b/lib/libsignal-service/src/main/protowire/MessageProcessing.proto similarity index 100% rename from libsignal-service/src/main/protowire/MessageProcessing.proto rename to lib/libsignal-service/src/main/protowire/MessageProcessing.proto diff --git a/libsignal-service/src/main/protowire/Provisioning.proto b/lib/libsignal-service/src/main/protowire/Provisioning.proto similarity index 100% rename from libsignal-service/src/main/protowire/Provisioning.proto rename to lib/libsignal-service/src/main/protowire/Provisioning.proto diff --git a/libsignal-service/src/main/protowire/RegistrationProvisioning.proto b/lib/libsignal-service/src/main/protowire/RegistrationProvisioning.proto similarity index 100% rename from libsignal-service/src/main/protowire/RegistrationProvisioning.proto rename to lib/libsignal-service/src/main/protowire/RegistrationProvisioning.proto diff --git a/libsignal-service/src/main/protowire/ResumableUploads.proto b/lib/libsignal-service/src/main/protowire/ResumableUploads.proto similarity index 100% rename from libsignal-service/src/main/protowire/ResumableUploads.proto rename to lib/libsignal-service/src/main/protowire/ResumableUploads.proto diff --git a/libsignal-service/src/main/protowire/SVR2.proto b/lib/libsignal-service/src/main/protowire/SVR2.proto similarity index 100% rename from libsignal-service/src/main/protowire/SVR2.proto rename to lib/libsignal-service/src/main/protowire/SVR2.proto diff --git a/libsignal-service/src/main/protowire/SignalService.proto b/lib/libsignal-service/src/main/protowire/SignalService.proto similarity index 100% rename from libsignal-service/src/main/protowire/SignalService.proto rename to lib/libsignal-service/src/main/protowire/SignalService.proto diff --git a/libsignal-service/src/main/protowire/SignalServiceLegacy.proto b/lib/libsignal-service/src/main/protowire/SignalServiceLegacy.proto similarity index 100% rename from libsignal-service/src/main/protowire/SignalServiceLegacy.proto rename to lib/libsignal-service/src/main/protowire/SignalServiceLegacy.proto diff --git a/libsignal-service/src/main/protowire/StickerResources.proto b/lib/libsignal-service/src/main/protowire/StickerResources.proto similarity index 100% rename from libsignal-service/src/main/protowire/StickerResources.proto rename to lib/libsignal-service/src/main/protowire/StickerResources.proto diff --git a/libsignal-service/src/main/protowire/StorageService.proto b/lib/libsignal-service/src/main/protowire/StorageService.proto similarity index 100% rename from libsignal-service/src/main/protowire/StorageService.proto rename to lib/libsignal-service/src/main/protowire/StorageService.proto diff --git a/libsignal-service/src/main/protowire/WebSocketResources.proto b/lib/libsignal-service/src/main/protowire/WebSocketResources.proto similarity index 100% rename from libsignal-service/src/main/protowire/WebSocketResources.proto rename to lib/libsignal-service/src/main/protowire/WebSocketResources.proto diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/NetworkResultTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/NetworkResultTest.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/NetworkResultTest.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/NetworkResultTest.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherStreamUtilTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherStreamUtilTest.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherStreamUtilTest.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherStreamUtilTest.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTest.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTest.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTest.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTestHelper.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTestHelper.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTestHelper.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/AttachmentCipherTestHelper.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/DigestValidatingInputStreamTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/DigestValidatingInputStreamTest.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/DigestValidatingInputStreamTest.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/DigestValidatingInputStreamTest.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/MacValidatingInputStreamTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/MacValidatingInputStreamTest.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/MacValidatingInputStreamTest.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/MacValidatingInputStreamTest.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/ProfileCipherTest.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/ProfileCipherTest.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/ProfileCipherTest.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/ProfileCipherTest.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/SkippingOutputStreamTest.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/SkippingOutputStreamTest.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/SkippingOutputStreamTest.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/SkippingOutputStreamTest.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccessTest.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccessTest.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccessTest.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/crypto/UnidentifiedAccessTest.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtilTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtilTest.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtilTest.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtilTest.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_apply_Test.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_apply_Test.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_apply_Test.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_apply_Test.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_empty_Test.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_empty_Test.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_empty_Test.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/DecryptedGroupUtil_empty_Test.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstructTest.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstructTest.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstructTest.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeReconstructTest.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_changeIsEmpty_Test.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_changeIsEmpty_Test.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_changeIsEmpty_Test.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_changeIsEmpty_Test.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_Test.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_Test.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_Test.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_Test.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_decryptedOnly_Test.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_decryptedOnly_Test.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_decryptedOnly_Test.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupChangeUtil_resolveConflict_decryptedOnly_Test.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_ban_Test.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_ban_Test.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_ban_Test.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_ban_Test.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_change_Test.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_change_Test.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_change_Test.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_change_Test.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_groupJoinInfo_Test.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_groupJoinInfo_Test.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_groupJoinInfo_Test.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_groupJoinInfo_Test.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_group_Test.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_group_Test.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_group_Test.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/GroupsV2Operations_decrypt_group_Test.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/ProtoTestUtils.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/ProtoTestUtils.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/ProtoTestUtils.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/ProtoTestUtils.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/ProtobufTestUtils.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/ProtobufTestUtils.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/ProtobufTestUtils.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/ProtobufTestUtils.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/TestZkGroupServer.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/TestZkGroupServer.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/TestZkGroupServer.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/groupsv2/TestZkGroupServer.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/kbs/MasterKeyTest.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/kbs/MasterKeyTest.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/kbs/MasterKeyTest.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/kbs/MasterKeyTest.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidatorTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidatorTest.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidatorTest.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/messages/EnvelopeContentValidatorTest.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStreamTest.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStreamTest.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStreamTest.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStreamTest.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/FiatFormatterTest.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/FiatFormatterTest.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/FiatFormatterTest.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/FiatFormatterTest.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MobileCoinFormatterTest.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MobileCoinFormatterTest.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MobileCoinFormatterTest.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MobileCoinFormatterTest.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_add.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_add.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_add.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_add.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_comparators.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_comparators.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_comparators.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_comparators.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_subtract.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_subtract.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_subtract.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_subtract.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_sum.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_sum.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_sum.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/payments/MoneyTest_MobileCoin_sum.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/push/PushTransportDetailsTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/push/PushTransportDetailsTest.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/push/PushTransportDetailsTest.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/push/PushTransportDetailsTest.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/push/ServiceIdTests.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/push/ServiceIdTests.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/push/ServiceIdTests.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/push/ServiceIdTests.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/services/DonationsServiceTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/services/DonationsServiceTest.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/services/DonationsServiceTest.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/services/DonationsServiceTest.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/storage/SignalContactRecordTest.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/storage/SignalContactRecordTest.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/storage/SignalContactRecordTest.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/storage/SignalContactRecordTest.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/storage/SignalStorageCipherTest.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/storage/SignalStorageCipherTest.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/storage/SignalStorageCipherTest.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/storage/SignalStorageCipherTest.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscriptionTest.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscriptionTest.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscriptionTest.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/subscriptions/ActiveSubscriptionTest.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/util/CredentialsProviderTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/util/CredentialsProviderTest.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/util/CredentialsProviderTest.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/util/CredentialsProviderTest.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/util/OptionalUtilTest.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/util/OptionalUtilTest.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/util/OptionalUtilTest.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/util/OptionalUtilTest.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/util/Uint64UtilTest.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/util/Uint64UtilTest.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/api/util/Uint64UtilTest.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/util/Uint64UtilTest.java diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/crypto/PaddingInputStreamTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/crypto/PaddingInputStreamTest.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/internal/crypto/PaddingInputStreamTest.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/crypto/PaddingInputStreamTest.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/crypto/SecondaryProvisioningCipherTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/crypto/SecondaryProvisioningCipherTest.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/internal/crypto/SecondaryProvisioningCipherTest.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/crypto/SecondaryProvisioningCipherTest.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/ContentRange_parse_Test.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/ContentRange_parse_Test.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/ContentRange_parse_Test.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/ContentRange_parse_Test.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/ContentRange_parse_withInvalidStrings_Test.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/ContentRange_parse_withInvalidStrings_Test.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/ContentRange_parse_withInvalidStrings_Test.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/ContentRange_parse_withInvalidStrings_Test.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/GroupMismatchedDevicesTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/GroupMismatchedDevicesTest.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/GroupMismatchedDevicesTest.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/GroupMismatchedDevicesTest.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/GroupStaleDevicesTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/GroupStaleDevicesTest.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/GroupStaleDevicesTest.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/GroupStaleDevicesTest.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentProcessorErrorTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentProcessorErrorTest.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentProcessorErrorTest.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/exceptions/InAppPaymentProcessorErrorTest.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBodyTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBodyTest.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBodyTest.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBodyTest.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnectionTest.kt b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnectionTest.kt similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnectionTest.kt rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/internal/websocket/LibSignalChatConnectionTest.kt diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/testutil/LibSignalLibraryUtil.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/testutil/LibSignalLibraryUtil.java similarity index 100% rename from libsignal-service/src/test/java/org/whispersystems/signalservice/testutil/LibSignalLibraryUtil.java rename to lib/libsignal-service/src/test/java/org/whispersystems/signalservice/testutil/LibSignalLibraryUtil.java diff --git a/libsignal-service/src/test/resources/ias.cert b/lib/libsignal-service/src/test/resources/ias.cert similarity index 100% rename from libsignal-service/src/test/resources/ias.cert rename to lib/libsignal-service/src/test/resources/ias.cert diff --git a/libsignal-service/src/test/resources/ias.jks b/lib/libsignal-service/src/test/resources/ias.jks similarity index 100% rename from libsignal-service/src/test/resources/ias.jks rename to lib/libsignal-service/src/test/resources/ias.jks diff --git a/libsignal-service/src/test/resources/ias.store b/lib/libsignal-service/src/test/resources/ias.store similarity index 100% rename from libsignal-service/src/test/resources/ias.store rename to lib/libsignal-service/src/test/resources/ias.store diff --git a/libsignal-service/src/testFixtures/java/org/whispersystems/signalservice/test/LibSignalLibraryUtil.java b/lib/libsignal-service/src/testFixtures/java/org/whispersystems/signalservice/test/LibSignalLibraryUtil.java similarity index 100% rename from libsignal-service/src/testFixtures/java/org/whispersystems/signalservice/test/LibSignalLibraryUtil.java rename to lib/libsignal-service/src/testFixtures/java/org/whispersystems/signalservice/test/LibSignalLibraryUtil.java diff --git a/paging/lib/build.gradle.kts b/lib/paging/build.gradle.kts similarity index 71% rename from paging/lib/build.gradle.kts rename to lib/paging/build.gradle.kts index 4d2109b439..c0fe195b10 100644 --- a/paging/lib/build.gradle.kts +++ b/lib/paging/build.gradle.kts @@ -7,5 +7,5 @@ android { } dependencies { - implementation(project(":core-util")) + implementation(project(":core:util")) } diff --git a/paging/lib/src/main/AndroidManifest.xml b/lib/paging/src/main/AndroidManifest.xml similarity index 100% rename from paging/lib/src/main/AndroidManifest.xml rename to lib/paging/src/main/AndroidManifest.xml diff --git a/paging/lib/src/main/java/org/signal/paging/BufferedPagingController.java b/lib/paging/src/main/java/org/signal/paging/BufferedPagingController.java similarity index 100% rename from paging/lib/src/main/java/org/signal/paging/BufferedPagingController.java rename to lib/paging/src/main/java/org/signal/paging/BufferedPagingController.java diff --git a/paging/lib/src/main/java/org/signal/paging/CompressedList.java b/lib/paging/src/main/java/org/signal/paging/CompressedList.java similarity index 100% rename from paging/lib/src/main/java/org/signal/paging/CompressedList.java rename to lib/paging/src/main/java/org/signal/paging/CompressedList.java diff --git a/paging/lib/src/main/java/org/signal/paging/DataStatus.java b/lib/paging/src/main/java/org/signal/paging/DataStatus.java similarity index 100% rename from paging/lib/src/main/java/org/signal/paging/DataStatus.java rename to lib/paging/src/main/java/org/signal/paging/DataStatus.java diff --git a/paging/lib/src/main/java/org/signal/paging/DataStream.java b/lib/paging/src/main/java/org/signal/paging/DataStream.java similarity index 100% rename from paging/lib/src/main/java/org/signal/paging/DataStream.java rename to lib/paging/src/main/java/org/signal/paging/DataStream.java diff --git a/paging/lib/src/main/java/org/signal/paging/FixedSizePagingController.java b/lib/paging/src/main/java/org/signal/paging/FixedSizePagingController.java similarity index 100% rename from paging/lib/src/main/java/org/signal/paging/FixedSizePagingController.java rename to lib/paging/src/main/java/org/signal/paging/FixedSizePagingController.java diff --git a/paging/lib/src/main/java/org/signal/paging/LivePagedData.java b/lib/paging/src/main/java/org/signal/paging/LivePagedData.java similarity index 100% rename from paging/lib/src/main/java/org/signal/paging/LivePagedData.java rename to lib/paging/src/main/java/org/signal/paging/LivePagedData.java diff --git a/paging/lib/src/main/java/org/signal/paging/ObservablePagedData.java b/lib/paging/src/main/java/org/signal/paging/ObservablePagedData.java similarity index 100% rename from paging/lib/src/main/java/org/signal/paging/ObservablePagedData.java rename to lib/paging/src/main/java/org/signal/paging/ObservablePagedData.java diff --git a/paging/lib/src/main/java/org/signal/paging/PagedData.java b/lib/paging/src/main/java/org/signal/paging/PagedData.java similarity index 100% rename from paging/lib/src/main/java/org/signal/paging/PagedData.java rename to lib/paging/src/main/java/org/signal/paging/PagedData.java diff --git a/paging/lib/src/main/java/org/signal/paging/PagedDataSource.java b/lib/paging/src/main/java/org/signal/paging/PagedDataSource.java similarity index 100% rename from paging/lib/src/main/java/org/signal/paging/PagedDataSource.java rename to lib/paging/src/main/java/org/signal/paging/PagedDataSource.java diff --git a/paging/lib/src/main/java/org/signal/paging/PagingConfig.java b/lib/paging/src/main/java/org/signal/paging/PagingConfig.java similarity index 100% rename from paging/lib/src/main/java/org/signal/paging/PagingConfig.java rename to lib/paging/src/main/java/org/signal/paging/PagingConfig.java diff --git a/paging/lib/src/main/java/org/signal/paging/PagingController.java b/lib/paging/src/main/java/org/signal/paging/PagingController.java similarity index 100% rename from paging/lib/src/main/java/org/signal/paging/PagingController.java rename to lib/paging/src/main/java/org/signal/paging/PagingController.java diff --git a/paging/lib/src/main/java/org/signal/paging/ProxyPagingController.java b/lib/paging/src/main/java/org/signal/paging/ProxyPagingController.java similarity index 100% rename from paging/lib/src/main/java/org/signal/paging/ProxyPagingController.java rename to lib/paging/src/main/java/org/signal/paging/ProxyPagingController.java diff --git a/paging/lib/src/test/java/org/signal/paging/DataStatusTest.kt b/lib/paging/src/test/java/org/signal/paging/DataStatusTest.kt similarity index 100% rename from paging/lib/src/test/java/org/signal/paging/DataStatusTest.kt rename to lib/paging/src/test/java/org/signal/paging/DataStatusTest.kt diff --git a/photoview/build.gradle.kts b/lib/photoview/build.gradle.kts similarity index 100% rename from photoview/build.gradle.kts rename to lib/photoview/build.gradle.kts diff --git a/photoview/src/main/AndroidManifest.xml b/lib/photoview/src/main/AndroidManifest.xml similarity index 100% rename from photoview/src/main/AndroidManifest.xml rename to lib/photoview/src/main/AndroidManifest.xml diff --git a/photoview/src/main/java/com/github/chrisbanes/photoview/Compat.java b/lib/photoview/src/main/java/com/github/chrisbanes/photoview/Compat.java similarity index 100% rename from photoview/src/main/java/com/github/chrisbanes/photoview/Compat.java rename to lib/photoview/src/main/java/com/github/chrisbanes/photoview/Compat.java diff --git a/photoview/src/main/java/com/github/chrisbanes/photoview/CustomGestureDetector.java b/lib/photoview/src/main/java/com/github/chrisbanes/photoview/CustomGestureDetector.java similarity index 100% rename from photoview/src/main/java/com/github/chrisbanes/photoview/CustomGestureDetector.java rename to lib/photoview/src/main/java/com/github/chrisbanes/photoview/CustomGestureDetector.java diff --git a/photoview/src/main/java/com/github/chrisbanes/photoview/OnGestureListener.java b/lib/photoview/src/main/java/com/github/chrisbanes/photoview/OnGestureListener.java similarity index 100% rename from photoview/src/main/java/com/github/chrisbanes/photoview/OnGestureListener.java rename to lib/photoview/src/main/java/com/github/chrisbanes/photoview/OnGestureListener.java diff --git a/photoview/src/main/java/com/github/chrisbanes/photoview/OnMatrixChangedListener.java b/lib/photoview/src/main/java/com/github/chrisbanes/photoview/OnMatrixChangedListener.java similarity index 100% rename from photoview/src/main/java/com/github/chrisbanes/photoview/OnMatrixChangedListener.java rename to lib/photoview/src/main/java/com/github/chrisbanes/photoview/OnMatrixChangedListener.java diff --git a/photoview/src/main/java/com/github/chrisbanes/photoview/OnOutsidePhotoTapListener.java b/lib/photoview/src/main/java/com/github/chrisbanes/photoview/OnOutsidePhotoTapListener.java similarity index 100% rename from photoview/src/main/java/com/github/chrisbanes/photoview/OnOutsidePhotoTapListener.java rename to lib/photoview/src/main/java/com/github/chrisbanes/photoview/OnOutsidePhotoTapListener.java diff --git a/photoview/src/main/java/com/github/chrisbanes/photoview/OnPhotoTapListener.java b/lib/photoview/src/main/java/com/github/chrisbanes/photoview/OnPhotoTapListener.java similarity index 100% rename from photoview/src/main/java/com/github/chrisbanes/photoview/OnPhotoTapListener.java rename to lib/photoview/src/main/java/com/github/chrisbanes/photoview/OnPhotoTapListener.java diff --git a/photoview/src/main/java/com/github/chrisbanes/photoview/OnScaleChangedListener.java b/lib/photoview/src/main/java/com/github/chrisbanes/photoview/OnScaleChangedListener.java similarity index 100% rename from photoview/src/main/java/com/github/chrisbanes/photoview/OnScaleChangedListener.java rename to lib/photoview/src/main/java/com/github/chrisbanes/photoview/OnScaleChangedListener.java diff --git a/photoview/src/main/java/com/github/chrisbanes/photoview/OnSingleFlingListener.java b/lib/photoview/src/main/java/com/github/chrisbanes/photoview/OnSingleFlingListener.java similarity index 100% rename from photoview/src/main/java/com/github/chrisbanes/photoview/OnSingleFlingListener.java rename to lib/photoview/src/main/java/com/github/chrisbanes/photoview/OnSingleFlingListener.java diff --git a/photoview/src/main/java/com/github/chrisbanes/photoview/OnViewDragListener.java b/lib/photoview/src/main/java/com/github/chrisbanes/photoview/OnViewDragListener.java similarity index 100% rename from photoview/src/main/java/com/github/chrisbanes/photoview/OnViewDragListener.java rename to lib/photoview/src/main/java/com/github/chrisbanes/photoview/OnViewDragListener.java diff --git a/photoview/src/main/java/com/github/chrisbanes/photoview/OnViewTapListener.java b/lib/photoview/src/main/java/com/github/chrisbanes/photoview/OnViewTapListener.java similarity index 100% rename from photoview/src/main/java/com/github/chrisbanes/photoview/OnViewTapListener.java rename to lib/photoview/src/main/java/com/github/chrisbanes/photoview/OnViewTapListener.java diff --git a/photoview/src/main/java/com/github/chrisbanes/photoview/PhotoView.java b/lib/photoview/src/main/java/com/github/chrisbanes/photoview/PhotoView.java similarity index 100% rename from photoview/src/main/java/com/github/chrisbanes/photoview/PhotoView.java rename to lib/photoview/src/main/java/com/github/chrisbanes/photoview/PhotoView.java diff --git a/photoview/src/main/java/com/github/chrisbanes/photoview/PhotoViewAttacher.java b/lib/photoview/src/main/java/com/github/chrisbanes/photoview/PhotoViewAttacher.java similarity index 100% rename from photoview/src/main/java/com/github/chrisbanes/photoview/PhotoViewAttacher.java rename to lib/photoview/src/main/java/com/github/chrisbanes/photoview/PhotoViewAttacher.java diff --git a/photoview/src/main/java/com/github/chrisbanes/photoview/Util.java b/lib/photoview/src/main/java/com/github/chrisbanes/photoview/Util.java similarity index 100% rename from photoview/src/main/java/com/github/chrisbanes/photoview/Util.java rename to lib/photoview/src/main/java/com/github/chrisbanes/photoview/Util.java diff --git a/qr/lib/build.gradle.kts b/lib/qr/build.gradle.kts similarity index 93% rename from qr/lib/build.gradle.kts rename to lib/qr/build.gradle.kts index 17adf85bbe..81419c74c3 100644 --- a/qr/lib/build.gradle.kts +++ b/lib/qr/build.gradle.kts @@ -7,7 +7,7 @@ android { } dependencies { - implementation(project(":core-util")) + implementation(project(":core:util")) implementation(libs.androidx.camera.core) implementation(libs.androidx.camera.camera2) diff --git a/qr/lib/src/main/AndroidManifest.xml b/lib/qr/src/main/AndroidManifest.xml similarity index 100% rename from qr/lib/src/main/AndroidManifest.xml rename to lib/qr/src/main/AndroidManifest.xml diff --git a/qr/lib/src/main/java/org/signal/qr/ImageProxyLuminanceSource.kt b/lib/qr/src/main/java/org/signal/qr/ImageProxyLuminanceSource.kt similarity index 100% rename from qr/lib/src/main/java/org/signal/qr/ImageProxyLuminanceSource.kt rename to lib/qr/src/main/java/org/signal/qr/ImageProxyLuminanceSource.kt diff --git a/qr/lib/src/main/java/org/signal/qr/QrProcessor.kt b/lib/qr/src/main/java/org/signal/qr/QrProcessor.kt similarity index 100% rename from qr/lib/src/main/java/org/signal/qr/QrProcessor.kt rename to lib/qr/src/main/java/org/signal/qr/QrProcessor.kt diff --git a/qr/lib/src/main/java/org/signal/qr/QrScannerView.kt b/lib/qr/src/main/java/org/signal/qr/QrScannerView.kt similarity index 100% rename from qr/lib/src/main/java/org/signal/qr/QrScannerView.kt rename to lib/qr/src/main/java/org/signal/qr/QrScannerView.kt diff --git a/qr/lib/src/main/java/org/signal/qr/ScannerView.kt b/lib/qr/src/main/java/org/signal/qr/ScannerView.kt similarity index 100% rename from qr/lib/src/main/java/org/signal/qr/ScannerView.kt rename to lib/qr/src/main/java/org/signal/qr/ScannerView.kt diff --git a/qr/lib/src/main/java/org/signal/qr/ScannerView19.kt b/lib/qr/src/main/java/org/signal/qr/ScannerView19.kt similarity index 100% rename from qr/lib/src/main/java/org/signal/qr/ScannerView19.kt rename to lib/qr/src/main/java/org/signal/qr/ScannerView19.kt diff --git a/qr/lib/src/main/java/org/signal/qr/ScannerView21.kt b/lib/qr/src/main/java/org/signal/qr/ScannerView21.kt similarity index 100% rename from qr/lib/src/main/java/org/signal/qr/ScannerView21.kt rename to lib/qr/src/main/java/org/signal/qr/ScannerView21.kt diff --git a/qr/lib/src/main/java/org/signal/qr/kitkat/CameraSurfaceView.java b/lib/qr/src/main/java/org/signal/qr/kitkat/CameraSurfaceView.java similarity index 100% rename from qr/lib/src/main/java/org/signal/qr/kitkat/CameraSurfaceView.java rename to lib/qr/src/main/java/org/signal/qr/kitkat/CameraSurfaceView.java diff --git a/qr/lib/src/main/java/org/signal/qr/kitkat/CameraUtils.java b/lib/qr/src/main/java/org/signal/qr/kitkat/CameraUtils.java similarity index 100% rename from qr/lib/src/main/java/org/signal/qr/kitkat/CameraUtils.java rename to lib/qr/src/main/java/org/signal/qr/kitkat/CameraUtils.java diff --git a/qr/lib/src/main/java/org/signal/qr/kitkat/QrCameraView.java b/lib/qr/src/main/java/org/signal/qr/kitkat/QrCameraView.java similarity index 100% rename from qr/lib/src/main/java/org/signal/qr/kitkat/QrCameraView.java rename to lib/qr/src/main/java/org/signal/qr/kitkat/QrCameraView.java diff --git a/qr/lib/src/main/java/org/signal/qr/kitkat/ScanListener.java b/lib/qr/src/main/java/org/signal/qr/kitkat/ScanListener.java similarity index 100% rename from qr/lib/src/main/java/org/signal/qr/kitkat/ScanListener.java rename to lib/qr/src/main/java/org/signal/qr/kitkat/ScanListener.java diff --git a/qr/lib/src/main/java/org/signal/qr/kitkat/ScanningThread.java b/lib/qr/src/main/java/org/signal/qr/kitkat/ScanningThread.java similarity index 100% rename from qr/lib/src/main/java/org/signal/qr/kitkat/ScanningThread.java rename to lib/qr/src/main/java/org/signal/qr/kitkat/ScanningThread.java diff --git a/spinner/lib/build.gradle.kts b/lib/spinner/build.gradle.kts similarity index 88% rename from spinner/lib/build.gradle.kts rename to lib/spinner/build.gradle.kts index c73a65beee..53457d9a1c 100644 --- a/spinner/lib/build.gradle.kts +++ b/lib/spinner/build.gradle.kts @@ -7,7 +7,7 @@ android { } dependencies { - implementation(project(":core-util")) + implementation(project(":core:util")) implementation(libs.jknack.handlebars) implementation(libs.nanohttpd.webserver) diff --git a/spinner/lib/src/main/AndroidManifest.xml b/lib/spinner/src/main/AndroidManifest.xml similarity index 100% rename from spinner/lib/src/main/AndroidManifest.xml rename to lib/spinner/src/main/AndroidManifest.xml diff --git a/spinner/lib/src/main/assets/browse.hbs b/lib/spinner/src/main/assets/browse.hbs similarity index 100% rename from spinner/lib/src/main/assets/browse.hbs rename to lib/spinner/src/main/assets/browse.hbs diff --git a/spinner/lib/src/main/assets/css/main.css b/lib/spinner/src/main/assets/css/main.css similarity index 100% rename from spinner/lib/src/main/assets/css/main.css rename to lib/spinner/src/main/assets/css/main.css diff --git a/spinner/lib/src/main/assets/css/tooltips.css b/lib/spinner/src/main/assets/css/tooltips.css similarity index 100% rename from spinner/lib/src/main/assets/css/tooltips.css rename to lib/spinner/src/main/assets/css/tooltips.css diff --git a/spinner/lib/src/main/assets/error.hbs b/lib/spinner/src/main/assets/error.hbs similarity index 100% rename from spinner/lib/src/main/assets/error.hbs rename to lib/spinner/src/main/assets/error.hbs diff --git a/spinner/lib/src/main/assets/js/main.js b/lib/spinner/src/main/assets/js/main.js similarity index 100% rename from spinner/lib/src/main/assets/js/main.js rename to lib/spinner/src/main/assets/js/main.js diff --git a/spinner/lib/src/main/assets/js/tooltips.js b/lib/spinner/src/main/assets/js/tooltips.js similarity index 100% rename from spinner/lib/src/main/assets/js/tooltips.js rename to lib/spinner/src/main/assets/js/tooltips.js diff --git a/spinner/lib/src/main/assets/logs.hbs b/lib/spinner/src/main/assets/logs.hbs similarity index 100% rename from spinner/lib/src/main/assets/logs.hbs rename to lib/spinner/src/main/assets/logs.hbs diff --git a/spinner/lib/src/main/assets/overview.hbs b/lib/spinner/src/main/assets/overview.hbs similarity index 100% rename from spinner/lib/src/main/assets/overview.hbs rename to lib/spinner/src/main/assets/overview.hbs diff --git a/spinner/lib/src/main/assets/partials/head.hbs b/lib/spinner/src/main/assets/partials/head.hbs similarity index 100% rename from spinner/lib/src/main/assets/partials/head.hbs rename to lib/spinner/src/main/assets/partials/head.hbs diff --git a/spinner/lib/src/main/assets/partials/prefix.hbs b/lib/spinner/src/main/assets/partials/prefix.hbs similarity index 100% rename from spinner/lib/src/main/assets/partials/prefix.hbs rename to lib/spinner/src/main/assets/partials/prefix.hbs diff --git a/spinner/lib/src/main/assets/partials/suffix.hbs b/lib/spinner/src/main/assets/partials/suffix.hbs similarity index 100% rename from spinner/lib/src/main/assets/partials/suffix.hbs rename to lib/spinner/src/main/assets/partials/suffix.hbs diff --git a/spinner/lib/src/main/assets/partials/tooltips.hbs b/lib/spinner/src/main/assets/partials/tooltips.hbs similarity index 100% rename from spinner/lib/src/main/assets/partials/tooltips.hbs rename to lib/spinner/src/main/assets/partials/tooltips.hbs diff --git a/spinner/lib/src/main/assets/plugin.hbs b/lib/spinner/src/main/assets/plugin.hbs similarity index 100% rename from spinner/lib/src/main/assets/plugin.hbs rename to lib/spinner/src/main/assets/plugin.hbs diff --git a/spinner/lib/src/main/assets/query.hbs b/lib/spinner/src/main/assets/query.hbs similarity index 100% rename from spinner/lib/src/main/assets/query.hbs rename to lib/spinner/src/main/assets/query.hbs diff --git a/spinner/lib/src/main/assets/recent.hbs b/lib/spinner/src/main/assets/recent.hbs similarity index 100% rename from spinner/lib/src/main/assets/recent.hbs rename to lib/spinner/src/main/assets/recent.hbs diff --git a/spinner/lib/src/main/java/org/signal/spinner/AssetTemplateLoader.kt b/lib/spinner/src/main/java/org/signal/spinner/AssetTemplateLoader.kt similarity index 100% rename from spinner/lib/src/main/java/org/signal/spinner/AssetTemplateLoader.kt rename to lib/spinner/src/main/java/org/signal/spinner/AssetTemplateLoader.kt diff --git a/spinner/lib/src/main/java/org/signal/spinner/ColumnTransformer.kt b/lib/spinner/src/main/java/org/signal/spinner/ColumnTransformer.kt similarity index 100% rename from spinner/lib/src/main/java/org/signal/spinner/ColumnTransformer.kt rename to lib/spinner/src/main/java/org/signal/spinner/ColumnTransformer.kt diff --git a/spinner/lib/src/main/java/org/signal/spinner/DatabaseUtil.kt b/lib/spinner/src/main/java/org/signal/spinner/DatabaseUtil.kt similarity index 100% rename from spinner/lib/src/main/java/org/signal/spinner/DatabaseUtil.kt rename to lib/spinner/src/main/java/org/signal/spinner/DatabaseUtil.kt diff --git a/spinner/lib/src/main/java/org/signal/spinner/DefaultColumnTransformer.kt b/lib/spinner/src/main/java/org/signal/spinner/DefaultColumnTransformer.kt similarity index 100% rename from spinner/lib/src/main/java/org/signal/spinner/DefaultColumnTransformer.kt rename to lib/spinner/src/main/java/org/signal/spinner/DefaultColumnTransformer.kt diff --git a/spinner/lib/src/main/java/org/signal/spinner/Plugin.kt b/lib/spinner/src/main/java/org/signal/spinner/Plugin.kt similarity index 100% rename from spinner/lib/src/main/java/org/signal/spinner/Plugin.kt rename to lib/spinner/src/main/java/org/signal/spinner/Plugin.kt diff --git a/spinner/lib/src/main/java/org/signal/spinner/PluginResult.kt b/lib/spinner/src/main/java/org/signal/spinner/PluginResult.kt similarity index 100% rename from spinner/lib/src/main/java/org/signal/spinner/PluginResult.kt rename to lib/spinner/src/main/java/org/signal/spinner/PluginResult.kt diff --git a/spinner/lib/src/main/java/org/signal/spinner/Spinner.kt b/lib/spinner/src/main/java/org/signal/spinner/Spinner.kt similarity index 100% rename from spinner/lib/src/main/java/org/signal/spinner/Spinner.kt rename to lib/spinner/src/main/java/org/signal/spinner/Spinner.kt diff --git a/spinner/lib/src/main/java/org/signal/spinner/SpinnerLogItem.kt b/lib/spinner/src/main/java/org/signal/spinner/SpinnerLogItem.kt similarity index 100% rename from spinner/lib/src/main/java/org/signal/spinner/SpinnerLogItem.kt rename to lib/spinner/src/main/java/org/signal/spinner/SpinnerLogItem.kt diff --git a/spinner/lib/src/main/java/org/signal/spinner/SpinnerLogWebSocket.kt b/lib/spinner/src/main/java/org/signal/spinner/SpinnerLogWebSocket.kt similarity index 100% rename from spinner/lib/src/main/java/org/signal/spinner/SpinnerLogWebSocket.kt rename to lib/spinner/src/main/java/org/signal/spinner/SpinnerLogWebSocket.kt diff --git a/spinner/lib/src/main/java/org/signal/spinner/SpinnerLogger.kt b/lib/spinner/src/main/java/org/signal/spinner/SpinnerLogger.kt similarity index 100% rename from spinner/lib/src/main/java/org/signal/spinner/SpinnerLogger.kt rename to lib/spinner/src/main/java/org/signal/spinner/SpinnerLogger.kt diff --git a/spinner/lib/src/main/java/org/signal/spinner/SpinnerServer.kt b/lib/spinner/src/main/java/org/signal/spinner/SpinnerServer.kt similarity index 100% rename from spinner/lib/src/main/java/org/signal/spinner/SpinnerServer.kt rename to lib/spinner/src/main/java/org/signal/spinner/SpinnerServer.kt diff --git a/sticky-header-grid/README.md b/lib/sticky-header-grid/README.md similarity index 100% rename from sticky-header-grid/README.md rename to lib/sticky-header-grid/README.md diff --git a/sticky-header-grid/build.gradle.kts b/lib/sticky-header-grid/build.gradle.kts similarity index 100% rename from sticky-header-grid/build.gradle.kts rename to lib/sticky-header-grid/build.gradle.kts diff --git a/sticky-header-grid/src/main/AndroidManifest.xml b/lib/sticky-header-grid/src/main/AndroidManifest.xml similarity index 100% rename from sticky-header-grid/src/main/AndroidManifest.xml rename to lib/sticky-header-grid/src/main/AndroidManifest.xml diff --git a/sticky-header-grid/src/main/java/com/codewaves/stickyheadergrid/StickyHeaderGridAdapter.java b/lib/sticky-header-grid/src/main/java/com/codewaves/stickyheadergrid/StickyHeaderGridAdapter.java similarity index 100% rename from sticky-header-grid/src/main/java/com/codewaves/stickyheadergrid/StickyHeaderGridAdapter.java rename to lib/sticky-header-grid/src/main/java/com/codewaves/stickyheadergrid/StickyHeaderGridAdapter.java diff --git a/sticky-header-grid/src/main/java/com/codewaves/stickyheadergrid/StickyHeaderGridLayoutManager.java b/lib/sticky-header-grid/src/main/java/com/codewaves/stickyheadergrid/StickyHeaderGridLayoutManager.java similarity index 100% rename from sticky-header-grid/src/main/java/com/codewaves/stickyheadergrid/StickyHeaderGridLayoutManager.java rename to lib/sticky-header-grid/src/main/java/com/codewaves/stickyheadergrid/StickyHeaderGridLayoutManager.java diff --git a/video/lib/build.gradle.kts b/lib/video/build.gradle.kts similarity index 87% rename from video/lib/build.gradle.kts rename to lib/video/build.gradle.kts index 02c75964af..3b2e55d7f8 100644 --- a/video/lib/build.gradle.kts +++ b/lib/video/build.gradle.kts @@ -7,7 +7,7 @@ android { } dependencies { - implementation(project(":core-util")) + implementation(project(":core:util")) implementation(libs.libsignal.android) implementation(libs.google.guava.android) diff --git a/video/lib/src/main/AndroidManifest.xml b/lib/video/src/main/AndroidManifest.xml similarity index 100% rename from video/lib/src/main/AndroidManifest.xml rename to lib/video/src/main/AndroidManifest.xml diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/StreamingTranscoder.java b/lib/video/src/main/java/org/thoughtcrime/securesms/video/StreamingTranscoder.java similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/StreamingTranscoder.java rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/StreamingTranscoder.java diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/TranscoderOptions.kt b/lib/video/src/main/java/org/thoughtcrime/securesms/video/TranscoderOptions.kt similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/TranscoderOptions.kt rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/TranscoderOptions.kt diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/TranscodingQuality.kt b/lib/video/src/main/java/org/thoughtcrime/securesms/video/TranscodingQuality.kt similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/TranscodingQuality.kt rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/TranscodingQuality.kt diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/exceptions/VideoPostProcessingException.kt b/lib/video/src/main/java/org/thoughtcrime/securesms/video/exceptions/VideoPostProcessingException.kt similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/exceptions/VideoPostProcessingException.kt rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/exceptions/VideoPostProcessingException.kt diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/exceptions/VideoSizeException.kt b/lib/video/src/main/java/org/thoughtcrime/securesms/video/exceptions/VideoSizeException.kt similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/exceptions/VideoSizeException.kt rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/exceptions/VideoSizeException.kt diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/exceptions/VideoSourceException.kt b/lib/video/src/main/java/org/thoughtcrime/securesms/video/exceptions/VideoSourceException.kt similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/exceptions/VideoSourceException.kt rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/exceptions/VideoSourceException.kt diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/interfaces/MediaInput.kt b/lib/video/src/main/java/org/thoughtcrime/securesms/video/interfaces/MediaInput.kt similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/interfaces/MediaInput.kt rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/interfaces/MediaInput.kt diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/interfaces/Muxer.java b/lib/video/src/main/java/org/thoughtcrime/securesms/video/interfaces/Muxer.java similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/interfaces/Muxer.java rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/interfaces/Muxer.java diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/interfaces/TranscoderCancelationSignal.kt b/lib/video/src/main/java/org/thoughtcrime/securesms/video/interfaces/TranscoderCancelationSignal.kt similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/interfaces/TranscoderCancelationSignal.kt rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/interfaces/TranscoderCancelationSignal.kt diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/postprocessing/Mp4FaststartPostProcessor.kt b/lib/video/src/main/java/org/thoughtcrime/securesms/video/postprocessing/Mp4FaststartPostProcessor.kt similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/postprocessing/Mp4FaststartPostProcessor.kt rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/postprocessing/Mp4FaststartPostProcessor.kt diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AndroidMuxer.java b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AndroidMuxer.java similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AndroidMuxer.java rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AndroidMuxer.java diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AudioTrackConverter.java b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AudioTrackConverter.java similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AudioTrackConverter.java rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/AudioTrackConverter.java diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/InputSurface.java b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/InputSurface.java similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/InputSurface.java rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/InputSurface.java diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/MediaConverter.java b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/MediaConverter.java similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/MediaConverter.java rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/MediaConverter.java diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/MediaConverterState.kt b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/MediaConverterState.kt similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/MediaConverterState.kt rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/MediaConverterState.kt diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/OutputSurface.java b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/OutputSurface.java similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/OutputSurface.java rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/OutputSurface.java diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/TextureRender.java b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/TextureRender.java similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/TextureRender.java rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/TextureRender.java diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/TranscodingException.java b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/TranscodingException.java similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/TranscodingException.java rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/TranscodingException.java diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoThumbnailsExtractor.java b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoThumbnailsExtractor.java similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoThumbnailsExtractor.java rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoThumbnailsExtractor.java diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoTrackConverter.java b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoTrackConverter.java similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoTrackConverter.java rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/VideoTrackConverter.java diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/exceptions/EncodingException.kt b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/exceptions/EncodingException.kt similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/exceptions/EncodingException.kt rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/exceptions/EncodingException.kt diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/mediadatasource/InputStreamMediaDataSource.kt b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/mediadatasource/InputStreamMediaDataSource.kt similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/mediadatasource/InputStreamMediaDataSource.kt rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/mediadatasource/InputStreamMediaDataSource.kt diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/mediadatasource/MediaDataSourceMediaInput.kt b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/mediadatasource/MediaDataSourceMediaInput.kt similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/mediadatasource/MediaDataSourceMediaInput.kt rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/mediadatasource/MediaDataSourceMediaInput.kt diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/AacTrack.java b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/AacTrack.java similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/AacTrack.java rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/AacTrack.java diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/AvcTrack.java b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/AvcTrack.java similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/AvcTrack.java rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/AvcTrack.java diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/H264Utils.java b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/H264Utils.java similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/H264Utils.java rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/H264Utils.java diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/HevcTrack.java b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/HevcTrack.java similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/HevcTrack.java rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/HevcTrack.java diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/Mp4Writer.java b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/Mp4Writer.java similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/Mp4Writer.java rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/Mp4Writer.java diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/MuxingException.java b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/MuxingException.java similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/MuxingException.java rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/MuxingException.java diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/StreamingMuxer.java b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/StreamingMuxer.java similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/StreamingMuxer.java rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/StreamingMuxer.java diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/Utils.java b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/Utils.java similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/Utils.java rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/muxer/Utils.java diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/DeviceCapabilities.kt b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/DeviceCapabilities.kt similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/DeviceCapabilities.kt rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/DeviceCapabilities.kt diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/Extensions.kt b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/Extensions.kt similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/Extensions.kt rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/Extensions.kt diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/MediaCodecCompat.kt b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/MediaCodecCompat.kt similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/MediaCodecCompat.kt rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/MediaCodecCompat.kt diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/Preconditions.kt b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/Preconditions.kt similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/Preconditions.kt rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/Preconditions.kt diff --git a/video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/VideoConstants.kt b/lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/VideoConstants.kt similarity index 100% rename from video/lib/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/VideoConstants.kt rename to lib/video/src/main/java/org/thoughtcrime/securesms/video/videoconverter/utils/VideoConstants.kt diff --git a/microbenchmark/build.gradle.kts b/microbenchmark/build.gradle.kts index 06b0089a9c..f67c567b10 100644 --- a/microbenchmark/build.gradle.kts +++ b/microbenchmark/build.gradle.kts @@ -44,8 +44,8 @@ dependencies { coreLibraryDesugaring(libs.android.tools.desugar) lintChecks(project(":lintchecks")) - implementation(project(":core-util")) - implementation(project(":core-models")) + implementation(project(":core:util")) + implementation(project(":core:models")) // Base dependencies androidTestImplementation(testLibs.junit.junit) @@ -53,6 +53,6 @@ dependencies { androidTestImplementation(benchmarkLibs.androidx.benchmark.micro) // Dependencies of modules being tested - androidTestImplementation(project(":libsignal-service")) + androidTestImplementation(project(":lib:libsignal-service")) androidTestImplementation(libs.libsignal.android) } diff --git a/settings.gradle.kts b/settings.gradle.kts index 9886ad6f8d..f0bcefeab7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -61,69 +61,52 @@ if (libsignalClientPath is String) { } } +// Main app include(":app") -include(":libsignal-service") + +// Core modules +include(":core:util") +include(":core:util-jvm") +include(":core:models") +include(":core:ui") + +// Lib modules +include(":lib:libsignal-service") +include(":lib:glide-config") +include(":lib:photoview") +include(":lib:sticky-header-grid") +include(":lib:billing") +include(":lib:paging") +include(":lib:device-transfer") +include(":lib:donations") +include(":lib:contacts") +include(":lib:qr") +include(":lib:spinner") +include(":lib:video") +include(":lib:image-editor") +include(":lib:debuglogs-viewer") + +// Feature modules +include(":feature:registration") + +// Demo apps +include(":demo:paging") +include(":demo:device-transfer") +include(":demo:donations") +include(":demo:contacts") +include(":demo:qr") +include(":demo:spinner") +include(":demo:video") +include(":demo:image-editor") +include(":demo:debuglogs-viewer") +include(":demo:registration") + +// Testing/Lint modules include(":lintchecks") -include(":paging") -include(":paging-app") -include(":core-util") -include(":core-util-jvm") -include(":core-models") -include(":glide-config") -include(":device-transfer") -include(":device-transfer-app") -include(":image-editor") -include(":image-editor-app") -include(":donations") -include(":donations-app") -include(":debuglogs-viewer") -include(":debuglogs-viewer-app") -include(":spinner") -include(":spinner-app") -include(":contacts") -include(":contacts-app") -include(":qr") -include(":qr-app") -include(":sticky-header-grid") -include(":photoview") -include(":core-ui") include(":benchmark") include(":microbenchmark") -include(":video") -include(":video-app") -include(":billing") -include(":registration") -include(":registration-app") +// App project name project(":app").name = "Signal-Android" -project(":paging").projectDir = file("paging/lib") -project(":paging-app").projectDir = file("paging/app") - -project(":device-transfer").projectDir = file("device-transfer/lib") -project(":device-transfer-app").projectDir = file("device-transfer/app") - -project(":image-editor").projectDir = file("image-editor/lib") -project(":image-editor-app").projectDir = file("image-editor/app") - -project(":donations").projectDir = file("donations/lib") -project(":donations-app").projectDir = file("donations/app") - -project(":debuglogs-viewer").projectDir = file("debuglogs-viewer/lib") -project(":debuglogs-viewer-app").projectDir = file("debuglogs-viewer/app") - -project(":spinner").projectDir = file("spinner/lib") -project(":spinner-app").projectDir = file("spinner/app") - -project(":contacts").projectDir = file("contacts/lib") -project(":contacts-app").projectDir = file("contacts/app") - -project(":qr").projectDir = file("qr/lib") -project(":qr-app").projectDir = file("qr/app") - -project(":video").projectDir = file("video/lib") -project(":video-app").projectDir = file("video/app") - -project(":registration").projectDir = file("registration/lib") -project(":registration-app").projectDir = file("registration/app") rootProject.name = "Signal" diff --git a/spinner/README.md b/spinner/README.md deleted file mode 100644 index 998aff7a24..0000000000 --- a/spinner/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Spinner -Spinner is a development tool that lets you inspect and run queries against an app's database(s) in a convenient web interface. - -## Getting Started -Install one of the spinner build variants (e.g. `./gradlew installPlayProdSpinner`) and run the following adb command: - -```bash -adb forward tcp:5000 tcp:5000 -``` - -Then, navigate to `localhost:5000` in your web browser. - -Magic! - -## How does it work? -Spinner is just a [NanoHttpd](https://github.com/NanoHttpd/nanohttpd) server that runs a little webapp in the background. -You initialize Spinner in `Application.onCreate` with a list of databases you wish to let it run queries against. -Then, you can use the `adb forward` command to route the Android device's port to a port on your local machine. - -## What's with the name? -It's a riff on Flipper, a development tool we used to use. It was very useful, but also wildly unstable (at least on Linux).