UI/Models/MessageGroup.cs

@@ -3,6 +3,20 @@ using System.Collections.Generic;
 
 namespace pEp.UI.Models
 {
+    public struct pEpMember
+    {
+        public pEpCOMServerAdapterLib.pEpIdentity ident;
+        public bool joined;
+    }
+
+    public struct pEpGroup
+    {
+        public pEpCOMServerAdapterLib.pEpIdentity groupIdentity;
+        public pEpCOMServerAdapterLib.pEpIdentity manager;
+        public pEpMember[] members;
+        public bool active;
+    };
+
     internal class MessageGroup
     {
         /// <summary>
@@ -80,10 +94,9 @@ namespace pEp.UI.Models
         /// <param name="groupManager">The group manager.</param>
         /// <param name="memberList">The list of members.</param>
         /// <returns></returns>
-        public static MessageGroup Create(pEpIdentity groupIdentity, pEpIdentity groupManager, List<pEpIdentity> memberList)
+        public static void Create(pEpIdentity groupIdentity, pEpIdentity groupManager, List<pEpIdentity> memberList)
         {
-            pEpGroup newGroup = (pEpGroup)AdapterExtensions.ExecuteAndLogError(() => ThisAddIn.PEPEngine.GroupCreate(groupIdentity, groupManager, memberList.ToArray()));
-            return new MessageGroup(newGroup);
+            AdapterExtensions.ExecuteAndLogError(() => ThisAddIn.PEPEngine.GroupCreate(groupIdentity, groupManager, memberList.ToArray()));
         }
     }
 }

UI/ViewModels/MessageGroupViewModel.cs

@@ -99,7 +99,7 @@ namespace pEp.UI.ViewModels
 
             foreach (var member in messageGroup.GroupMembers)
             {
-                this.GroupMembers.Add(new MessageGroupMemberViewModel(this, new PEPIdentity(member.ident)));
+                this.GroupMembers.Add(new MessageGroupMemberViewModel(this, new PEPIdentity(member.ident.Address)));
             }
         }