From 58febdd682427dbddbb8848871a63da559b3e73e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Jun 2022 01:08:09 +0000 Subject: [PATCH 1/2] Bump kotlin-gradle-plugin from 1.6.21 to 1.7.0 Bumps [kotlin-gradle-plugin](https://github.com/JetBrains/kotlin) from 1.6.21 to 1.7.0. - [Release notes](https://github.com/JetBrains/kotlin/releases) - [Changelog](https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md) - [Commits](https://github.com/JetBrains/kotlin/commits) --- updated-dependencies: - dependency-name: org.jetbrains.kotlin:kotlin-gradle-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index cedf4f449..d45a09421 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ buildscript { ext { - kotlinVersion = '1.6.21' + kotlinVersion = '1.7.0' } repositories { From 49d2f40e3f7d61ae624c6b32cf776f64b23f16c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Brey?= Date: Thu, 9 Jun 2022 10:53:45 +0200 Subject: [PATCH 2/2] ProfileController: fix non-exhaustive when MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Crashes Kotlin 1.7.0 Signed-off-by: Álvaro Brey --- .../java/com/nextcloud/talk/controllers/ProfileController.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ProfileController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ProfileController.kt index fa604250e..b7f1cf363 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ProfileController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ProfileController.kt @@ -769,6 +769,9 @@ class ProfileController : NewBaseController(R.layout.controller_profile) { Scope.LOCAL -> holder.binding.scope.setImageResource(R.drawable.ic_password) Scope.FEDERATED -> holder.binding.scope.setImageResource(R.drawable.ic_contacts) Scope.PUBLISHED -> holder.binding.scope.setImageResource(R.drawable.ic_link) + null -> { + // nothing + } } holder.binding.scope.contentDescription = controller.activity!!.resources.getString( R.string.scope_toggle_description,