diff options
| author | Andreas Straub <andy@strb.org> | 2015-07-07 19:27:12 +0200 |
|---|---|---|
| committer | Andreas Straub <andy@strb.org> | 2015-07-19 21:32:27 +0200 |
| commit | 491f623708437f418497ecace2876e9c81708e72 (patch) | |
| tree | b4105023c411984e481fd90c9f307b6acc181893 /src/main/java/eu/siacs/conversations/ui | |
| parent | 0cf64857cfa8d42b8759ca2934af91d6060c55a5 (diff) | |
Fix displaying Contact IdentityKeys
Migrate ContactDetailsActivity to use new SQL IdentityKeys storage,
remove dead code from Contact class.
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java index fb04946a..2777b814 100644 --- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java @@ -377,7 +377,8 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd } }); } - for(final IdentityKey identityKey:contact.getAxolotlIdentityKeys()) { + for(final IdentityKey identityKey : xmppConnectionService.databaseBackend.loadIdentityKeys( + contact.getAccount(), contact.getJid().toBareJid().toString())) { hasKeys = true; View view = inflater.inflate(R.layout.contact_key, keys, false); TextView key = (TextView) view.findViewById(R.id.key); |