diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/PushService.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/PushService.kt index 1291b5c330..cecb059d04 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/PushService.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/PushService.kt @@ -1,6 +1,6 @@ package com.x8bit.bitwarden.data.platform.datasource.network.service -import com.x8bit.bitwarden.data.platform.datasource.network.model.PushTokenRequest +import com.bitwarden.network.model.PushTokenRequest /** * Provides an API for push tokens. diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/PushServiceImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/PushServiceImpl.kt index 582363cafe..5bff915961 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/PushServiceImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/PushServiceImpl.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.data.platform.datasource.network.service +import com.bitwarden.network.api.PushApi +import com.bitwarden.network.model.PushTokenRequest import com.bitwarden.network.util.toResult -import com.x8bit.bitwarden.data.platform.datasource.network.api.PushApi -import com.x8bit.bitwarden.data.platform.datasource.network.model.PushTokenRequest class PushServiceImpl( private val pushApi: PushApi, diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PushManagerImpl.kt b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PushManagerImpl.kt index 820a243603..906690d1fb 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PushManagerImpl.kt +++ b/app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PushManagerImpl.kt @@ -2,10 +2,10 @@ package com.x8bit.bitwarden.data.platform.manager import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow import com.bitwarden.core.data.util.decodeFromStringOrNull +import com.bitwarden.network.model.PushTokenRequest import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.repository.util.activeUserIdChangesFlow import com.x8bit.bitwarden.data.platform.datasource.disk.PushDiskSource -import com.x8bit.bitwarden.data.platform.datasource.network.model.PushTokenRequest import com.x8bit.bitwarden.data.platform.datasource.network.service.PushService import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.BitwardenNotification diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/PushServiceTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/PushServiceTest.kt index 86d9029b55..055bba6be8 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/PushServiceTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/PushServiceTest.kt @@ -1,8 +1,8 @@ package com.x8bit.bitwarden.data.platform.datasource.network.service +import com.bitwarden.network.api.PushApi import com.bitwarden.network.base.BaseServiceTest -import com.x8bit.bitwarden.data.platform.datasource.network.api.PushApi -import com.x8bit.bitwarden.data.platform.datasource.network.model.PushTokenRequest +import com.bitwarden.network.model.PushTokenRequest import kotlinx.coroutines.test.runTest import okhttp3.mockwebserver.MockResponse import org.junit.jupiter.api.Assertions.assertEquals diff --git a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/PushManagerTest.kt b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/PushManagerTest.kt index 6754ea0eea..619de73ad7 100644 --- a/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/PushManagerTest.kt +++ b/app/src/test/java/com/x8bit/bitwarden/data/platform/manager/PushManagerTest.kt @@ -4,6 +4,7 @@ import app.cash.turbine.test import com.bitwarden.core.data.util.asFailure import com.bitwarden.core.data.util.asSuccess import com.bitwarden.core.di.CoreModule +import com.bitwarden.network.model.PushTokenRequest import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson @@ -13,7 +14,6 @@ import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager import com.x8bit.bitwarden.data.platform.base.FakeSharedPreferences import com.x8bit.bitwarden.data.platform.datasource.disk.PushDiskSource import com.x8bit.bitwarden.data.platform.datasource.disk.PushDiskSourceImpl -import com.x8bit.bitwarden.data.platform.datasource.network.model.PushTokenRequest import com.x8bit.bitwarden.data.platform.datasource.network.service.PushService import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager import com.x8bit.bitwarden.data.platform.manager.model.NotificationLogoutData diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/api/PushApi.kt b/network/src/main/kotlin/com/bitwarden/network/api/PushApi.kt similarity index 71% rename from app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/api/PushApi.kt rename to network/src/main/kotlin/com/bitwarden/network/api/PushApi.kt index 2aa83b610b..12ae6b57b3 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/api/PushApi.kt +++ b/network/src/main/kotlin/com/bitwarden/network/api/PushApi.kt @@ -1,7 +1,7 @@ -package com.x8bit.bitwarden.data.platform.datasource.network.api +package com.bitwarden.network.api import com.bitwarden.network.model.NetworkResult -import com.x8bit.bitwarden.data.platform.datasource.network.model.PushTokenRequest +import com.bitwarden.network.model.PushTokenRequest import retrofit2.http.Body import retrofit2.http.PUT import retrofit2.http.Path diff --git a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/model/PushTokenRequest.kt b/network/src/main/kotlin/com/bitwarden/network/model/PushTokenRequest.kt similarity index 79% rename from app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/model/PushTokenRequest.kt rename to network/src/main/kotlin/com/bitwarden/network/model/PushTokenRequest.kt index 05ff3808d1..8a3d4e53e2 100644 --- a/app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/model/PushTokenRequest.kt +++ b/network/src/main/kotlin/com/bitwarden/network/model/PushTokenRequest.kt @@ -1,4 +1,4 @@ -package com.x8bit.bitwarden.data.platform.datasource.network.model +package com.bitwarden.network.model import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable