From bb16c2409427f7a0e3126071b0ef795a896a98ca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 06:40:51 +0000 Subject: [PATCH 1/3] Update dependency me.saket.telephoto:zoomable-image-coil to v0.4.0 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 744c9cc461..7b6efb4d8f 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" From 945a55c994cc4fc61b6d7e7865d38571b82df27b Mon Sep 17 00:00:00 2001 From: Marco Romano Date: Mon, 5 Jun 2023 10:20:05 +0200 Subject: [PATCH 2/3] Reset minSdk down to api23 --- plugins/src/main/kotlin/Versions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/src/main/kotlin/Versions.kt b/plugins/src/main/kotlin/Versions.kt index d7c60d7fb0..36a3a33e70 100644 --- a/plugins/src/main/kotlin/Versions.kt +++ b/plugins/src/main/kotlin/Versions.kt @@ -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) } From 44bfd1f15ca0986062d3674d1d76c602be15499a Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 5 Jun 2023 10:46:21 +0200 Subject: [PATCH 3/3] More cleanup now that min API is back to 23. --- .../features/login/impl/oidc/webview/OidcWebViewClient.kt | 3 --- .../notifications/factories/action/QuickReplyActionFactory.kt | 3 --- 2 files changed, 6 deletions(-) diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcWebViewClient.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcWebViewClient.kt index 7d8e789715..0da6e16ee0 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcWebViewClient.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/oidc/webview/OidcWebViewClient.kt @@ -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 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()) diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/QuickReplyActionFactory.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/QuickReplyActionFactory.kt index b8e3b28dad..a5f72acfb9 100644 --- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/QuickReplyActionFactory.kt +++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/notifications/factories/action/QuickReplyActionFactory.kt @@ -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( * 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,