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

remove (hopefully unused) code regarding GUEST and USER_FOLLOWING_LINK

Browse Source 
I can't reproduce or think of scenarios when this code was used. because bottom dialog is replaced it wouldn't work anymore anyway.
If there appear scenarios when the code would have executed, it should be fixed similar like ConversationsListBottomDialog was implemented.

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2022-02-15 11:49:20 +01:00
parent 59d821c211
commit eceb545589
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 3 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/src/main/java/com/nextcloud/talk/controllers/ConversationsListController.java
View File

@ -803,26 +803,6 @@ public class ConversationsListController extends BaseController implements Searc
return onQueryTextChange(query);
}
// TODO check when this is executed and if handling is correct
private void prepareAndShowBottomSheetWithBundle(Bundle bundle) {
if (view == null) {
view = getActivity().getLayoutInflater().inflate(R.layout.bottom_sheet, null, false);
}
// if (shouldShowCallMenuController) {
// getChildRouter((ViewGroup) view).setRoot(
// RouterTransaction.with(new CallMenuController(bundle, this))
// .popChangeHandler(new VerticalChangeHandler())
// .pushChangeHandler(new VerticalChangeHandler()));
// } else {
getChildRouter((ViewGroup) view).setRoot(
RouterTransaction.with(new EntryMenuController(bundle))
.popChangeHandler(new VerticalChangeHandler())
.pushChangeHandler(new VerticalChangeHandler()));
// }
}
@Override
protected String getTitle() {
return getResources().getString(R.string.nc_app_product_name);
@ -1017,37 +997,13 @@ public class ConversationsListController extends BaseController implements Searc
private void openConversation(String textToPaste) {
Bundle bundle = new Bundle();
bundle.putParcelable(BundleKeys.INSTANCE.getKEY_USER_ENTITY(), currentUser);
bundle.putParcelable(BundleKeys.INSTANCE.getKEY_ACTIVE_CONVERSATION(), Parcels.wrap(selectedConversation));
bundle.putString(BundleKeys.INSTANCE.getKEY_ROOM_TOKEN(), selectedConversation.getToken());
bundle.putString(BundleKeys.INSTANCE.getKEY_ROOM_ID(), selectedConversation.getRoomId());
bundle.putString(BundleKeys.INSTANCE.getKEY_SHARED_TEXT(), textToPaste);
// TODO check when this is executed and if handling is correct
// when is hasPassword && ParticipantType.GUEST true? currently the app can't be used as guest?!
// when is USER_FOLLOWING_LINK true? --> from contactsController via enter link?
if ((selectedConversation.hasPassword
&& selectedConversation.participantType == Participant.ParticipantType.GUEST)
|| selectedConversation.participantType == Participant.ParticipantType.USER_FOLLOWING_LINK) {
bundle.putSerializable(BundleKeys.INSTANCE.getKEY_OPERATION_CODE(), ConversationOperationEnum.JOIN_ROOM);
prepareAndShowBottomSheetWithBundle(bundle);
// instead to use prepareAnd...
// use something like
//
// conversationOperationDialog = new ConversationOperationDialog(
// getActivity(),
// this,
// userUtils.getCurrentUser(),
// conversation);
// conversationOperationDialog.show();
} else {
currentUser = userUtils.getCurrentUser();
bundle.putParcelable(BundleKeys.INSTANCE.getKEY_ACTIVE_CONVERSATION(), Parcels.wrap(selectedConversation));
ConductorRemapping.INSTANCE.remapChatController(getRouter(), currentUser.getId(),
selectedConversation.getToken(), bundle, false);
}
ConductorRemapping.INSTANCE.remapChatController(getRouter(), currentUser.getId(),
selectedConversation.getToken(), bundle, false);
}
@Subscribe(sticky = true, threadMode = ThreadMode.BACKGROUND)