diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java index 94f0577d0..86e7b920a 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java +++ b/app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java @@ -82,7 +82,7 @@ import com.nextcloud.talk.models.database.UserEntity; import com.nextcloud.talk.models.json.conversations.Conversation; import com.nextcloud.talk.models.json.participants.Participant; import com.nextcloud.talk.ui.dialog.ChooseAccountDialogFragment; -import com.nextcloud.talk.ui.dialog.ConversationOperationDialog; +import com.nextcloud.talk.ui.dialog.ConversationsListBottomDialog; import com.nextcloud.talk.utils.ApiUtils; import com.nextcloud.talk.utils.ClosedInterfaceImpl; import com.nextcloud.talk.utils.ConductorRemapping; @@ -214,7 +214,7 @@ public class ConversationsListController extends BaseController implements Searc private HashMap callHeaderItems = new HashMap<>(); - private ConversationOperationDialog conversationOperationDialog; + private ConversationsListBottomDialog conversationsListBottomDialog; public ConversationsListController(Bundle bundle) { super(); @@ -904,12 +904,12 @@ public class ConversationsListController extends BaseController implements Searc Object clickedItem = adapter.getItem(position); if (clickedItem != null) { Conversation conversation = ((ConversationItem) clickedItem).getModel(); - conversationOperationDialog = new ConversationOperationDialog( + conversationsListBottomDialog = new ConversationsListBottomDialog( getActivity(), this, userUtils.getCurrentUser(), conversation); - conversationOperationDialog.show(); + conversationsListBottomDialog.show(); } } } @@ -1026,6 +1026,17 @@ public class ConversationsListController extends BaseController implements Searc bundle.putInt(BundleKeys.INSTANCE.getKEY_OPERATION_CODE(), 99); prepareAndShowBottomSheetWithBundle(bundle); + + // instead to use prepareAnd... + // use something like + // + // conversationOperationDialog = new ConversationOperationDialog( + // getActivity(), + // this, + // userUtils.getCurrentUser(), + // conversation); + // conversationOperationDialog.show(); + } else { currentUser = userUtils.getCurrentUser(); diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationOperationDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt similarity index 99% rename from app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationOperationDialog.kt rename to app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt index 69e0b89fa..82748caa0 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationOperationDialog.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ConversationsListBottomDialog.kt @@ -37,7 +37,7 @@ import org.parceler.Parcels import javax.inject.Inject @AutoInjector(NextcloudTalkApplication::class) -class ConversationOperationDialog( +class ConversationsListBottomDialog( val activity: Activity, val controller: ConversationsListController, val currentUser: UserEntity,