From c3c42e415ddd7832fea66766377fb4f0d935537a Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Mon, 5 Oct 2015 14:09:30 +0200
Subject: fixed imports

---
 .../conversationsplus/ui/adapter/PresencesArrayAdapter.java         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/java/de/thedevstack/conversationsplus/ui/adapter')

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..96faee91 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/PresencesArrayAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/PresencesArrayAdapter.java
@@ -12,9 +12,9 @@ import android.widget.TextView;
 import java.util.ArrayList;
 import java.util.Map;
 
-import de.thedevstack.conversationsplus.R;
-import de.thedevstack.conversationsplus.entities.Presences;
-import de.thedevstack.conversationsplus.utils.UIHelper;
+import eu.siacs.conversations.R;
+import eu.siacs.conversations.entities.Presences;
+import eu.siacs.conversations.utils.UIHelper;
 
 /**
  * Created by tzur on 27.09.2015.
-- 
cgit v1.2.3


From f24130321e419a49d07439af539f9e5167a5debc Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Fri, 12 Feb 2016 22:54:48 +0100
Subject: Imports organized

---
 .../thedevstack/conversationsplus/ui/adapter/PresencesArrayAdapter.java  | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/main/java/de/thedevstack/conversationsplus/ui/adapter')

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 96faee91..424c2a12 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;
-- 
cgit v1.2.3


From 1c983b3b0f92c547ab4b3ed0248b198d8e4dcd78 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Tue, 23 Feb 2016 13:12:48 +0100
Subject: Changed access to presences according to new Presence representation
 in C

---
 .../conversationsplus/ui/adapter/PresencesArrayAdapter.java         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/main/java/de/thedevstack/conversationsplus/ui/adapter')

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 424c2a12..e14d7f6b 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/PresencesArrayAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/PresencesArrayAdapter.java
@@ -44,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, eu.siacs.conversations.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();
@@ -58,5 +58,5 @@ public class PresencesArrayAdapter extends ArrayAdapter<Presence> {
 
 class Presence {
     String resource;
-    int status;
+    eu.siacs.conversations.entities.Presence.Status status;
 }
-- 
cgit v1.2.3