From 9b55467af344aabf0fdea18e20b149f7f2857732 Mon Sep 17 00:00:00 2001 From: Marcel Hibbe Date: Thu, 20 Jan 2022 11:34:46 +0100 Subject: [PATCH] moved execution of setUpPushTokenRegistration so token is registered everytime the conversation list is opened. In NextcloudTalkApplication it was not executed when app was still in background when opening Signed-off-by: Marcel Hibbe --- .../nextcloud/talk/application/NextcloudTalkApplication.kt | 2 -- .../talk/controllers/ConversationsListController.java | 4 ++++ scripts/analysis/lint-results.txt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt index e31fe0daf..4c391d3b5 100644 --- a/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt +++ b/app/src/main/java/com/nextcloud/talk/application/NextcloudTalkApplication.kt @@ -167,8 +167,6 @@ class NextcloudTalkApplication : MultiDexApplication(), LifecycleObserver { ClosedInterfaceImpl().providerInstallerInstallIfNeededAsync() DeviceUtils.ignoreSpecialBatteryFeatures() - ClosedInterfaceImpl().setUpPushTokenRegistration() - val accountRemovalWork = OneTimeWorkRequest.Builder(AccountRemovalWorker::class.java).build() val periodicCapabilitiesUpdateWork = PeriodicWorkRequest.Builder( CapabilitiesWorker::class.java, diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java index e2a152572..76b3867ba 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java @@ -85,6 +85,7 @@ import com.nextcloud.talk.models.json.conversations.Conversation; import com.nextcloud.talk.models.json.participants.Participant; import com.nextcloud.talk.ui.dialog.ChooseAccountDialogFragment; import com.nextcloud.talk.utils.ApiUtils; +import com.nextcloud.talk.utils.ClosedInterfaceImpl; import com.nextcloud.talk.utils.ConductorRemapping; import com.nextcloud.talk.utils.DisplayUtils; import com.nextcloud.talk.utils.KeyboardUtils; @@ -285,6 +286,9 @@ public class ConversationsListController extends BaseController implements Searc @Override protected void onAttach(@NonNull View view) { super.onAttach(view); + + new ClosedInterfaceImpl().setUpPushTokenRegistration(); + if (!eventBus.isRegistered(this)) { eventBus.register(this); } diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index 96101281e..7d0dd5fec 100644 --- a/scripts/analysis/lint-results.txt +++ b/scripts/analysis/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 1 error and 222 warnings + Lint Report: 1 error and 224 warnings