diff --git a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenView.kt b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenView.kt index ce9319d0cf..711b203f99 100644 --- a/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenView.kt +++ b/features/call/impl/src/main/kotlin/io/element/android/features/call/impl/ui/CallScreenView.kt @@ -183,6 +183,7 @@ private fun WebView.setup( allowFileAccess = true domStorageEnabled = true mediaPlaybackRequiresUserGesture = false + @Suppress("DEPRECATION") databaseEnabled = true loadsImagesAutomatically = true userAgentString = userAgent diff --git a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultShareService.kt b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultShareService.kt index de53096076..f4ed61dba8 100644 --- a/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultShareService.kt +++ b/features/share/impl/src/main/kotlin/io/element/android/features/share/impl/DefaultShareService.kt @@ -46,7 +46,7 @@ class DefaultShareService @Inject constructor( PackageManager.GET_ACTIVITIES or PackageManager.MATCH_DISABLED_COMPONENTS ) .activities - .firstOrNull { it.name.endsWith(".ShareActivity") } + ?.firstOrNull { it.name.endsWith(".ShareActivity") } ?.let { shareActivityInfo -> ComponentName( shareActivityInfo.packageName, diff --git a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcView.kt b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcView.kt index 055d516f97..d58eebf8ae 100644 --- a/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcView.kt +++ b/libraries/oidc/impl/src/main/kotlin/io/element/android/libraries/oidc/impl/webview/OidcView.kt @@ -86,6 +86,7 @@ fun OidcView( javaScriptEnabled = true allowContentAccess = true allowFileAccess = true + @Suppress("DEPRECATION") databaseEnabled = true domStorageEnabled = true } diff --git a/plugins/src/main/kotlin/Versions.kt b/plugins/src/main/kotlin/Versions.kt index c71a77ac47..61df38ebd7 100644 --- a/plugins/src/main/kotlin/Versions.kt +++ b/plugins/src/main/kotlin/Versions.kt @@ -52,8 +52,8 @@ private const val versionPatch = 3 object Versions { val versionCode = 4_000_000 + versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch val versionName = "$versionMajor.$versionMinor.$versionPatch" - const val compileSdk = 34 - const val targetSdk = 34 + const val compileSdk = 35 + const val targetSdk = 35 // When updating the `minSdk`, make sure to update the value of `minSdkVersion` in the file `tools/release/release.sh` val minSdk = if (isEnterpriseBuild) 26 else 24