From c9f699d0d367b04f8d13e8cec5f3a1851d3aca94 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Jun 2025 19:28:02 +0000 Subject: [PATCH 1/2] fix(deps): update workversion to v2.10.2 Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- app/build.gradle | 2 +- gradle/verification-metadata.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 5b61bed5f..34bf718c5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -163,7 +163,7 @@ ext { prismVersion = "2.0.0" retrofit2Version = "3.0.0" roomVersion = "2.7.2" - workVersion = "2.9.1" + workVersion = "2.10.2" espressoVersion = "3.6.1" androidxTestVersion = "1.5.0" media3_version = "1.7.1" diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 823b66476..676b320d5 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -51,6 +51,7 @@ + From 6a026c1fc77d8e4eaa5314fa2352d5b9d55a8232 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Fri, 4 Jul 2025 18:25:32 +0200 Subject: [PATCH 2/2] fix(worker): Update to worker v2.10.x API Signed-off-by: Andy Scherzinger --- .../com/nextcloud/talk/account/AccountVerificationActivity.kt | 4 ++-- .../java/com/nextcloud/talk/account/WebViewLoginActivity.kt | 4 ++-- app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt | 4 ++-- .../talk/conversationlist/ConversationsListActivity.kt | 4 ++-- .../main/java/com/nextcloud/talk/settings/SettingsActivity.kt | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/account/AccountVerificationActivity.kt b/app/src/main/java/com/nextcloud/talk/account/AccountVerificationActivity.kt index e23b90b41..d3279733a 100644 --- a/app/src/main/java/com/nextcloud/talk/account/AccountVerificationActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/account/AccountVerificationActivity.kt @@ -490,9 +490,9 @@ class AccountVerificationActivity : BaseActivity() { WorkManager.getInstance(applicationContext).enqueue(accountRemovalWork) WorkManager.getInstance(context).getWorkInfoByIdLiveData(accountRemovalWork.id) - .observeForever { workInfo: WorkInfo -> + .observeForever { workInfo: WorkInfo? -> - when (workInfo.state) { + when (workInfo?.state) { WorkInfo.State.SUCCEEDED -> { val intent = Intent(this, ServerSelectionActivity::class.java) startActivity(intent) diff --git a/app/src/main/java/com/nextcloud/talk/account/WebViewLoginActivity.kt b/app/src/main/java/com/nextcloud/talk/account/WebViewLoginActivity.kt index 8a71ee57d..581002cdc 100644 --- a/app/src/main/java/com/nextcloud/talk/account/WebViewLoginActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/account/WebViewLoginActivity.kt @@ -389,9 +389,9 @@ class WebViewLoginActivity : BaseActivity() { WorkManager.getInstance(applicationContext).enqueue(accountRemovalWork) WorkManager.getInstance(context).getWorkInfoByIdLiveData(accountRemovalWork.id) - .observeForever { workInfo: WorkInfo -> + .observeForever { workInfo: WorkInfo? -> - when (workInfo.state) { + when (workInfo?.state) { WorkInfo.State.SUCCEEDED, WorkInfo.State.FAILED, WorkInfo.State.CANCELLED -> { restartApp() } diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index 8c8bf3832..ea5540e76 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -1993,8 +1993,8 @@ class ChatActivity : WorkManager.getInstance().enqueue(downloadWorker) WorkManager.getInstance(context).getWorkInfoByIdLiveData(downloadWorker.id) - .observeForever { workInfo: WorkInfo -> - if (workInfo.state == WorkInfo.State.SUCCEEDED) { + .observeForever { workInfo: WorkInfo? -> + if (workInfo?.state == WorkInfo.State.SUCCEEDED) { funToCallWhenDownloadSuccessful() } } diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt index 3c50dbbfa..7e6aed885 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt @@ -1974,9 +1974,9 @@ class ConversationsListActivity : WorkManager.getInstance(applicationContext).enqueue(accountRemovalWork) WorkManager.getInstance(context).getWorkInfoByIdLiveData(accountRemovalWork.id) - .observeForever { workInfo: WorkInfo -> + .observeForever { workInfo: WorkInfo? -> - when (workInfo.state) { + when (workInfo?.state) { WorkInfo.State.SUCCEEDED -> { val text = String.format( context.resources.getString(R.string.nc_deleted_user), diff --git a/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt b/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt index 9dad6eec4..e356b799d 100644 --- a/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt @@ -681,9 +681,9 @@ class SettingsActivity : WorkManager.getInstance(applicationContext).enqueue(accountRemovalWork) WorkManager.getInstance(context).getWorkInfoByIdLiveData(accountRemovalWork.id) - .observeForever { workInfo: WorkInfo -> + .observeForever { workInfo: WorkInfo? -> - when (workInfo.state) { + when (workInfo?.state) { WorkInfo.State.SUCCEEDED -> { val text = String.format( context.resources.getString(R.string.nc_deleted_user),