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 @@ + +