gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-08-15 16:05:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #477

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-04-06 23:14:02 +02:00
parent d43c37d88b
commit 4222e395cc
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -333,7 +333,7 @@ public class ContactsController extends BaseController implements SearchView.OnQ
bundle.putStringArrayList(BundleKeys.KEY_INVITED_PARTICIPANTS, userIds); bundle.putStringArrayList(BundleKeys.KEY_INVITED_PARTICIPANTS, userIds);
bundle.putStringArrayList(BundleKeys.KEY_INVITED_GROUP, groupIds); bundle.putStringArrayList(BundleKeys.KEY_INVITED_GROUP, groupIds);
bundle.putInt(BundleKeys.KEY_OPERATION_CODE, 11); bundle.putInt(BundleKeys.KEY_OPERATION_CODE, 11);
prepareAndShowBottomSheetWithBundle(bundle, false); prepareAndShowBottomSheetWithBundle(bundle, true);
} }
} }

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

@ -122,6 +122,7 @@ public class OperationsMenuController extends BaseController {
private Capabilities serverCapabilities; private Capabilities serverCapabilities;
private String credentials; private String credentials;
private String conversationName;
public OperationsMenuController(Bundle args) { public OperationsMenuController(Bundle args) {
super(args); super(args);
@ -148,6 +149,9 @@ public class OperationsMenuController extends BaseController {
if (args.containsKey(BundleKeys.KEY_SERVER_CAPABILITIES)) { if (args.containsKey(BundleKeys.KEY_SERVER_CAPABILITIES)) {
this.serverCapabilities = Parcels.unwrap(args.getParcelable(BundleKeys.KEY_SERVER_CAPABILITIES)); this.serverCapabilities = Parcels.unwrap(args.getParcelable(BundleKeys.KEY_SERVER_CAPABILITIES));
} }
this.conversationName = args.getString(BundleKeys.KEY_CONVERSATION_NAME, "");
} }
@Override @Override
@ -266,7 +270,7 @@ public class OperationsMenuController extends BaseController {
if (conversationType.equals(Conversation.ConversationType.ROOM_PUBLIC_CALL) || if (conversationType.equals(Conversation.ConversationType.ROOM_PUBLIC_CALL) ||
!currentUser.hasSpreedCapabilityWithName("empty-group-room")) { !currentUser.hasSpreedCapabilityWithName("empty-group-room")) {
retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(currentUser.getBaseUrl(), retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(currentUser.getBaseUrl(),
"3", invite, null); "3", invite, conversationName);
} else { } else {
String roomType = "2"; String roomType = "2";
if (!currentUser.hasSpreedCapabilityWithName("empty-group-room")) { if (!currentUser.hasSpreedCapabilityWithName("empty-group-room")) {
@ -275,7 +279,7 @@ public class OperationsMenuController extends BaseController {
} }
retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(currentUser.getBaseUrl(), retrofitBucket = ApiUtils.getRetrofitBucketForCreateRoom(currentUser.getBaseUrl(),
roomType, invite, null); roomType, invite, conversationName);
} }
final boolean isGroupCallWorkaroundFinal = isGroupCallWorkaround; final boolean isGroupCallWorkaroundFinal = isGroupCallWorkaround;