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 #208

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2018-07-08 23:20:03 +02:00
parent e586a38291
commit 95ef492454
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,7 +197,9 @@ public class ChatController extends BaseController implements MessagesListAdapte
credentials = ApiUtils.getCredentials(conversationUser.getUserId(), conversationUser.getToken()); credentials = ApiUtils.getCredentials(conversationUser.getUserId(), conversationUser.getToken());
} }
this.startCallFromNotification = args.getBoolean(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL); if (args.containsKey(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL)) {
this.startCallFromNotification = args.getBoolean(BundleKeys.KEY_FROM_NOTIFICATION_START_CALL);
}
this.voiceOnly = args.getBoolean(BundleKeys.KEY_CALL_VOICE_ONLY, false); this.voiceOnly = args.getBoolean(BundleKeys.KEY_CALL_VOICE_ONLY, false);
} }
@ -382,7 +384,7 @@ public class ChatController extends BaseController implements MessagesListAdapte
messageInputView.getButton().setContentDescription(getResources() messageInputView.getButton().setContentDescription(getResources()
.getString(R.string.nc_description_send_message_button)); .getString(R.string.nc_description_send_message_button));
if (adapterWasNull && startCallFromNotification == null) { if (adapterWasNull && TextUtils.isEmpty(conversationName) && startCallFromNotification == null) {
getRoomInfo(); getRoomInfo();
} else { } else {
handleFromNotification(); handleFromNotification();

6
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java
View File

@ -522,7 +522,11 @@ public class OperationsMenuController extends BaseController {
}); });
} }
} else { } else {
showResultImage(true, false); if (!currentUser.hasSpreedCapabilityWithName("chat-v2")) {
showResultImage(true, false);
} else {
initiateConversation(true, null);
}
} }
} }