Set certmanager foreground/background state.

pull/71/head
Tom Hacohen 5 years ago
parent 4134f78da4
commit ee2dad4d19

@ -72,6 +72,7 @@ class HttpClient private constructor(
) {
private var certManager: CustomCertManager? = null
private var certificateAlias: String? = null
private var foreground = true
private val orig = sharedClient.newBuilder()
@ -138,8 +139,9 @@ class HttpClient private constructor(
fun customCertManager(manager: CustomCertManager) {
certManager = manager
}
fun setForeground(foreground: Boolean): Builder {
certManager?.appInForeground = foreground
this.foreground = foreground
return this
}
@ -223,6 +225,8 @@ class HttpClient private constructor(
orig.sslSocketFactory(CertTlsSocketFactory(keyManager, trustManager), trustManager)
orig.hostnameVerifier(hostnameVerifier)
certManager?.appInForeground = foreground
return HttpClient(orig.build(), certManager)
}

@ -236,7 +236,7 @@ constructor(context: Context, account: Account, settings: AccountSettings, extra
return null
}
val resourceClient = HttpClient.Builder(context).build().okHttpClient
val resourceClient = HttpClient.Builder(context).setForeground(false).build().okHttpClient
try {
val response = resourceClient.newCall(Request.Builder()

@ -111,7 +111,7 @@ abstract class SyncAdapterService : Service() {
Logger.log.info("Refreshing " + serviceType + " collections of service #" + serviceType.toString())
val settings = AccountSettings(context, account)
val httpClient = HttpClient.Builder(context, settings).build().okHttpClient
val httpClient = HttpClient.Builder(context, settings).setForeground(false).build().okHttpClient
val journalsManager = JournalManager(httpClient, HttpUrl.get(settings.uri!!)!!)

@ -87,7 +87,7 @@ constructor(protected val context: Context, protected val account: Account, prot
init {
// create HttpClient with given logger
httpClient = HttpClient.Builder(context, settings).build().okHttpClient
httpClient = HttpClient.Builder(context, settings).setForeground(false).build().okHttpClient
data = (context.applicationContext as App).data
val serviceEntity = JournalModel.Service.fetch(data, accountName, serviceType)

Loading…
Cancel
Save