diff --git a/app/src/main/java/com/tangem/tap/network/auth/DefaultAppVersionProvider.kt b/app/src/main/java/com/tangem/tap/network/auth/DefaultAppVersionProvider.kt index 7987d7ce6e..a5093725e5 100644 --- a/app/src/main/java/com/tangem/tap/network/auth/DefaultAppVersionProvider.kt +++ b/app/src/main/java/com/tangem/tap/network/auth/DefaultAppVersionProvider.kt @@ -1,11 +1,11 @@ package com.tangem.tap.network.auth -import com.tangem.lib.auth.AppVersionProvider +import com.tangem.utils.version.AppVersionProvider import com.tangem.wallet.BuildConfig internal class DefaultAppVersionProvider : AppVersionProvider { - override fun getAppVersion(): String { - return BuildConfig.VERSION_NAME - } + override val versionName: String = BuildConfig.VERSION_NAME + + override val versionCode: Int = BuildConfig.VERSION_CODE } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt b/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt index 56548f515c..102598b998 100644 --- a/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt +++ b/app/src/main/java/com/tangem/tap/network/auth/di/AuthModule.kt @@ -3,7 +3,6 @@ package com.tangem.tap.network.auth.di import com.tangem.datasource.api.common.AuthProvider import com.tangem.datasource.config.ConfigManager import com.tangem.datasource.local.userwallet.UserWalletsStore -import com.tangem.lib.auth.AppVersionProvider import com.tangem.lib.auth.ExpressAuthProvider import com.tangem.lib.auth.StakeKitAuthProvider import com.tangem.tap.network.auth.DefaultAppVersionProvider @@ -11,6 +10,7 @@ import com.tangem.tap.network.auth.DefaultAuthProvider import com.tangem.tap.network.auth.DefaultExpressAuthProvider import com.tangem.tap.network.auth.DefaultStakeKitAuthProvider import com.tangem.tap.proxy.AppStateHolder +import com.tangem.utils.version.AppVersionProvider import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt b/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt index a901fd6b57..05de135483 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/di/NetworkModule.kt @@ -12,9 +12,9 @@ import com.tangem.datasource.api.tangemTech.TangemTechServiceApi import com.tangem.datasource.utils.RequestHeader.* import com.tangem.datasource.utils.addHeaders import com.tangem.datasource.utils.addLoggers -import com.tangem.lib.auth.AppVersionProvider import com.tangem.lib.auth.ExpressAuthProvider import com.tangem.lib.auth.StakeKitAuthProvider +import com.tangem.utils.version.AppVersionProvider import dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt b/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt index 5e07267955..c9fa81608f 100644 --- a/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt +++ b/core/datasource/src/main/java/com/tangem/datasource/utils/RequestHeader.kt @@ -1,9 +1,9 @@ package com.tangem.datasource.utils import com.tangem.datasource.api.common.AuthProvider -import com.tangem.lib.auth.AppVersionProvider import com.tangem.lib.auth.ExpressAuthProvider import com.tangem.lib.auth.StakeKitAuthProvider +import com.tangem.utils.version.AppVersionProvider /** * Presentation of request header @@ -29,7 +29,7 @@ sealed class RequestHeader(vararg pairs: Pair String>) { ) class AppVersionPlatformHeaders(appVersionProvider: AppVersionProvider) : RequestHeader( - "version" to { appVersionProvider.getAppVersion() }, + "version" to { appVersionProvider.versionName }, "platform" to { "android" }, ) diff --git a/core/utils/src/main/java/com/tangem/utils/version/AppVersionProvider.kt b/core/utils/src/main/java/com/tangem/utils/version/AppVersionProvider.kt new file mode 100644 index 0000000000..23e26bebd1 --- /dev/null +++ b/core/utils/src/main/java/com/tangem/utils/version/AppVersionProvider.kt @@ -0,0 +1,8 @@ +package com.tangem.utils.version + +interface AppVersionProvider { + + val versionName: String + + val versionCode: Int +} \ No newline at end of file diff --git a/libs/auth/src/main/java/com/tangem/lib/auth/AppVersionProvider.kt b/libs/auth/src/main/java/com/tangem/lib/auth/AppVersionProvider.kt deleted file mode 100644 index 3b8e606e9c..0000000000 --- a/libs/auth/src/main/java/com/tangem/lib/auth/AppVersionProvider.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.tangem.lib.auth - -interface AppVersionProvider { - - fun getAppVersion(): String -} \ No newline at end of file