From 44bfd1f15ca0986062d3674d1d76c602be15499a Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 5 Jun 2023 10:46:21 +0200 Subject: [PATCH] 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,