Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 14:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Show disabled menu item if we support feature but contact doesn't.

Browse Source
This commit is contained in:
akwizgran
2021-03-01 16:57:04 +00:00
committed by Torsten Grote
parent 3a2146cb03
commit f1453ed4c4
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
briar-android/src/main/java/org/briarproject/briar/android/conversation/ConversationActivity.java
View File

@@ -373,14 +373,13 @@ public class ConversationActivity extends BriarActivity
// enable alias action if available // enable alias action if available
observeOnce(viewModel.getContactItem(), this, contact -> observeOnce(viewModel.getContactItem(), this, contact ->
menu.findItem(R.id.action_set_alias).setEnabled(true)); menu.findItem(R.id.action_set_alias).setEnabled(true));
// show auto-delete timer setting only, if contacts supports it // Show auto-delete menu item if feature is enabled
if (featureFlags.shouldEnableDisappearingMessages()) { if (featureFlags.shouldEnableDisappearingMessages()) {
observeOnce(viewModel.getPrivateMessageFormat(), this, format -> { MenuItem item = menu.findItem(R.id.action_conversation_settings);
boolean visible = format == TEXT_IMAGES_AUTO_DELETE; item.setVisible(true);
MenuItem item = // Enable menu item only if contact supports auto-delete
menu.findItem(R.id.action_conversation_settings); observeOnce(viewModel.getPrivateMessageFormat(), this, format ->
item.setVisible(visible); item.setEnabled(format == TEXT_IMAGES_AUTO_DELETE));
});
} }
return super.onCreateOptionsMenu(menu); return super.onCreateOptionsMenu(menu);