varnitgoyal95/super-app
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

TP-57310 | Regression network module issue fix (#9789)

Browse Source
This commit is contained in:
Aditya Piyush
2024-02-15 19:45:22 +05:30
committed by GitHub
parent 5f28183f08
commit 24bb390779
3 changed files with 12 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
navi-hl/src/main/java/com/navi/homeloan/common/network/di/HLNetworkModule.kt
View File

@@ -9,8 +9,8 @@ package com.navi.homeloan.common.network.di
import com.google.gson.Gson
import com.google.gson.GsonBuilder
import com.navi.common.CommonLibManager
import com.navi.common.model.NetworkInfo
import com.navi.homeloan.common.network.retrofit.HLNetworkManager
import com.navi.homeloan.common.network.retrofit.NaviHttpClient
import com.navi.homeloan.common.network.retrofit.RetrofitService
import com.navi.homeloan.common.utils.getNetworkInfo
@@ -45,14 +45,14 @@ object NetworkModule {
@Provides
@HLRetrofit
fun providesOkHttpClient(@HLRetrofit networkInfo: NetworkInfo): NaviHttpClient =
NaviHttpClient(networkInfo, HLNetworkManager.applicationContext)
NaviHttpClient(networkInfo, CommonLibManager.application.applicationContext)
@Singleton
@Provides
@SuperAppRetroFitForHL
fun providesOkHttpClientForSuperApp(
@SuperAppRetroFitForHL networkInfo: NetworkInfo
): NaviHttpClient = NaviHttpClient(networkInfo, HLNetworkManager.applicationContext)
): NaviHttpClient = NaviHttpClient(networkInfo, CommonLibManager.application.applicationContext)
@Singleton
@Provides
@@ -72,7 +72,7 @@ object NetworkModule {
): RetrofitService {
val retrofit =
Retrofit.Builder()
.baseUrl(HLNetworkManager.baseUrl)
.baseUrl(CommonLibManager.baseUrl)
.addConverterFactory(GsonConverterFactory.create(deserializer))
.client(naviHttpClient.httpClientBuilder.build())
.build()
@@ -88,7 +88,7 @@ object NetworkModule {
): RetrofitService {
val retrofit =
Retrofit.Builder()
.baseUrl(HLNetworkManager.baseUrl)
.baseUrl(CommonLibManager.baseUrl)
.addConverterFactory(GsonConverterFactory.create(percentDeserializer))
.client(naviHttpClient.httpClientBuilder.build())
.build()

32
navi-hl/src/main/java/com/navi/homeloan/common/network/retrofit/HLNetworkManager.kt
View File

@@ -1,32 +0,0 @@
/*
*
* * Copyright © 2022-2023 by Navi Technologies Limited
* * All rights reserved. Strictly confidential
*
*/
package com.navi.homeloan.common.network.retrofit
import android.app.Application
import com.navi.common.model.BuildConfigDetails
object HLNetworkManager {
lateinit var applicationContext: Application
lateinit var baseUrl: String
lateinit var moduleName: String
lateinit var retrofitService: RetrofitService
lateinit var buildConfigDetails: BuildConfigDetails
fun init(
applicationContext: Application,
baseUrl: String,
appVersionName: String,
appVersionCode: String,
flavor: String
) {
this.applicationContext = applicationContext
this.baseUrl = baseUrl
this.buildConfigDetails =
BuildConfigDetails(baseUrl, appVersionName, appVersionCode, flavor)
}
}

14
navi-hl/src/main/java/com/navi/homeloan/common/utils/Utility.kt
View File

@@ -1,11 +1,11 @@
package com.navi.homeloan.common.utils
import android.text.format.DateFormat
import com.navi.common.CommonLibManager
import com.navi.common.model.ModuleName
import com.navi.common.model.NetworkInfo
import com.navi.common.utils.EMPTY
import com.navi.common.utils.log
import com.navi.homeloan.common.network.retrofit.HLNetworkManager
import com.navi.homeloan.common.Constants.API_CONNECT_TIMEOUT_VALUE
import java.util.Calendar
import java.util.Locale
@@ -26,9 +26,9 @@ fun timestampToddMMMMYYYY(timeStamp: Long): String {
fun getNetworkInfo(timeOutInSeconds: Long = API_CONNECT_TIMEOUT_VALUE): NetworkInfo {
return NetworkInfo(
baseUrl = HLNetworkManager.baseUrl,
appVersionName = HLNetworkManager.buildConfigDetails.appVersionName,
appVersionCode = HLNetworkManager.buildConfigDetails.appVersionCode,
baseUrl = CommonLibManager.buildConfigDetails.baseUrl,
appVersionName = CommonLibManager.buildConfigDetails.appVersionName,
appVersionCode = CommonLibManager.buildConfigDetails.appVersionCode,
moduleName = ModuleName.LE,
timeoutInSec = timeOutInSeconds
)
@@ -38,9 +38,9 @@ fun getNetworkInfoSuperApp(
timeOutInSeconds: Long = API_CONNECT_TIMEOUT_VALUE
): NetworkInfo {
return NetworkInfo(
baseUrl = HLNetworkManager.baseUrl,
appVersionName = HLNetworkManager.buildConfigDetails.appVersionName,
appVersionCode = HLNetworkManager.buildConfigDetails.appVersionCode,
CommonLibManager.buildConfigDetails.baseUrl,
appVersionName = CommonLibManager.buildConfigDetails.appVersionName,
appVersionCode = CommonLibManager.buildConfigDetails.appVersionCode,
moduleName = null,
timeoutInSec = timeOutInSeconds
)