mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

Merge remote-tracking branch 'origin/1.8' into 1.8

Browse source 
# Conflicts:
#	build.gradle
#	src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
This commit is contained in:
Arne 2024-09-10 09:42:50 +02:00
commit 94ec6546e2
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/ui/ConferenceDetailsActivity.java
View file

@ -270,7 +270,6 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
popupMenu.show(); popupMenu.show();
return true; return true;
}); });
this.binding.editMucNameButton.setContentDescription(getString(R.string.edit_name_and_topic));
this.binding.editMucNameButton.setOnClickListener(this::onMucEditButtonClicked); this.binding.editMucNameButton.setOnClickListener(this::onMucEditButtonClicked);
this.binding.mucEditTitle.addTextChangedListener(this); this.binding.mucEditTitle.addTextChangedListener(this);
this.binding.mucEditSubject.addTextChangedListener(this); this.binding.mucEditSubject.addTextChangedListener(this);
@ -433,7 +432,6 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
this.binding.mucEditor.setVisibility(View.GONE); this.binding.mucEditor.setVisibility(View.GONE);
this.binding.mucDisplay.setVisibility(View.VISIBLE); this.binding.mucDisplay.setVisibility(View.VISIBLE);
this.binding.editMucNameButton.setImageResource(R.drawable.ic_edit_24dp); this.binding.editMucNameButton.setImageResource(R.drawable.ic_edit_24dp);
this.binding.editMucNameButton.setContentDescription(getString(R.string.edit_name_and_topic));
} }
private void onMucInfoUpdated(String subject, String name) { private void onMucInfoUpdated(String subject, String name) {