From d064ad3f654d05b8905e73408dd47c096569e43c Mon Sep 17 00:00:00 2001 From: Dariusz Olszewski Date: Sun, 20 Feb 2022 17:02:14 +0100 Subject: [PATCH] Simplified code to avoid NullPointerException when server response arrives after the view was unbound. Signed-off-by: Dariusz Olszewski --- .../talk/controllers/ConversationsListController.java | 2 +- .../nextcloud/talk/controllers/base/ButterKnifeController.kt | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) 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 59f3b7199..79fc62be6 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java @@ -528,7 +528,7 @@ public class ConversationsListController extends BaseController implements Searc // This is invoked asynchronously, when server returns a response the view might have been // unbound in the meantime. Check if the view is still there. // FIXME - does it make sense to update internal data structures even when view has been unbound? - if (!viewIsBound()) { + if (getView() == null) { Log.d(TAG, "fetchData - getRooms - view is not bound: " + startNanoTime); return; } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.kt b/app/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.kt index 62e25cb4b..1226965ac 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/base/ButterKnifeController.kt @@ -55,8 +55,4 @@ abstract class ButterKnifeController : Controller { unbinder!!.unbind() unbinder = null } - - protected fun viewIsBound() : Boolean { - return unbinder != null - } }