gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-22 13:09:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few crashing bugs

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-01-02 00:49:33 +01:00
parent 96f027726e
commit 47bc1e8bbc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/nextcloud/talk/controllers/AccountVerificationController.java
View File

@ -105,7 +105,7 @@ public class AccountVerificationController extends BaseController {
private boolean isAccountImport; private boolean isAccountImport;
private String originalProtocol; private String originalProtocol;
public AccountVerificationController(Bundle args) { AccountVerificationController(Bundle args) {
super(args); super(args);
if (args != null) { if (args != null) {
baseUrl = args.getString(BundleKeys.KEY_BASE_URL); baseUrl = args.getString(BundleKeys.KEY_BASE_URL);
@ -230,7 +230,7 @@ public class AccountVerificationController extends BaseController {
@Override @Override
public void onError(Throwable e) { public void onError(Throwable e) {
if (getActivity() != null) { if (getActivity() != null && getResources() != null) {
getActivity().runOnUiThread(() -> progressText.setText(String.format(getResources().getString( getActivity().runOnUiThread(() -> progressText.setText(String.format(getResources().getString(
R.string.nc_nextcloud_talk_app_not_installed), getResources().getString(R.string.nc_app_name)))); R.string.nc_nextcloud_talk_app_not_installed), getResources().getString(R.string.nc_app_name))));
} }

2
app/src/main/java/com/nextcloud/talk/controllers/ChatController.java
View File

@ -563,7 +563,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
} }
@OnClick(R.id.emptyLayout) @OnClick(R.id.emptyLayout)
public void sendHello() { void sendHello() {
if (!isHelloClicked) { if (!isHelloClicked) {
isHelloClicked = true; isHelloClicked = true;
sendMessage(getResources().getString(R.string.nc_hello) + " 👋", 1); sendMessage(getResources().getString(R.string.nc_hello) + " 👋", 1);