From c1eff8362f751a6cba39f17e65d53fee65e7ab5e Mon Sep 17 00:00:00 2001 From: adbenitez Date: Thu, 20 Mar 2025 17:38:57 +0100 Subject: [PATCH 1/2] use Rpc.createContact() to set contact's name --- src/main/java/com/b44t/messenger/rpc/Rpc.java | 4 ++++ .../org/thoughtcrime/securesms/ProfileActivity.java | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/b44t/messenger/rpc/Rpc.java b/src/main/java/com/b44t/messenger/rpc/Rpc.java index be9258585..f0f70f358 100644 --- a/src/main/java/com/b44t/messenger/rpc/Rpc.java +++ b/src/main/java/com/b44t/messenger/rpc/Rpc.java @@ -129,6 +129,10 @@ public class Rpc { return getResult("get_account_file_size", accountId).getAsInt(); } + public int createContact(int accountId, String email, String name) throws RpcException { + return getResult("create_contact", accountId, email, name).getAsInt(); + } + public int addAccount() throws RpcException { return getResult("add_account").getAsInt(); } diff --git a/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java b/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java index fab44a1d2..639660ec0 100644 --- a/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java @@ -29,6 +29,8 @@ import com.b44t.messenger.DcChat; import com.b44t.messenger.DcContact; import com.b44t.messenger.DcContext; import com.b44t.messenger.DcEvent; +import com.b44t.messenger.rpc.Rpc; +import com.b44t.messenger.rpc.RpcException; import com.google.android.material.tabs.TabLayout; import org.thoughtcrime.securesms.connect.DcEventCenter; @@ -63,6 +65,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity private static final int REQUEST_CODE_PICK_RINGTONE = 1; private DcContext dcContext; + private Rpc rpc; private int chatId; private boolean chatIsMultiUser; private boolean chatIsDeviceTalk; @@ -82,6 +85,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity dynamicTheme = new DynamicNoActionBarTheme(); super.onPreCreate(); dcContext = DcHelper.getContext(this); + rpc = DcHelper.getRpc(this); } @Override @@ -536,6 +540,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity } } else { + int accountId = dcContext.getAccountId(); DcContact dcContact = dcContext.getContact(contactId); String authName = dcContact.getAuthName(); @@ -555,7 +560,11 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity .setView(gl) .setPositiveButton(android.R.string.ok, (dialog, whichButton) -> { String newName = inputField.getText().toString(); - dcContext.createContact(newName, dcContact.getAddr()); + try { + rpc.createContact(accountId, dcContact.getAddr(), newName); + } catch (RpcException e) { + e.printStackTrace(); + } }) .setNegativeButton(android.R.string.cancel, null) .setCancelable(false) From b14b8eea9d2a50a8a3b5286a59ab40bd148b33e8 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Thu, 20 Mar 2025 18:41:11 +0100 Subject: [PATCH 2/2] use change_contact_name --- src/main/java/com/b44t/messenger/rpc/Rpc.java | 4 ++-- src/main/java/org/thoughtcrime/securesms/ProfileActivity.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/b44t/messenger/rpc/Rpc.java b/src/main/java/com/b44t/messenger/rpc/Rpc.java index f0f70f358..2b588cdc9 100644 --- a/src/main/java/com/b44t/messenger/rpc/Rpc.java +++ b/src/main/java/com/b44t/messenger/rpc/Rpc.java @@ -129,8 +129,8 @@ public class Rpc { return getResult("get_account_file_size", accountId).getAsInt(); } - public int createContact(int accountId, String email, String name) throws RpcException { - return getResult("create_contact", accountId, email, name).getAsInt(); + public void changeContactName(int accountId, int contactId, String name) throws RpcException { + getResult("change_contact_name", accountId, contactId, name); } public int addAccount() throws RpcException { diff --git a/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java b/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java index 639660ec0..cdec752ab 100644 --- a/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java +++ b/src/main/java/org/thoughtcrime/securesms/ProfileActivity.java @@ -561,7 +561,7 @@ public class ProfileActivity extends PassphraseRequiredActionBarActivity .setPositiveButton(android.R.string.ok, (dialog, whichButton) -> { String newName = inputField.getText().toString(); try { - rpc.createContact(accountId, dcContact.getAddr(), newName); + rpc.changeContactName(accountId, contactId, newName); } catch (RpcException e) { e.printStackTrace(); }