From 47bc1e8bbc08bfeca9859f1473e34c21cf3f4452 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Wed, 2 Jan 2019 00:49:33 +0100 Subject: [PATCH] Fix a few crashing bugs Signed-off-by: Mario Danic --- .../talk/controllers/AccountVerificationController.java | 4 ++-- .../java/com/nextcloud/talk/controllers/ChatController.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java index 4f070da4c..cf78c72ee 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java @@ -105,7 +105,7 @@ public class AccountVerificationController extends BaseController { private boolean isAccountImport; private String originalProtocol; - public AccountVerificationController(Bundle args) { + AccountVerificationController(Bundle args) { super(args); if (args != null) { baseUrl = args.getString(BundleKeys.KEY_BASE_URL); @@ -230,7 +230,7 @@ public class AccountVerificationController extends BaseController { @Override public void onError(Throwable e) { - if (getActivity() != null) { + if (getActivity() != null && getResources() != null) { getActivity().runOnUiThread(() -> progressText.setText(String.format(getResources().getString( R.string.nc_nextcloud_talk_app_not_installed), getResources().getString(R.string.nc_app_name)))); } diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java index acd322e9d..69abaee0b 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.java @@ -563,7 +563,7 @@ public class ChatController extends BaseController implements MessagesListAdapte } @OnClick(R.id.emptyLayout) - public void sendHello() { + void sendHello() { if (!isHelloClicked) { isHelloClicked = true; sendMessage(getResources().getString(R.string.nc_hello) + " 👋", 1);