From 1d7d0dd3298af3a030c98633f12afc697417f295 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Fri, 11 Jul 2025 16:01:10 +0200 Subject: [PATCH 1/4] allow to "move to top" accounts in the account selector --- src/main/java/com/b44t/messenger/rpc/Rpc.java | 4 +++ .../AccountSelectionListFragment.java | 28 +++++++++++++++++++ src/main/res/menu/account_item_context.xml | 3 ++ 3 files changed, 35 insertions(+) diff --git a/src/main/java/com/b44t/messenger/rpc/Rpc.java b/src/main/java/com/b44t/messenger/rpc/Rpc.java index 0fc5cc82d..7bb4a76ff 100644 --- a/src/main/java/com/b44t/messenger/rpc/Rpc.java +++ b/src/main/java/com/b44t/messenger/rpc/Rpc.java @@ -164,6 +164,10 @@ public class Rpc { return gson.fromJson(getResult("create_broadcast", accountId, chatName), Integer.class); } + public void setAccountsOrder(List order) throws RpcException { + getResult("set_accounts_order", order); + } + private static class Request { private final String jsonrpc = "2.0"; public final String method; diff --git a/src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java b/src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java index 008760d2b..b9256b1b2 100644 --- a/src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java +++ b/src/main/java/org/thoughtcrime/securesms/accounts/AccountSelectionListFragment.java @@ -41,6 +41,8 @@ import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.ViewUtil; +import java.util.Arrays; + public class AccountSelectionListFragment extends DialogFragment implements DcEventCenter.DcEventDelegate { private static final String TAG = AccountSelectionListFragment.class.getSimpleName(); @@ -134,9 +136,35 @@ public class AccountSelectionListFragment extends DialogFragment implements DcEv onToggleMute(accountId); } else if (itemId == R.id.menu_set_tag) { onSetTag(accountId); + } else if (itemId == R.id.menu_move_to_top) { + onMoveToTop(accountId); } } + private void onMoveToTop(int accountId) { + Activity activity = getActivity(); + if (activity == null) return; + + int[] accountIds = DcHelper.getAccounts(activity).getAll(); + Integer[] ids = new Integer[accountIds.length]; + ids[0] = accountId; + int j = 1; + for (int accId : accountIds) { + if (accId != accountId) { + ids[j++] = accId; + } + } + + Rpc rpc = DcHelper.getRpc(activity); + try { + rpc.setAccountsOrder(Arrays.asList(ids)); + } catch (RpcException e) { + Log.e(TAG, "Error calling rpc.setAccountsOrder()", e); + } + + refreshData(); + } + private void onSetTag(int accountId) { Activity activity = getActivity(); if (activity == null) return; diff --git a/src/main/res/menu/account_item_context.xml b/src/main/res/menu/account_item_context.xml index 32a27fae3..f29516dd5 100644 --- a/src/main/res/menu/account_item_context.xml +++ b/src/main/res/menu/account_item_context.xml @@ -8,6 +8,9 @@ + + From 410072358dfb7a366dc650be991a1730a94ce927 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Fri, 11 Jul 2025 16:01:32 +0200 Subject: [PATCH 2/4] temporarily check core's main branch with "set_accounts_order" support --- jni/deltachat-core-rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jni/deltachat-core-rust b/jni/deltachat-core-rust index 192a6a2b9..6406f305b 160000 --- a/jni/deltachat-core-rust +++ b/jni/deltachat-core-rust @@ -1 +1 @@ -Subproject commit 192a6a2b9dd9413eb175e1c3e88b93a6b59d515a +Subproject commit 6406f305b828fdbdb4da670102c0ca5302f933a3 From 3d6dc80d8aa73f89b51dfd2ec2fb5fbb62cfee5a Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sat, 12 Jul 2025 01:12:13 +0200 Subject: [PATCH 3/4] update deltachat-core-rust to 'chore(release): prepare for 2.1.0' of 'v2.1.0' --- jni/deltachat-core-rust | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jni/deltachat-core-rust b/jni/deltachat-core-rust index 6406f305b..402e42f85 160000 --- a/jni/deltachat-core-rust +++ b/jni/deltachat-core-rust @@ -1 +1 @@ -Subproject commit 6406f305b828fdbdb4da670102c0ca5302f933a3 +Subproject commit 402e42f858514e5c1fbab3c88ad3d5f884009b8b From 9104971baa0c8cc5ba683a09bd07039b1cb98d3a Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sat, 12 Jul 2025 01:13:37 +0200 Subject: [PATCH 4/4] update changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f82f9f021..da7cbd684 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,7 +15,8 @@ * Improved separation between unencryted chats/contacts and encrypted ones, avoiding mixing of encrypted and unencrypted messages in the same chat * Removed padlocks, as encrypted is the default "normal" state. Instead, unencrypted email is marked with a small email / letter (✉️) icon * Classic email chats/threads get a big email / letter icon making it easy to recognize -* Update to core 2.0.0 +* Allow to sort profiles up in the profile switcher +* Update to core 2.1.0 ## v1.58.4 2025-05