diff options
| author | Christian S <christian@pix-art.de> | 2016-02-04 19:31:23 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-02-04 19:31:23 +0100 |
| commit | 90afeee71767a5b14d9bcd25327e4e67ea881098 (patch) | |
| tree | e2bc2a477ee472ae3c4583f1bb7c2b469620e7cc | |
| parent | 1ae74784ca5466c879e678687f84f4b9b1e91420 (diff) | |
match new presence modifications
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Contact.java | 7 | ||||
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/ConversationActivity.java | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java index 91ceebffb..aba9a8091 100644 --- a/src/main/java/eu/siacs/conversations/entities/Contact.java +++ b/src/main/java/eu/siacs/conversations/entities/Contact.java @@ -153,9 +153,6 @@ public class Contact implements ListItem, Blockable { if (isBlocked()) { tags.add(new Tag("blocked", 0xff2e2f3b)); } - if (!getMostAvailableResource().equals("")){ - tags.add(new Tag(getMostAvailableResource(), 0xff37b8a9)); - } return tags; } @@ -251,10 +248,6 @@ public class Contact implements ListItem, Blockable { return p.getStatus(); } - public String getMostAvailableResource() { - return this.presences.getMostAvailableResource(); - } - public boolean setPhotoUri(String uri) { if (uri != null && !uri.equals(this.photoUri)) { this.photoUri = uri; diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java index 7fc40860c..657f7fc67 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationActivity.java @@ -56,6 +56,7 @@ import eu.siacs.conversations.entities.Blockable; import eu.siacs.conversations.entities.Contact; import eu.siacs.conversations.entities.Conversation; import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.Presence; import eu.siacs.conversations.entities.Transferable; import eu.siacs.conversations.entities.Presences; import eu.siacs.conversations.services.XmppConnectionService; @@ -384,7 +385,7 @@ public class ConversationActivity extends XmppActivity abtitle.setText(conversation.getName()); abtitle.setOnClickListener(this); if (conversation.getMode() == Conversation.MODE_SINGLE) { - if (conversation.getContact().getPresences().getMostAvailableStatus() == Presences.OFFLINE) { + if (conversation.getContact().getMostAvailableStatus() == Presence.Status.OFFLINE) { //ab.setSubtitle(getString(R.string.account_status_offline)); TextView absubtitle = (TextView) findViewById(android.R.id.text2); absubtitle.setText(getString(R.string.account_status_offline)); @@ -1711,7 +1712,6 @@ public class ConversationActivity extends XmppActivity startActivity(intent); } } -} public void setMessagesLoaded() { if (mConversationFragment != null) { |