File tree 7 files changed +10
-10
lines changed
main/java/com/x8bit/bitwarden/data/platform
datasource/network/service
test/java/com/x8bit/bitwarden/data/platform
datasource/network/service
network/src/main/kotlin/com/bitwarden/network
7 files changed +10
-10
lines changed Original file line number Diff line number Diff line change 1
1
package com.x8bit.bitwarden.data.platform.datasource.network.service
2
2
3
- import com.x8bit. bitwarden.data.platform.datasource .network.model.PushTokenRequest
3
+ import com.bitwarden.network.model.PushTokenRequest
4
4
5
5
/* *
6
6
* Provides an API for push tokens.
Original file line number Diff line number Diff line change 1
1
package com.x8bit.bitwarden.data.platform.datasource.network.service
2
2
3
+ import com.bitwarden.network.api.PushApi
4
+ import com.bitwarden.network.model.PushTokenRequest
3
5
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
6
6
7
7
class PushServiceImpl (
8
8
private val pushApi : PushApi ,
Original file line number Diff line number Diff line change @@ -2,10 +2,10 @@ package com.x8bit.bitwarden.data.platform.manager
2
2
3
3
import com.bitwarden.core.data.repository.util.bufferedMutableSharedFlow
4
4
import com.bitwarden.core.data.util.decodeFromStringOrNull
5
+ import com.bitwarden.network.model.PushTokenRequest
5
6
import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
6
7
import com.x8bit.bitwarden.data.auth.repository.util.activeUserIdChangesFlow
7
8
import com.x8bit.bitwarden.data.platform.datasource.disk.PushDiskSource
8
- import com.x8bit.bitwarden.data.platform.datasource.network.model.PushTokenRequest
9
9
import com.x8bit.bitwarden.data.platform.datasource.network.service.PushService
10
10
import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager
11
11
import com.x8bit.bitwarden.data.platform.manager.model.BitwardenNotification
Original file line number Diff line number Diff line change 1
1
package com.x8bit.bitwarden.data.platform.datasource.network.service
2
2
3
+ import com.bitwarden.network.api.PushApi
3
4
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
6
6
import kotlinx.coroutines.test.runTest
7
7
import okhttp3.mockwebserver.MockResponse
8
8
import org.junit.jupiter.api.Assertions.assertEquals
Original file line number Diff line number Diff line change @@ -4,6 +4,7 @@ import app.cash.turbine.test
4
4
import com.bitwarden.core.data.util.asFailure
5
5
import com.bitwarden.core.data.util.asSuccess
6
6
import com.bitwarden.core.di.CoreModule
7
+ import com.bitwarden.network.model.PushTokenRequest
7
8
import com.x8bit.bitwarden.data.auth.datasource.disk.AuthDiskSource
8
9
import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountJson
9
10
import com.x8bit.bitwarden.data.auth.datasource.disk.model.AccountTokensJson
@@ -13,7 +14,6 @@ import com.x8bit.bitwarden.data.platform.base.FakeDispatcherManager
13
14
import com.x8bit.bitwarden.data.platform.base.FakeSharedPreferences
14
15
import com.x8bit.bitwarden.data.platform.datasource.disk.PushDiskSource
15
16
import com.x8bit.bitwarden.data.platform.datasource.disk.PushDiskSourceImpl
16
- import com.x8bit.bitwarden.data.platform.datasource.network.model.PushTokenRequest
17
17
import com.x8bit.bitwarden.data.platform.datasource.network.service.PushService
18
18
import com.x8bit.bitwarden.data.platform.manager.dispatcher.DispatcherManager
19
19
import com.x8bit.bitwarden.data.platform.manager.model.NotificationLogoutData
Original file line number Diff line number Diff line change 1
- package com.x8bit. bitwarden.data.platform.datasource .network.api
1
+ package com.bitwarden.network.api
2
2
3
3
import com.bitwarden.network.model.NetworkResult
4
- import com.x8bit. bitwarden.data.platform.datasource .network.model.PushTokenRequest
4
+ import com.bitwarden.network.model.PushTokenRequest
5
5
import retrofit2.http.Body
6
6
import retrofit2.http.PUT
7
7
import retrofit2.http.Path
Original file line number Diff line number Diff line change 1
- package com.x8bit. bitwarden.data.platform.datasource .network.model
1
+ package com.bitwarden.network.model
2
2
3
3
import kotlinx.serialization.SerialName
4
4
import kotlinx.serialization.Serializable
You can’t perform that action at this time.
0 commit comments