adapt to new api

deltachat · Feb 2, 2025 · 66ab287 · 66ab287
1 parent 9f62b9a
commit 66ab287
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/jni/dc_wrapper.c b/jni/dc_wrapper.c
@@ -1688,11 +1688,6 @@ JNIEXPORT jlong Java_com_b44t_messenger_DcMsg_getParentCPtr(JNIEnv *env, jobject
     return (jlong)dc_msg_get_parent(get_dc_msg(env, obj));
 }
 
-JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getOriginalChatId(JNIEnv *env, jobject obj)
-{
-    return (jint)dc_msg_get_original_chat_id(get_dc_msg(env, obj));
-}
-
 JNIEXPORT jint Java_com_b44t_messenger_DcMsg_getOriginalMsgId(JNIEnv *env, jobject obj)
 {
     return (jint)dc_msg_get_original_msg_id(get_dc_msg(env, obj));

diff --git a/src/main/java/com/b44t/messenger/DcMsg.java b/src/main/java/com/b44t/messenger/DcMsg.java
@@ -185,8 +185,6 @@ public DcMsg getParent() {
       return cPtr != 0 ? new DcMsg(cPtr) : null;
     }
 
-    public boolean    hasOriginal       () { return getOriginalChatId() != 0; }
-    public native int getOriginalChatId ();
     public native int getOriginalMsgId  ();
     public native int getSavedMsgId     ();
 

diff --git a/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java b/src/main/java/org/thoughtcrime/securesms/ConversationFragment.java
@@ -337,7 +337,7 @@ protected void setCorrectMenuVisibility(Menu menu) {
             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.menu_show_in_chat).setVisible(messageRecord.hasOriginal());
+            menu.findItem(R.id.menu_show_in_chat).setVisible(messageRecord.getOriginalMsgId() != 0);
         }
 
         // if one of the selected items cannot be saved, disable saving.
@@ -960,14 +960,11 @@ public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
                     return true;
               case R.id.menu_show_in_chat:
                     DcMsg savedMsg = getSelectedMessageRecord(getListAdapter().getSelectedItems());
-                    int originalChatId = savedMsg.getOriginalChatId();
-                    if (originalChatId != 0) {
+                    int originalMsgId = savedMsg.getOriginalMsgId();
+                    if (originalMsgId != 0) {
                       Intent intent = new Intent(getContext(), ConversationActivity.class);
-                      intent.putExtra(ConversationActivity.CHAT_ID_EXTRA, originalChatId);
-                      int originalMsgId = savedMsg.getOriginalMsgId();
-                      if (originalMsgId != 0) {
-                        intent.putExtra(ConversationActivity.STARTING_POSITION_EXTRA, DcMsg.getMessagePosition(dcContext.getMsg(originalMsgId), dcContext));
-                      }
+                      intent.putExtra(ConversationActivity.CHAT_ID_EXTRA, dcContext.getMsg(originalMsgId).getChatId());
+                      intent.putExtra(ConversationActivity.STARTING_POSITION_EXTRA, DcMsg.getMessagePosition(dcContext.getMsg(originalMsgId), dcContext));
                       startActivity(intent);
                     }
                     return true;