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

remove save/unsave action

Browse source
This commit is contained in:
adbenitez 2025-02-07 12:39:55 +01:00
parent ec7807e662
commit 0fa59fa22d
5 changed files with 4 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/b44t/messenger/DcMsg.java
View file

@ -193,10 +193,6 @@ public class DcMsg {
return !isInfo() && getType() != DC_MSG_VIDEOCHAT_INVITATION;
}
public boolean isSaved() {
return getOriginalMsgId() != 0 || getSavedMsgId() != 0;
}
public File getFileAsFile() {
if(getFile()==null)
throw new AssertionError("expected a file to be present.");

23
src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
View file

@ -326,7 +326,6 @@ public class ConversationFragment extends MessageSelectorFragment
menu.findItem(R.id.menu_context_reply).setVisible(false);
menu.findItem(R.id.menu_context_reply_privately).setVisible(false);
menu.findItem(R.id.menu_add_to_home_screen).setVisible(false);
menu.findItem(R.id.toggle_save).setVisible(false);
} else {
DcMsg messageRecord = messageRecords.iterator().next();
DcChat chat = getListAdapter().getChat();
@ -337,9 +336,6 @@ public class ConversationFragment extends MessageSelectorFragment
boolean showReplyPrivately = chat.isMultiUser() && !messageRecord.isOutgoing() && canReply;
menu.findItem(R.id.menu_context_reply_privately).setVisible(showReplyPrivately);
menu.findItem(R.id.menu_add_to_home_screen).setVisible(messageRecord.getType() == DcMsg.DC_MSG_WEBXDC);
menu.findItem(R.id.toggle_save).setVisible(!chat.isSelfTalk() && messageRecord.canSave());
menu.findItem(R.id.toggle_save).setIcon(messageRecord.isSaved() ? R.drawable.baseline_star_24 : R.drawable.baseline_star_outline_24);
}
// if one of the selected items cannot be saved, disable saving.
@ -482,21 +478,6 @@ public class ConversationFragment extends MessageSelectorFragment
}
}
private void handleToggleSave(final Set<DcMsg> messageRecords) {
DcMsg msg = getSelectedMessageRecord(messageRecords);
if (getListAdapter().getChat().isSelfTalk()) {
if (msg.getOriginalMsgId() != 0) {
dcContext.deleteMsgs(new int[]{msg.getId()});
} else {
handleDeleteMessages((int) chatId, messageRecords);
}
} else if (msg.getSavedMsgId() != 0) {
dcContext.deleteMsgs(new int[]{msg.getSavedMsgId()});
} else {
dcContext.saveMsgs(new int[]{msg.getId()});
}
}
private void reloadList() {
reloadList(false);
}
@ -980,10 +961,6 @@ public class ConversationFragment extends MessageSelectorFragment
case R.id.menu_context_reply_privately:
handleReplyMessagePrivately(getSelectedMessageRecord(getListAdapter().getSelectedItems()));
return true;
case R.id.toggle_save:
handleToggleSave(getListAdapter().getSelectedItems());
actionMode.finish();
return true;
case R.id.menu_resend:
handleResendMessage(getListAdapter().getSelectedItems());
return true;

2
src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
View file

@ -73,7 +73,7 @@ public class ConversationItemFooter extends LinearLayout {
private void presentDate(@NonNull DcMsg messageRecord) {
dateView.forceLayout();
String text = DateUtils.getExtendedRelativeTimeSpanString(getContext(), messageRecord.getTimestamp());
if (messageRecord.isSaved()) {
if (messageRecord.getOriginalMsgId() != 0 || messageRecord.getSavedMsgId() != 0) {
text += " ★";
}
dateView.setText(text);

4
src/main/java/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java
View file

@ -27,7 +27,6 @@ public class ConversationAdaptiveActionsToolbar extends Toolbar {
private static final int ID_NEVER_SHOW_AS_ACTION_2 = R.id.menu_add_to_home_screen;
private static final int ID_NEVER_SHOW_AS_ACTION_3 = R.id.menu_context_save_attachment;
private static final int ID_NEVER_SHOW_AS_ACTION_4 = R.id.menu_resend;
private static final int ID_NEVER_SHOW_AS_ACTION_5 = R.id.menu_context_details;
private static final int ID_ALWAYS_SHOW_AS_ACTION = R.id.menu_context_forward;
private final int maxShown;
@ -84,8 +83,7 @@ public class ConversationAdaptiveActionsToolbar extends Toolbar {
boolean neverShowAsAction = item.getItemId() == ID_NEVER_SHOW_AS_ACTION_1
|| item.getItemId() == ID_NEVER_SHOW_AS_ACTION_2
|| item.getItemId() == ID_NEVER_SHOW_AS_ACTION_3
|| item.getItemId() == ID_NEVER_SHOW_AS_ACTION_4
|| item.getItemId() == ID_NEVER_SHOW_AS_ACTION_5;
|| item.getItemId() == ID_NEVER_SHOW_AS_ACTION_4;
boolean alwaysShowAsAction = item.getItemId() == ID_ALWAYS_SHOW_AS_ACTION;
if (alwaysShowAsAction) continue;

9
src/main/res/menu/conversation_context.xml
View file

@ -5,15 +5,10 @@
android:icon="?menu_reply_icon"
app:showAsAction="always" />
<item android:title="@string/save"
android:id="@+id/toggle_save"
android:icon="@drawable/baseline_star_outline_24"
app:showAsAction="always" />
<item android:title="@string/info"
<item android:title="@string/menu_message_details"
android:id="@+id/menu_context_details"
android:icon="?menu_info_icon"
app:showAsAction="never" />
app:showAsAction="always" />
<item android:title="@string/menu_delete_messages"
android:id="@+id/menu_context_delete_message"