Use Conscrypt; show progress bar when loading account activity (3c07bc3a) · Commits · e / os / AccountManager

app/build.gradle

+1 −1

Original line number	Diff line number	Diff line
		@@ -103,9 +103,9 @@ dependencies {
		implementation(':dav4jvm') {
		exclude group: 'org.ogce', module: 'xpp3' // Android comes with its own XmlPullParser
		}

		implementation 'com.jaredrummler:colorpicker:1.1.0'
		implementation 'com.mikepenz:aboutlibraries:6.2.3'

		implementation 'com.squareup.okhttp3:logging-interceptor:3.12.2'
		implementation 'commons-io:commons-io:2.6'
		implementation 'dnsjava:dnsjava:2.1.8'

app/src/main/java/at/bitfire/davdroid/HttpClient.kt

+9 −7

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@ package at.bitfire.davdroid
		import android.content.Context
		import android.os.Build
		import android.security.KeyChain
		import at.bitfire.cert4android.CertTlsSocketFactory
		import at.bitfire.cert4android.CustomCertManager
		import at.bitfire.dav4jvm.BasicDigestAuthHandler
		import at.bitfire.dav4jvm.Constants
		@@ -36,10 +35,7 @@ import java.text.SimpleDateFormat
		import java.util.*
		import java.util.concurrent.TimeUnit
		import java.util.logging.Level
		import javax.net.ssl.KeyManager
		import javax.net.ssl.TrustManagerFactory
		import javax.net.ssl.X509ExtendedKeyManager
		import javax.net.ssl.X509TrustManager
		import javax.net.ssl.*

		class HttpClient private constructor(
		val okHttpClient: OkHttpClient,
		@@ -220,7 +216,12 @@ class HttpClient private constructor(
		logger.log(Level.SEVERE, "Couldn't set up provider certificate authentication", e)
		}

		orig.sslSocketFactory(CertTlsSocketFactory(keyManager, trustManager), trustManager)
		val sslContext = SSLContext.getInstance("TLS")
		sslContext.init(
		if (keyManager != null) arrayOf(keyManager) else null,
		arrayOf(trustManager),
		null)
		orig.sslSocketFactory(sslContext.socketFactory, trustManager)
		orig.hostnameVerifier(hostnameVerifier)

		return HttpClient(orig.build(), certManager)
		@@ -233,7 +234,8 @@ class HttpClient private constructor(
		// use Locale.US because numbers may be encoded as non-ASCII characters in other locales
		private val userAgentDateFormat = SimpleDateFormat("yyyy/MM/dd", Locale.US)
		private val userAgentDate = userAgentDateFormat.format(Date(BuildConfig.buildTime))
		private val userAgent = "${BuildConfig.userAgent}/${BuildConfig.VERSION_NAME} ($userAgentDate; dav4jvm; okhttp/${Constants.okhttpVersion}) Android/${Build.VERSION.RELEASE}"
		private val userAgent = "${BuildConfig.userAgent}/${BuildConfig.VERSION_NAME} ($userAgentDate; dav4jvm; " +
		"okhttp/${Constants.okhttpVersion}) Android/${Build.VERSION.RELEASE}"

		override fun intercept(chain: Interceptor.Chain): Response {
		val locale = Locale.getDefault()

app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.kt

+0 −1

Original line number	Diff line number	Diff line
		@@ -545,7 +545,6 @@ class AccountActivity: AppCompatActivity(), Toolbar.OnMenuItemClickListener, Pop
		fun initialize(account: Account) {
		if (accountName.value != null)
		return

		this.account = account
		accountName.value = account.name

app/src/main/res/layout/activity_account.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,13 @@
		android:padding="@dimen/activity_margin"
		android:animateLayoutChanges="true">

		<ProgressBar
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:indeterminate="true"
		style="@style/Widget.AppCompat.ProgressBar.Horizontal"
		android:visibility="@{(model.calDavServiceId == null && model.cardDavServiceId == null) ? View.VISIBLE : View.GONE}"/>

		<androidx.cardview.widget.CardView
		android:layout_width="match_parent"
		android:layout_height="wrap_content"

build.gradle

+2 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,8 @@
		buildscript {
		ext.versions = [
		kotlin: '1.3.30',
		dokka: '0.9.17'
		dokka: '0.9.17',
		conscrypt: '2.1.0'
		]

		repositories {