From 5d3199e31c2d971843ac386bfa0a3652c8b20a9a Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Fri, 9 Jun 2023 18:05:08 +0200 Subject: [PATCH] Move the resolver to the parent package. --- .../{changeserver => }/resolver/HomeserverData.kt | 2 +- .../resolver/HomeserverResolver.kt | 4 ++-- .../resolver/network/DefaultWellknownRequest.kt | 2 +- .../{changeserver => }/resolver/network/WellKnown.kt | 2 +- .../resolver/network/WellKnownBaseConfig.kt | 2 +- .../resolver/network/WellKnownSlidingSyncConfig.kt | 2 +- .../resolver/network/WellknownAPI.kt | 2 +- .../resolver/network/WellknownRequest.kt | 2 +- .../SearchAccountProviderPresenter.kt | 4 ++-- .../SearchAccountProviderState.kt | 2 +- .../SearchAccountProviderStateProvider.kt | 2 +- .../SearchAccountProviderView.kt | 2 +- .../resolver/network/FakeWellknownRequest.kt | 2 +- .../SearchAccountProviderPresenterTest.kt | 12 ++++++------ 14 files changed, 21 insertions(+), 21 deletions(-) rename features/login/impl/src/main/kotlin/io/element/android/features/login/impl/{changeserver => }/resolver/HomeserverData.kt (93%) rename features/login/impl/src/main/kotlin/io/element/android/features/login/impl/{changeserver => }/resolver/HomeserverResolver.kt (96%) rename features/login/impl/src/main/kotlin/io/element/android/features/login/impl/{changeserver => }/resolver/network/DefaultWellknownRequest.kt (94%) rename features/login/impl/src/main/kotlin/io/element/android/features/login/impl/{changeserver => }/resolver/network/WellKnown.kt (95%) rename features/login/impl/src/main/kotlin/io/element/android/features/login/impl/{changeserver => }/resolver/network/WellKnownBaseConfig.kt (92%) rename features/login/impl/src/main/kotlin/io/element/android/features/login/impl/{changeserver => }/resolver/network/WellKnownSlidingSyncConfig.kt (91%) rename features/login/impl/src/main/kotlin/io/element/android/features/login/impl/{changeserver => }/resolver/network/WellknownAPI.kt (90%) rename features/login/impl/src/main/kotlin/io/element/android/features/login/impl/{changeserver => }/resolver/network/WellknownRequest.kt (91%) rename features/login/impl/src/test/kotlin/io/element/android/features/login/impl/{changeserver => }/resolver/network/FakeWellknownRequest.kt (92%) diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/HomeserverData.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverData.kt similarity index 93% rename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/HomeserverData.kt rename to features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverData.kt index 04bcd0099d..c1f0158605 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/HomeserverData.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverData.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.login.impl.changeserver.resolver +package io.element.android.features.login.impl.resolver data class HomeserverData constructor( // The computed homeserver url, for which a wellknown file has been retrieved, or just a valid Url diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/HomeserverResolver.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverResolver.kt similarity index 96% rename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/HomeserverResolver.kt rename to features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverResolver.kt index 9409f285e5..8a1a72670c 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/HomeserverResolver.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/HomeserverResolver.kt @@ -14,9 +14,9 @@ * limitations under the License. */ -package io.element.android.features.login.impl.changeserver.resolver +package io.element.android.features.login.impl.resolver -import io.element.android.features.login.impl.changeserver.resolver.network.WellknownRequest +import io.element.android.features.login.impl.resolver.network.WellknownRequest import io.element.android.libraries.architecture.Async import io.element.android.libraries.core.bool.orFalse import io.element.android.libraries.core.coroutine.CoroutineDispatchers diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/DefaultWellknownRequest.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/DefaultWellknownRequest.kt similarity index 94% rename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/DefaultWellknownRequest.kt rename to features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/DefaultWellknownRequest.kt index 95960971c3..7de6d26f10 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/DefaultWellknownRequest.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/DefaultWellknownRequest.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.element.android.features.login.impl.changeserver.resolver.network +package io.element.android.features.login.impl.resolver.network import com.squareup.anvil.annotations.ContributesBinding import io.element.android.libraries.di.AppScope diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/WellKnown.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellKnown.kt similarity index 95% rename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/WellKnown.kt rename to features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellKnown.kt index af5a4f17f3..63b6e7d189 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/WellKnown.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellKnown.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.login.impl.changeserver.resolver.network +package io.element.android.features.login.impl.resolver.network import io.element.android.libraries.core.bool.orFalse import kotlinx.serialization.SerialName diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/WellKnownBaseConfig.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellKnownBaseConfig.kt similarity index 92% rename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/WellKnownBaseConfig.kt rename to features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellKnownBaseConfig.kt index 3bac743d64..87b86736fa 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/WellKnownBaseConfig.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellKnownBaseConfig.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.login.impl.changeserver.resolver.network +package io.element.android.features.login.impl.resolver.network import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/WellKnownSlidingSyncConfig.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellKnownSlidingSyncConfig.kt similarity index 91% rename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/WellKnownSlidingSyncConfig.kt rename to features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellKnownSlidingSyncConfig.kt index 863b524f84..98c712d9ac 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/WellKnownSlidingSyncConfig.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellKnownSlidingSyncConfig.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.login.impl.changeserver.resolver.network +package io.element.android.features.login.impl.resolver.network import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/WellknownAPI.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellknownAPI.kt similarity index 90% rename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/WellknownAPI.kt rename to features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellknownAPI.kt index f4d4ba7c67..04a0dfb803 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/WellknownAPI.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellknownAPI.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.login.impl.changeserver.resolver.network +package io.element.android.features.login.impl.resolver.network import retrofit2.http.GET diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/WellknownRequest.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellknownRequest.kt similarity index 91% rename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/WellknownRequest.kt rename to features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellknownRequest.kt index 54c393e522..570b621b83 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/WellknownRequest.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/resolver/network/WellknownRequest.kt @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.element.android.features.login.impl.changeserver.resolver.network +package io.element.android.features.login.impl.resolver.network interface WellknownRequest { /** diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenter.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenter.kt index 1ff510ea94..f95c027620 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenter.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenter.kt @@ -24,8 +24,8 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue import io.element.android.features.login.impl.changeserver.ChangeServerPresenter -import io.element.android.features.login.impl.changeserver.resolver.HomeserverData -import io.element.android.features.login.impl.changeserver.resolver.HomeserverResolver +import io.element.android.features.login.impl.resolver.HomeserverData +import io.element.android.features.login.impl.resolver.HomeserverResolver import io.element.android.libraries.architecture.Async import io.element.android.libraries.architecture.Presenter import javax.inject.Inject diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderState.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderState.kt index c89dc53aff..15859afde1 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderState.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderState.kt @@ -17,7 +17,7 @@ package io.element.android.features.login.impl.screens.searchaccountprovider import io.element.android.features.login.impl.changeserver.ChangeServerState -import io.element.android.features.login.impl.changeserver.resolver.HomeserverData +import io.element.android.features.login.impl.resolver.HomeserverData import io.element.android.libraries.architecture.Async // Do not use default value, so no member get forgotten in the presenters. diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderStateProvider.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderStateProvider.kt index 9c15a63802..b6ffac8bd1 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderStateProvider.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderStateProvider.kt @@ -18,7 +18,7 @@ package io.element.android.features.login.impl.screens.searchaccountprovider import androidx.compose.ui.tooling.preview.PreviewParameterProvider import io.element.android.features.login.impl.changeserver.aChangeServerState -import io.element.android.features.login.impl.changeserver.resolver.HomeserverData +import io.element.android.features.login.impl.resolver.HomeserverData import io.element.android.libraries.architecture.Async open class SearchAccountProviderStateProvider : PreviewParameterProvider { diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt index f5b178ce27..605992d930 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderView.kt @@ -54,7 +54,7 @@ import io.element.android.features.login.impl.accountprovider.AccountProvider import io.element.android.features.login.impl.accountprovider.AccountProviderView import io.element.android.features.login.impl.changeserver.ChangeServerEvents import io.element.android.features.login.impl.changeserver.ChangeServerView -import io.element.android.features.login.impl.changeserver.resolver.HomeserverData +import io.element.android.features.login.impl.resolver.HomeserverData import io.element.android.libraries.architecture.Async import io.element.android.libraries.designsystem.atomic.molecules.IconTitleSubtitleMolecule import io.element.android.libraries.designsystem.components.button.BackButton diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/FakeWellknownRequest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/resolver/network/FakeWellknownRequest.kt similarity index 92% rename from features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/FakeWellknownRequest.kt rename to features/login/impl/src/test/kotlin/io/element/android/features/login/impl/resolver/network/FakeWellknownRequest.kt index 4dea24b1d7..58c2bf82a3 100644 --- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/changeserver/resolver/network/FakeWellknownRequest.kt +++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/resolver/network/FakeWellknownRequest.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package io.element.android.features.login.impl.changeserver.resolver.network +package io.element.android.features.login.impl.resolver.network class FakeWellknownRequest : WellknownRequest { private var resultMap: Map = emptyMap() diff --git a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenterTest.kt b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenterTest.kt index 1337e0f228..9163f247f5 100644 --- a/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenterTest.kt +++ b/features/login/impl/src/test/kotlin/io/element/android/features/login/impl/screens/searchaccountprovider/SearchAccountProviderPresenterTest.kt @@ -20,13 +20,13 @@ import app.cash.molecule.RecompositionClock import app.cash.molecule.moleculeFlow import app.cash.turbine.test import com.google.common.truth.Truth.assertThat -import io.element.android.features.login.impl.changeserver.ChangeServerPresenter -import io.element.android.features.login.impl.changeserver.resolver.network.WellKnown -import io.element.android.features.login.impl.changeserver.resolver.network.WellKnownBaseConfig -import io.element.android.features.login.impl.changeserver.resolver.network.WellKnownSlidingSyncConfig -import io.element.android.features.login.impl.changeserver.resolver.HomeserverResolver import io.element.android.features.login.impl.accountprovider.AccountProviderDataSource -import io.element.android.features.login.impl.changeserver.resolver.network.FakeWellknownRequest +import io.element.android.features.login.impl.changeserver.ChangeServerPresenter +import io.element.android.features.login.impl.resolver.HomeserverResolver +import io.element.android.features.login.impl.resolver.network.FakeWellknownRequest +import io.element.android.features.login.impl.resolver.network.WellKnown +import io.element.android.features.login.impl.resolver.network.WellKnownBaseConfig +import io.element.android.features.login.impl.resolver.network.WellKnownSlidingSyncConfig import io.element.android.libraries.architecture.Async import io.element.android.libraries.matrix.test.A_HOMESERVER_URL import io.element.android.libraries.matrix.test.auth.FakeAuthenticationService