Merge branch 'main' into adb/issue-4059

This commit is contained in:
adb
2025-12-15 12:48:08 +01:00
committed by GitHub
@@ -123,7 +123,7 @@ public class QrActivity extends BaseActionBarActivity implements View.OnClickLis
public boolean onPrepareOptionsMenu(Menu menu) {
menu.clear();
getMenuInflater().inflate(R.menu.qr_show, menu);
menu.findItem(R.id.new_classic_contact).setVisible(!DcHelper.getContext(this).isChatmail());
menu.findItem(R.id.new_classic_contact).setVisible(!scanRelay && !DcHelper.getContext(this).isChatmail());
Util.redMenuItem(menu, R.id.withdraw);
if(tabLayout.getSelectedTabPosition() == TAB_SCAN) {