Sort primary account on top

pull/196/head
M66B 4 years ago
parent fcc09d538f
commit b54bc0cfa6

@ -2144,8 +2144,6 @@ Similarly, the primary identity of an account is used when the identity is ambig
There can be just one primary account and there can be just one primary identity per account. There can be just one primary account and there can be just one primary identity per account.
Note that ordering accounts via the navigation menu of the setup screen takes precedence over primary and secondary accounts.
<br /> <br />
<a name="faq73"></a> <a name="faq73"></a>

@ -426,6 +426,9 @@ public class ApplicationEx extends Application
} else if (version < 1533) { } else if (version < 1533) {
if (!prefs.contains("biometrics_notify")) if (!prefs.contains("biometrics_notify"))
editor.putBoolean("biometrics_notify", false); editor.putBoolean("biometrics_notify", false);
} else if (version < 1535) {
editor.remove("identities_asked");
editor.remove("identities_primary_hint");
} }
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !BuildConfig.DEBUG) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !BuildConfig.DEBUG)

@ -53,7 +53,7 @@ public interface DaoIdentity {
" WHERE (:account IS NULL OR account.id = :account)" + " WHERE (:account IS NULL OR account.id = :account)" +
" AND identity.synchronize" + " AND identity.synchronize" +
" AND account.synchronize" + " AND account.synchronize" +
" ORDER BY account.`order`, account.`primary` DESC, account.name COLLATE NOCASE" + " ORDER BY account.`primary` DESC, account.`order`, account.name COLLATE NOCASE" +
", identity.`primary` DESC, identity.display COLLATE NOCASE, identity.name COLLATE NOCASE, identity.email COLLATE NOCASE") ", identity.`primary` DESC, identity.display COLLATE NOCASE, identity.name COLLATE NOCASE, identity.email COLLATE NOCASE")
List<TupleIdentityEx> getComposableIdentities(Long account); List<TupleIdentityEx> getComposableIdentities(Long account);

Loading…
Cancel
Save