arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-02-23 04:52:02 +00:00
Code Issues Releases Wiki Activity

Set certmanager foreground/background state.

Browse Source
This commit is contained in:
Tom Hacohen 2019-03-15 10:19:41 +00:00
parent 4134f78da4
commit ee2dad4d19
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/etesync/syncadapter/HttpClient.kt
View File

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

2
app/src/main/java/com/etesync/syncadapter/syncadapter/ContactsSyncManager.kt
View File

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

2
app/src/main/java/com/etesync/syncadapter/syncadapter/SyncAdapterService.kt
View File

@ -111,7 +111,7 @@ abstract class SyncAdapterService : Service() {
Logger.log.info("Refreshing " + serviceType + " collections of service #" + serviceType.toString()) Logger.log.info("Refreshing " + serviceType + " collections of service #" + serviceType.toString())
val settings = AccountSettings(context, account) 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!!)!!) val journalsManager = JournalManager(httpClient, HttpUrl.get(settings.uri!!)!!)

2
app/src/main/java/com/etesync/syncadapter/syncadapter/SyncManager.kt
View File

@ -87,7 +87,7 @@ constructor(protected val context: Context, protected val account: Account, prot
init { init {
// create HttpClient with given logger // 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 data = (context.applicationContext as App).data
val serviceEntity = JournalModel.Service.fetch(data, accountName, serviceType) val serviceEntity = JournalModel.Service.fetch(data, accountName, serviceType)