Merge branch 'trz/rebase' into trz/rename

1 files changed, 3 insertions, 4 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/PresencesArrayAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/PresencesArrayAdapter.java
index 0b5cb897..2f8d12f2 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/PresencesArrayAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/PresencesArrayAdapter.java
@@ -6,7 +6,6 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
-import android.widget.ImageView;
 import android.widget.TextView;
 
 import java.util.ArrayList;
@@ -45,10 +44,10 @@ public class PresencesArrayAdapter extends ArrayAdapter<Presence> {
     private static Presence[] getPresenceArray(Presences presences) {
         ArrayList<Presence> presenceArrayList = new ArrayList<>();
         if (null != presences && null != presences.getPresences() && !presences.getPresences().isEmpty()) {
-            for (Map.Entry<String, Integer> entry : presences.getPresences().entrySet()) {
+            for (Map.Entry<String, de.thedevstack.conversationsplus.entities.Presence> entry : presences.getPresences().entrySet()) {
                 Presence p = new Presence();
                 p.resource = entry.getKey();
-                p.status = entry.getValue();
+                p.status = entry.getValue().getStatus();
                 presenceArrayList.add(p);
             }
             presenceArrayList.trimToSize();
@@ -59,5 +58,5 @@ public class PresencesArrayAdapter extends ArrayAdapter<Presence> {
 
 class Presence {
     String resource;
-    int status;
+    de.thedevstack.conversationsplus.entities.Presence.Status status;
 }