From 3914bf7ff43922d54629ec9d134eae89fbf4054d Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Sat, 23 Jan 2021 19:52:10 +0100
Subject: [PATCH] adapt to removed dc_contact_get_first_name() api

use dc_contact_get_display_name() instead
---
 jni/dc_wrapper.c                                         | 9 ---------
 jni/deltachat-core-rust                                  | 2 +-
 src/com/b44t/messenger/DcContact.java                    | 1 -
 .../securesms/ConversationVideochatItem.java             | 2 +-
 .../securesms/map/GenerateInfoWindowTask.java            | 2 +-
 .../securesms/notifications/NotificationCenter.java      | 4 ++--
 6 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/jni/dc_wrapper.c b/jni/dc_wrapper.c
index e2753cdca..5a2f9beb1 100644
--- a/jni/dc_wrapper.c
+++ b/jni/dc_wrapper.c
@@ -1477,15 +1477,6 @@ JNIEXPORT jstring Java_com_b44t_messenger_DcContact_getDisplayName(JNIEnv *env,
 }
 
 
-JNIEXPORT jstring Java_com_b44t_messenger_DcContact_getFirstName(JNIEnv *env, jobject obj)
-{
-    char* temp = dc_contact_get_first_name(get_dc_contact(env, obj));
-        jstring ret = JSTRING_NEW(temp);
-    dc_str_unref(temp);
-    return ret;
-}
-
-
 JNIEXPORT jstring Java_com_b44t_messenger_DcContact_getAddr(JNIEnv *env, jobject obj)
 {
     char* temp = dc_contact_get_addr(get_dc_contact(env, obj));
diff --git a/jni/deltachat-core-rust b/jni/deltachat-core-rust
index e2688f635..b09e27c53 160000
--- a/jni/deltachat-core-rust
+++ b/jni/deltachat-core-rust
@@ -1 +1 @@
-Subproject commit e2688f63556edb68f4585892f67e1bbe6eb7607f
+Subproject commit b09e27c536883777f6900ec0e7a305ac78a4f63d
diff --git a/src/com/b44t/messenger/DcContact.java b/src/com/b44t/messenger/DcContact.java
index d1e545304..7306138c6 100644
--- a/src/com/b44t/messenger/DcContact.java
+++ b/src/com/b44t/messenger/DcContact.java
@@ -50,7 +50,6 @@ public class DcContact {
     public native int     getId          ();
     public native String  getName        ();
     public native String  getDisplayName ();
-    public native String  getFirstName   ();
     public native String  getAddr        ();
     public native String  getNameNAddr   ();
     public native String  getProfileImage();
diff --git a/src/org/thoughtcrime/securesms/ConversationVideochatItem.java b/src/org/thoughtcrime/securesms/ConversationVideochatItem.java
index 7136e4b2f..704c45657 100644
--- a/src/org/thoughtcrime/securesms/ConversationVideochatItem.java
+++ b/src/org/thoughtcrime/securesms/ConversationVideochatItem.java
@@ -67,7 +67,7 @@ public class ConversationVideochatItem extends LinearLayout
     DcContact dcContact = dcContext.getContact(dcMsg.getFromId());
 
     CharSequence line1 = dcMsg.isOutgoing()? getContext().getString(R.string.videochat_you_invited_hint) :
-            getContext().getString(R.string.videochat_contact_invited_hint, dcContact.getFirstName());
+            getContext().getString(R.string.videochat_contact_invited_hint, dcContact.getDisplayName());
     CharSequence line2 = Util.getBoldedString(dcMsg.isOutgoing()? getContext().getString(R.string.videochat_tap_to_open) :
             getContext().getString(R.string.videochat_tap_to_join));
 
diff --git a/src/org/thoughtcrime/securesms/map/GenerateInfoWindowTask.java b/src/org/thoughtcrime/securesms/map/GenerateInfoWindowTask.java
index b8f822401..77e6c4f7d 100644
--- a/src/org/thoughtcrime/securesms/map/GenerateInfoWindowTask.java
+++ b/src/org/thoughtcrime/securesms/map/GenerateInfoWindowTask.java
@@ -96,7 +96,7 @@ class GenerateInfoWindowTask extends AsyncTask<Feature, Bitmap, Bitmap> {
 
             DcContact contact = DcHelper.getContext(callbackRef.get().getContext()).getContact(contactId);
             TextView contactTextView = bubbleLayout.findViewById(R.id.message_sender);
-            contactTextView.setText(contact.getFirstName());
+            contactTextView.setText(contact.getDisplayName());
 
             String msgText;
             if (messageId != 0) {
diff --git a/src/org/thoughtcrime/securesms/notifications/NotificationCenter.java b/src/org/thoughtcrime/securesms/notifications/NotificationCenter.java
index 9135d293a..21359548e 100644
--- a/src/org/thoughtcrime/securesms/notifications/NotificationCenter.java
+++ b/src/org/thoughtcrime/securesms/notifications/NotificationCenter.java
@@ -331,7 +331,7 @@ public class NotificationCenter {
             DcMsg dcMsg = dcContext.getMsg(msgId);
             String line = privacy.isDisplayMessage()? dcMsg.getSummarytext(2000) : context.getString(R.string.notify_new_message);
             if (dcChat.isGroup() && privacy.isDisplayContact()) {
-                line = dcContext.getContact(dcMsg.getFromId()).getFirstName() + ": " + line;
+                line = dcContext.getContact(dcMsg.getFromId()).getDisplayName() + ": " + line;
             }
 
             // play signal?
@@ -368,7 +368,7 @@ public class NotificationCenter {
             // prepend the sender in the ticker also for one-to-one chats (for group-chats, this is already done)
             String tickerLine = line;
             if (!dcChat.isGroup() && privacy.isDisplayContact()) {
-                line = dcContext.getContact(dcMsg.getFromId()).getFirstName() + ": " + line;
+                line = dcContext.getContact(dcMsg.getFromId()).getDisplayName() + ": " + line;
             }
             builder.setTicker(tickerLine);