mirror of
https://github.com/deltachat/deltachat-android.git
synced 2025-10-03 17:59:39 +02:00
Merge branch 'main' into adb/issue-3795
This commit is contained in:
commit
f136b6d7d1
2 changed files with 2 additions and 1 deletions
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
## Unreleased
|
## Unreleased
|
||||||
|
|
||||||
|
* Allow to clone email chats
|
||||||
* improve image quality when setting group avatars
|
* improve image quality when setting group avatars
|
||||||
|
|
||||||
## v2.10.0
|
## v2.10.0
|
||||||
|
|
|
@ -109,7 +109,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity
|
||||||
|
|
||||||
if (chatId != 0) {
|
if (chatId != 0) {
|
||||||
DcChat dcChat = dcContext.getChat(chatId);
|
DcChat dcChat = dcContext.getChat(chatId);
|
||||||
menu.findItem(R.id.menu_clone).setVisible(chatIsMultiUser && !chatIsMailingList && dcChat.isEncrypted());
|
menu.findItem(R.id.menu_clone).setVisible(chatIsMultiUser && !chatIsMailingList);
|
||||||
if (chatIsDeviceTalk) {
|
if (chatIsDeviceTalk) {
|
||||||
menu.findItem(R.id.edit_name).setVisible(false);
|
menu.findItem(R.id.edit_name).setVisible(false);
|
||||||
menu.findItem(R.id.show_encr_info).setVisible(false);
|
menu.findItem(R.id.show_encr_info).setVisible(false);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue