Browse Source

Merge pull request #523 from vector-im/renovate/telephoto

Update dependency me.saket.telephoto:zoomable-image-coil to v0.4.0
feature/fga/small_timeline_improvements
Benoit Marty 1 year ago committed by GitHub
parent
commit
8dc1f655ea
  1. 3
      features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcWebViewClient.kt
  2. 2
      gradle/libs.versions.toml
  3. 3
      libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/QuickReplyActionFactory.kt
  4. 2
      plugins/src/main/kotlin/Versions.kt

3
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcWebViewClient.kt

@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
package io.element.android.features.login.impl.oidc.webview
import android.annotation.SuppressLint
import android.annotation.TargetApi
import android.os.Build
import android.webkit.WebResourceRequest
@ -26,8 +25,6 @@ import android.webkit.WebViewClient @@ -26,8 +25,6 @@ import android.webkit.WebViewClient
class OidcWebViewClient(
private val eventListener: WebViewEventListener,
) : WebViewClient() {
// We will revert to API 23, in the mean time ignore the warning here.
@SuppressLint("ObsoleteSdkInt")
@TargetApi(Build.VERSION_CODES.N)
override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean {
return shouldOverrideUrl(request.url.toString())

2
gradle/libs.versions.toml

@ -43,7 +43,7 @@ appyx = "1.2.0" @@ -43,7 +43,7 @@ appyx = "1.2.0"
dependencycheck = "8.2.1"
stem = "2.3.0"
sqldelight = "1.5.5"
telephoto = "0.3.0"
telephoto = "0.4.0"
# DI
dagger = "2.46.1"

3
libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/QuickReplyActionFactory.kt

@ -16,7 +16,6 @@ @@ -16,7 +16,6 @@
package io.element.android.libraries.push.impl.notifications.factories.action
import android.annotation.SuppressLint
import android.app.PendingIntent
import android.content.Context
import android.content.Intent
@ -71,8 +70,6 @@ class QuickReplyActionFactory @Inject constructor( @@ -71,8 +70,6 @@ class QuickReplyActionFactory @Inject constructor(
* However, for Android devices running Marshmallow and below (API level 23 and below),
* it will be more appropriate to use an activity. Since you have to provide your own UI.
*/
//TODO remove when minSdk will be back to 23
@SuppressLint("ObsoleteSdkInt")
private fun buildQuickReplyIntent(
sessionId: SessionId,
roomId: RoomId,

2
plugins/src/main/kotlin/Versions.kt

@ -23,7 +23,7 @@ object Versions { @@ -23,7 +23,7 @@ object Versions {
const val compileSdk = 33
const val targetSdk = 33
const val minSdk = 24
const val minSdk = 23
val javaCompileVersion = JavaVersion.VERSION_17
val javaLanguageVersion: JavaLanguageVersion = JavaLanguageVersion.of(11)
}

Loading…
Cancel
Save