Browse Source

Fix #477

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 6 năm trước cách đây
mục cha
commit
4222e395cc

+ 1 - 1
app/src/main/java/com/nextcloud/talk/controllers/ContactsController.java

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

+ 6 - 2
app/src/main/java/com/nextcloud/talk/controllers/bottomsheet/OperationsMenuController.java

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