diff --git a/.github/mergeable.yml b/.github/mergeable.yml new file mode 100644 index 000000000..a63d9f6d5 --- /dev/null +++ b/.github/mergeable.yml @@ -0,0 +1,22 @@ +version: 2 +mergeable: + - when: pull_request.* + name: "Changelog check" + validate: + - do: or + validate: + - do: description + must_include: + regex: '#skip-changelog' + - do: and + validate: + - do: dependent + changed: + file: '**/*.java' + required: ['CHANGELOG.md'] + fail: + - do: checks + status: 'action_required' + payload: + title: CHANGELOG.md might need an update + summary: "Please update CHANGELOG.md or add #skip-changelog to the description" diff --git a/CHANGELOG.md b/CHANGELOG.md index 9f0165b2b..71b9004c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Delta Chat Android Changelog +## Unreleased + +* allow to edit messages +* allow to delete messages for everyone +* add menu option to easily save/unsave selected message +* improve deletion confirmation for "Device Messages" + ## v1.54.4 2025-03 diff --git a/jni/dc_wrapper.c b/jni/dc_wrapper.c index 6d175246f..bbf24a41f 100644 --- a/jni/dc_wrapper.c +++ b/jni/dc_wrapper.c @@ -685,6 +685,15 @@ JNIEXPORT void Java_com_b44t_messenger_DcContext_deleteMsgs(JNIEnv *env, jobject } +JNIEXPORT void Java_com_b44t_messenger_DcContext_sendDeleteRequest(JNIEnv *env, jobject obj, jintArray msg_ids) +{ + int msg_ids_cnt = 0; + uint32_t* msg_ids_ptr = jintArray2uint32Pointer(env, msg_ids, &msg_ids_cnt); + dc_send_delete_request(get_dc_context(env, obj), msg_ids_ptr, msg_ids_cnt); + free(msg_ids_ptr); +} + + JNIEXPORT void Java_com_b44t_messenger_DcContext_forwardMsgs(JNIEnv *env, jobject obj, jintArray msg_ids, jint chat_id) { int msg_ids_cnt = 0; diff --git a/src/main/java/com/b44t/messenger/DcContext.java b/src/main/java/com/b44t/messenger/DcContext.java index 55eeb0658..96562b95c 100644 --- a/src/main/java/com/b44t/messenger/DcContext.java +++ b/src/main/java/com/b44t/messenger/DcContext.java @@ -194,6 +194,7 @@ public class DcContext { public native int getFreshMsgCount (int chat_id); public native int estimateDeletionCount(boolean from_server, long seconds); public native void deleteMsgs (int msg_ids[]); + public native void sendDeleteRequest (int msg_ids[]); public native void forwardMsgs (int msg_ids[], int chat_id); public native void saveMsgs (int msg_ids[]); public native boolean resendMsgs (int msg_ids[]); diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java index 954c7610b..f0db43f5b 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationActivity.java @@ -1111,7 +1111,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity doSend = VideoRecoder.prepareVideo(ConversationActivity.this, dcChat.getId(), msg); Util.runOnMain(() -> { try { - progressDialog.dismiss(); + if (progressDialog != null) progressDialog.dismiss(); } catch (final IllegalArgumentException e) { // The activity is finishing/destroyed, do nothing. } diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java index d64f65f82..09e4f5360 100644 --- a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java @@ -327,6 +327,7 @@ public class ConversationFragment extends MessageSelectorFragment menu.findItem(R.id.menu_context_edit).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.menu_toggle_save).setVisible(false); } else { DcMsg messageRecord = messageRecords.iterator().next(); DcChat chat = getListAdapter().getChat(); @@ -339,6 +340,12 @@ 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); + + boolean saved = messageRecord.getSavedMsgId() != 0; + MenuItem toggleSave = menu.findItem(R.id.menu_toggle_save); + toggleSave.setVisible(messageRecord.canSave() && !chat.isSelfTalk()); + toggleSave.setIcon(saved? R.drawable.baseline_bookmark_remove_24 : R.drawable.baseline_bookmark_border_24); + toggleSave.setTitle(saved? R.string.unsave : R.string.save); } // if one of the selected items cannot be saved, disable saving. @@ -365,8 +372,7 @@ public class ConversationFragment extends MessageSelectorFragment } static boolean canEditMsg(DcMsg dcMsg) { - return false; // don't allow to edit for now - // return dcMsg.isOutgoing() && !dcMsg.isInfo() && dcMsg.getType() != DcMsg.DC_MSG_VIDEOCHAT_INVITATION && !dcMsg.hasHtml() && !dcMsg.getText().isEmpty(); + return dcMsg.isOutgoing() && !dcMsg.isInfo() && dcMsg.getType() != DcMsg.DC_MSG_VIDEOCHAT_INVITATION && !dcMsg.hasHtml() && !dcMsg.getText().isEmpty(); } public void handleClearChat() { @@ -496,6 +502,15 @@ public class ConversationFragment extends MessageSelectorFragment } } + private void handleToggleSave(final Set messageRecords) { + DcMsg msg = getSelectedMessageRecord(messageRecords); + if (msg.getSavedMsgId() != 0) { + dcContext.deleteMsgs(new int[]{msg.getSavedMsgId()}); + } else { + dcContext.saveMsgs(new int[]{msg.getId()}); + } + } + private void reloadList() { reloadList(false); } @@ -988,9 +1003,12 @@ public class ConversationFragment extends MessageSelectorFragment } else if (itemId == R.id.menu_resend) { handleResendMessage(getListAdapter().getSelectedItems()); return true; + } else if (itemId == R.id.menu_toggle_save) { + handleToggleSave(getListAdapter().getSelectedItems()); + actionMode.finish(); + return true; } - - return false; + return false; } } diff --git a/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java index 624facbfb..b603d2eff 100644 --- a/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java @@ -43,6 +43,7 @@ import androidx.loader.content.Loader; import androidx.viewpager.widget.PagerAdapter; import androidx.viewpager.widget.ViewPager; +import com.b44t.messenger.DcChat; import com.b44t.messenger.DcContext; import com.b44t.messenger.DcMediaGalleryElement; import com.b44t.messenger.DcMsg; @@ -340,26 +341,36 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity return; } - String text = getResources().getQuantityString(R.plurals.ask_delete_messages, 1, 1); + DcMsg dcMsg = dcContext.getMsg(mediaItem.msgId); + DcChat dcChat = dcContext.getChat(dcMsg.getChatId()); + + String text = getResources().getQuantityString( + dcChat.isDeviceTalk() ? R.plurals.ask_delete_messages_simple : R.plurals.ask_delete_messages, + 1, 1); + int positiveBtnLabel = dcChat.isSelfTalk() ? R.string.delete : R.string.delete_for_me; + final int[] messageIds = new int[]{mediaItem.msgId}; AlertDialog.Builder builder = new AlertDialog.Builder(this); builder.setMessage(text); builder.setCancelable(true); - - builder.setPositiveButton(R.string.delete, (dialogInterface, which) -> { - new AsyncTask() { - @Override - protected Void doInBackground(Void... voids) { - dcContext.deleteMsgs(new int[]{mediaItem.msgId}); - return null; - } - }.execute(); - + builder.setNeutralButton(android.R.string.cancel, null); + builder.setPositiveButton(positiveBtnLabel, (dialogInterface, which) -> { + Util.runOnAnyBackgroundThread(() -> dcContext.deleteMsgs(messageIds)); finish(); }); - builder.setNegativeButton(android.R.string.cancel, null); - AlertDialog dialog = builder.show(); - Util.redPositiveButton(dialog); + + if(dcChat.canSend() && !dcChat.isSelfTalk() && dcMsg.isOutgoing()) { + builder.setNegativeButton(R.string.delete_for_everyone, (d, which) -> { + Util.runOnAnyBackgroundThread(() -> dcContext.sendDeleteRequest(messageIds)); + finish(); + }); + AlertDialog dialog = builder.show(); + Util.redButton(dialog, AlertDialog.BUTTON_NEGATIVE); + Util.redPositiveButton(dialog); + } else { + AlertDialog dialog = builder.show(); + Util.redPositiveButton(dialog); + } } @Override diff --git a/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java b/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java index 763a46174..82ca25928 100644 --- a/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/MessageSelectorFragment.java @@ -61,20 +61,46 @@ public abstract class MessageSelectorFragment } protected void handleDeleteMessages(int chatId, final int[] messageIds) { - DcChat dcChat = DcHelper.getContext(getActivity()).getChat(chatId); + DcChat dcChat = dcContext.getChat(chatId); + boolean canDeleteForAll = true; + if (dcChat.canSend() && !dcChat.isSelfTalk()) { + for(int msgId : messageIds) { + DcMsg msg = dcContext.getMsg(msgId); + if (!msg.isOutgoing() || msg.isInfo()) { + canDeleteForAll = false; + break; + } + } + } else { + canDeleteForAll = false; + } - String text = getActivity().getResources().getQuantityString(R.plurals.ask_delete_messages, messageIds.length, messageIds.length); + String text = getActivity().getResources().getQuantityString( + dcChat.isDeviceTalk() ? R.plurals.ask_delete_messages_simple : R.plurals.ask_delete_messages, + messageIds.length, messageIds.length); + int positiveBtnLabel = dcChat.isSelfTalk() ? R.string.delete : R.string.delete_for_me; - AlertDialog dialog = new AlertDialog.Builder(getActivity()) - .setMessage(text) - .setCancelable(true) - .setPositiveButton(R.string.delete, (d, which) -> { - dcContext.deleteMsgs(messageIds); - if (actionMode != null) actionMode.finish(); - }) - .setNegativeButton(android.R.string.cancel, null) - .show(); - Util.redPositiveButton(dialog); + AlertDialog.Builder builder = new AlertDialog.Builder(requireActivity()) + .setMessage(text) + .setCancelable(true) + .setNeutralButton(android.R.string.cancel, null) + .setPositiveButton(positiveBtnLabel, (d, which) -> { + dcContext.deleteMsgs(messageIds); + if (actionMode != null) actionMode.finish(); + }); + + if(canDeleteForAll) { + builder.setNegativeButton(R.string.delete_for_everyone, (d, which) -> { + dcContext.sendDeleteRequest(messageIds); + if (actionMode != null) actionMode.finish(); + }); + AlertDialog dialog = builder.show(); + Util.redButton(dialog, AlertDialog.BUTTON_NEGATIVE); + Util.redPositiveButton(dialog); + } else { + AlertDialog dialog = builder.show(); + Util.redPositiveButton(dialog); + } } protected void handleSaveAttachment(final Set messageRecords) { diff --git a/src/main/java/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java b/src/main/java/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java index 350932b67..d6b40a492 100644 --- a/src/main/java/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java +++ b/src/main/java/org/thoughtcrime/securesms/util/views/ConversationAdaptiveActionsToolbar.java @@ -27,6 +27,7 @@ public class ConversationAdaptiveActionsToolbar extends Toolbar { private static final int ID_ACTION_2 = R.id.menu_context_copy; private static final int ID_ACTION_3 = R.id.menu_context_share; private static final int ID_ACTION_4 = R.id.menu_context_forward; + private static final int ID_ACTION_5 = R.id.menu_toggle_save; private final int maxShown; @@ -79,7 +80,8 @@ public class ConversationAdaptiveActionsToolbar extends Toolbar { boolean showAsAction = item.getItemId() == ID_ACTION_1 || item.getItemId() == ID_ACTION_2 || item.getItemId() == ID_ACTION_3 - || item.getItemId() == ID_ACTION_4; + || item.getItemId() == ID_ACTION_4 + || item.getItemId() == ID_ACTION_5; if (showAsAction && item.isVisible() && nItemsToShow > 0) { item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); diff --git a/src/main/res/drawable/baseline_bookmark_border_24.xml b/src/main/res/drawable/baseline_bookmark_border_24.xml new file mode 100644 index 000000000..d64b0ea27 --- /dev/null +++ b/src/main/res/drawable/baseline_bookmark_border_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/src/main/res/drawable/baseline_bookmark_remove_24.xml b/src/main/res/drawable/baseline_bookmark_remove_24.xml new file mode 100644 index 000000000..1fb5c5a92 --- /dev/null +++ b/src/main/res/drawable/baseline_bookmark_remove_24.xml @@ -0,0 +1,3 @@ + + + diff --git a/src/main/res/menu/conversation_context.xml b/src/main/res/menu/conversation_context.xml index ff88646c6..56625123d 100644 --- a/src/main/res/menu/conversation_context.xml +++ b/src/main/res/menu/conversation_context.xml @@ -1,5 +1,10 @@ + + Delete %d message on all your devices? Delete %d messages on all your devices? - + Delete %d message? Delete %d messages?