Skip to content

Commit 85109a2

Browse files
authored
[PM-19849] Move PushApi and PushTokenRequest to network module (#4979)
1 parent 5017e93 commit 85109a2

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/PushService.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.x8bit.bitwarden.data.platform.datasource.network.service
22

3-
import com.x8bit.bitwarden.data.platform.datasource.network.model.PushTokenRequest
3+
import com.bitwarden.network.model.PushTokenRequest
44

55
/**
66
* Provides an API for push tokens.

app/src/main/java/com/x8bit/bitwarden/data/platform/datasource/network/service/PushServiceImpl.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.x8bit.bitwarden.data.platform.datasource.network.service
22

3+
import com.bitwarden.network.api.PushApi
4+
import com.bitwarden.network.model.PushTokenRequest
35
import com.bitwarden.network.util.toResult
4-
import com.x8bit.bitwarden.data.platform.datasource.network.api.PushApi
5-
import com.x8bit.bitwarden.data.platform.datasource.network.model.PushTokenRequest
66

77
class PushServiceImpl(
88
private val pushApi: PushApi,

app/src/main/java/com/x8bit/bitwarden/data/platform/manager/PushManagerImpl.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package com.x8bit.bitwarden.data.platform.manager
22

33
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
44
import com.bitwarden.core.data.util.decodeFromStringOrNull
5+
import com.bitwarden.network.model.PushTokenRequest
56
import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
67
import com.x8bit.bitwarden.data.auth.repository.util.activeUserIdChangesFlow
78
import com.x8bit.bitwarden.data.platform.datasource.disk.PushDiskSource
8-
import com.x8bit.bitwarden.data.platform.datasource.network.model.PushTokenRequest
99
import com.x8bit.bitwarden.data.platform.datasource.network.service.PushService
1010
import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager
1111
import com.x8bit.bitwarden.data.platform.manager.model.BitwardenNotification

app/src/test/java/com/x8bit/bitwarden/data/platform/datasource/network/service/PushServiceTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.x8bit.bitwarden.data.platform.datasource.network.service
22

3+
import com.bitwarden.network.api.PushApi
34
import com.bitwarden.network.base.BaseServiceTest
4-
import com.x8bit.bitwarden.data.platform.datasource.network.api.PushApi
5-
import com.x8bit.bitwarden.data.platform.datasource.network.model.PushTokenRequest
5+
import com.bitwarden.network.model.PushTokenRequest
66
import kotlinx.coroutines.test.runTest
77
import okhttp3.mockwebserver.MockResponse
88
import org.junit.jupiter.api.Assertions.assertEquals

app/src/test/java/com/x8bit/bitwarden/data/platform/manager/PushManagerTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import app.cash.turbine.test
44
import com.bitwarden.core.data.util.asFailure
55
import com.bitwarden.core.data.util.asSuccess
66
import com.bitwarden.core.di.CoreModule
7+
import com.bitwarden.network.model.PushTokenRequest
78
import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
89
import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson
910
import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson
@@ -13,7 +14,6 @@ import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager
1314
import com.x8bit.bitwarden.data.platform.base.FakeSharedPreferences
1415
import com.x8bit.bitwarden.data.platform.datasource.disk.PushDiskSource
1516
import com.x8bit.bitwarden.data.platform.datasource.disk.PushDiskSourceImpl
16-
import com.x8bit.bitwarden.data.platform.datasource.network.model.PushTokenRequest
1717
import com.x8bit.bitwarden.data.platform.datasource.network.service.PushService
1818
import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager
1919
import com.x8bit.bitwarden.data.platform.manager.model.NotificationLogoutData
+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package com.x8bit.bitwarden.data.platform.datasource.network.api
1+
package com.bitwarden.network.api
22

33
import com.bitwarden.network.model.NetworkResult
4-
import com.x8bit.bitwarden.data.platform.datasource.network.model.PushTokenRequest
4+
import com.bitwarden.network.model.PushTokenRequest
55
import retrofit2.http.Body
66
import retrofit2.http.PUT
77
import retrofit2.http.Path
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.x8bit.bitwarden.data.platform.datasource.network.model
1+
package com.bitwarden.network.model
22

33
import kotlinx.serialization.SerialName
44
import kotlinx.serialization.Serializable

0 commit comments

Comments
 (0)