yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-06 03:49:58 +02:00
Code Issues Releases Wiki Activity

bring back 'add attachment later', which was removed at #3601

Browse source
This commit is contained in:
B. Petersen 2025-03-08 20:09:00 +01:00 • committed by bjoern
parent 9b7b35acb1
commit 906db9155a
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/org/thoughtcrime/securesms/ConversationActivity.java
View file

@ -490,6 +490,13 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
Log.e(TAG, "cannot set up in-chat-search: ", e); Log.e(TAG, "cannot set up in-chat-search: ", e);
} }
if (!dcChat.canSend() || isEditing) {
MenuItem attachItem = menu.findItem(R.id.menu_add_attachment);
if (attachItem!=null) {
attachItem.setVisible(false);
}
}
super.onPrepareOptionsMenu(menu); super.onPrepareOptionsMenu(menu);
return true; return true;
} }
@ -498,7 +505,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
super.onOptionsItemSelected(item); super.onOptionsItemSelected(item);
int itemId = item.getItemId(); int itemId = item.getItemId();
if (itemId == R.id.menu_leave) { if (itemId == R.id.menu_add_attachment) {
handleAddAttachment();
return true;
} else if (itemId == R.id.menu_leave) {
handleLeaveGroup(); handleLeaveGroup();
return true; return true;
} else if (itemId == R.id.menu_archive_chat) { } else if (itemId == R.id.menu_archive_chat) {

3
src/main/res/menu/conversation.xml
View file

@ -41,6 +41,9 @@
<item android:title="@string/menu_more_options"> <item android:title="@string/menu_more_options">
<menu> <menu>
<item android:title="@string/menu_add_attachment"
android:id="@+id/menu_add_attachment" />
<item android:id="@+id/menu_leave" <item android:id="@+id/menu_leave"
android:visible="false" android:visible="false"
android:title="@string/menu_leave_group"/> android:title="@string/menu_leave_group"/>