upgrade OkHttp, add Conscrypt (#1083)

* upgrade OkHttp, add Conscrypt * fix tests
2019-03-04 19:25:51 +01:00 · 2019-03-04 19:25:51 +01:00 · d43b4fef4b
commit d43b4fef4b
parent 479d210e64
4 changed files with 21 additions and 87 deletions
--- a/app/src/test/java/com/keylesspalace/tusky/FakeTuskyApplication.kt
+++ b/app/src/test/java/com/keylesspalace/tusky/FakeTuskyApplication.kt
@ -8,6 +8,10 @@ class FakeTuskyApplication : TuskyApplication() {

    lateinit var locator: ServiceLocator

+    override fun initSecurityProvider() {
+        // No-op
+    }
+
    override fun initAppInjector() {
        // No-op
    }