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

Fix automated app starting due to room invite

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-09-13 10:39:26 +02:00
parent 68df0a3c8e
commit 82170b77d7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -528,7 +528,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
messageInputView.getButton().setContentDescription(getResources()
.getString(R.string.nc_description_send_message_button));
if (currentConversation.getRoomId() != null) {
if (currentConversation != null && currentConversation.getRoomId() != null) {
loadAvatarForStatusBar();
checkLobbyState();
}

2
app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java
View File

@ -615,7 +615,7 @@ public class NotificationWorker extends Worker {
break;
case "room":
if (bundle.containsKey(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN())) {
showNotificationForCallWithNoPing(intent);
showNotificationWithObjectData(intent);
}
break;
case "chat":