fixed the rooms

.idea/deploymentTargetDropDown.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="deploymentTargetDropDown">
-    <targetSelectedWithDropDown>
+    <runningDeviceTargetSelectedWithDropDown>
       <Target>
-        <type value="QUICK_BOOT_TARGET" />
+        <type value="RUNNING_DEVICE_TARGET" />
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\poliv\.android\avd\Copy_of_R_of_Pixel_API_31.avd" />
+            <value value="C:\Users\poliv\.android\avd\of_R_of_Pixel_API_31.avd" />
           </Key>
         </deviceKey>
       </Target>
-    </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-06-17T10:25:57.059913900Z" />
+    </runningDeviceTargetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2022-07-21T14:24:56.902804Z" />
   </component>
 </project>

.idea/misc.xml

@@ -3,11 +3,15 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="..\:/Users/poliv/AndroidStudioProjects/test2Smack/app/src/main/res/drawable-v24/ic_launcher_foreground.xml" value="0.2025" />
+        <entry key="..\:/Users/poliv/AndroidStudioProjects/test2Smack/app/src/main/res/drawable/ic_launcher_background.xml" value="0.2025" />
         <entry key="..\:/Users/poliv/AndroidStudioProjects/test2Smack/app/src/main/res/layout/activity_chat.xml" value="0.22" />
         <entry key="..\:/Users/poliv/AndroidStudioProjects/test2Smack/app/src/main/res/layout/activity_chats_list.xml" value="0.3546875" />
-        <entry key="..\:/Users/poliv/AndroidStudioProjects/test2Smack/app/src/main/res/layout/activity_main.xml" value="0.340625" />
+        <entry key="..\:/Users/poliv/AndroidStudioProjects/test2Smack/app/src/main/res/layout/activity_main.xml" value="0.5" />
         <entry key="..\:/Users/poliv/AndroidStudioProjects/test2Smack/app/src/main/res/layout/activity_room.xml" value="0.246875" />
-        <entry key="..\:/Users/poliv/AndroidStudioProjects/test2Smack/app/src/main/res/layout/activity_rooms.xml" value="0.33" />
+        <entry key="..\:/Users/poliv/AndroidStudioProjects/test2Smack/app/src/main/res/layout/activity_rooms.xml" value="0.1" />
+        <entry key="..\:/Users/poliv/AndroidStudioProjects/test2Smack/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml" value="0.2025" />
+        <entry key="..\:/Users/poliv/AndroidStudioProjects/test2Smack/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml" value="0.2025" />
       </map>
     </option>
   </component>

app/src/main/AndroidManifest.xml

@@ -16,7 +16,7 @@
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
+        android:label="ShariX Open Chat"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Test2Smack"

app/src/main/java/com/drinkertea/test2smack/ChatsList.java

@@ -71,11 +71,12 @@ public class ChatsList extends AppCompatActivity {
         setContentView(R.layout.activity_chats_list);
 
         linearLayout = (LinearLayout) findViewById(R.id.chatsListLayout);
-
         XMPPClass.GenerateChatList();
         generateChatsList();
+        runMessageListener();
     }
 
+
     public void generateChatsList(){
         linearLayout.removeAllViews();
         Collections.sort(XMPPClass.chatItems, new FishNameComparator());
@@ -115,7 +116,7 @@ public class ChatsList extends AppCompatActivity {
             LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
                     LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
 
-            layoutParams.setMargins(15, 15, 15, 15);
+            layoutParams.setMargins(55, 15, 55, 15);
             Container.setLayoutParams(layoutParams);
 
             LinearLayout.LayoutParams textParams = new LinearLayout.LayoutParams(
@@ -145,7 +146,6 @@ public class ChatsList extends AppCompatActivity {
             });
             linearLayout.addView(Container);
         }
-        runMessageListener();
         timer.schedule(timerTask, 0, 10000);
     }
 

app/src/main/java/com/drinkertea/test2smack/MainActivity.java

@@ -8,18 +8,31 @@ import android.view.View;
 import android.widget.EditText;
 
 import org.jivesoftware.smack.AbstractXMPPConnection;
+import org.jivesoftware.smack.MessageListener;
+import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smack.chat2.Chat;
 import org.jivesoftware.smack.chat2.ChatManager;
+import org.jivesoftware.smack.chat2.IncomingChatMessageListener;
 import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smack.packet.Presence;
 import org.jivesoftware.smack.roster.Roster;
+import org.jivesoftware.smack.roster.RosterEntry;
 import org.jivesoftware.smackx.mam.MamManager;
+import org.jivesoftware.smackx.muc.HostedRoom;
+import org.jivesoftware.smackx.muc.InvitationListener;
 import org.jivesoftware.smackx.muc.MultiUserChat;
 import org.jivesoftware.smackx.muc.MultiUserChatManager;
+import org.jivesoftware.smackx.muc.packet.MUCUser;
+import org.jxmpp.jid.DomainBareJid;
 import org.jxmpp.jid.EntityBareJid;
 import org.jxmpp.jid.EntityFullJid;
+import org.jxmpp.jid.EntityJid;
 import org.jxmpp.jid.impl.JidCreate;
 import org.jxmpp.jid.parts.Resourcepart;
 
+import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 
 public class MainActivity extends AppCompatActivity {
@@ -87,7 +100,7 @@ public class MainActivity extends AppCompatActivity {
         }
     }
 
-    public void stopNotificationClick(View view) {
+    public void stopNotificationClick(View view) throws Exception{
         stopService(new Intent(this, NotificationService.class));
     }
 }

app/src/main/java/com/drinkertea/test2smack/NotificationService.java

@@ -46,7 +46,7 @@ public class NotificationService extends Service {
                 builder = new NotificationCompat.Builder(this, "My channel")
                         .setContentText("Notification server was running!")
                         .setContentTitle("Assist chat")
-                        .setSmallIcon(R.drawable.ic_launcher_background);
+                        .setSmallIcon(R.mipmap.ic_launcher_round);
                 startForeground(1001, builder.build());
             }
 
@@ -101,7 +101,7 @@ public class NotificationService extends Service {
         NotificationCompat.Builder builder = new NotificationCompat.Builder(NotificationService.this, "My channel");
         builder.setContentTitle(from.asBareJid().toString());
         builder.setContentText(message);
-        builder.setSmallIcon(R.drawable.ic_launcher_background);
+        builder.setSmallIcon(R.mipmap.ic_launcher);
         builder.setAutoCancel(true);
         builder.setContentIntent(resultPendingIntent);
 

app/src/main/java/com/drinkertea/test2smack/Room.java

@@ -12,33 +12,30 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import org.jivesoftware.smack.MessageListener;
 import org.jivesoftware.smack.chat2.Chat;
 import org.jivesoftware.smack.chat2.ChatManager;
 import org.jivesoftware.smack.chat2.IncomingChatMessageListener;
 import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smackx.muc.MultiUserChat;
 import org.jxmpp.jid.EntityBareJid;
 
+import java.util.List;
+
 public class Room extends AppCompatActivity {
 
     public LinearLayout roomLayout;
     public EditText roomMessageET;
-    ChatManager chatManager = XMPPClass.chatManager;
-    EntityBareJid jid;
-    {
-        try {
-            jid = XMPPClass.chatJid;
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
+    public MultiUserChat thisMuc = XMPPClass.activeMuc;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_room);
         roomMessageET = (EditText) findViewById(R.id.roomMessageView);
         roomLayout = (LinearLayout) findViewById(R.id.roomLayout);
-        XMPPClass.CreateRoomListMessage(10);
-        for(Message message : XMPPClass.messages){
+        List<Message> messages = XMPPClass.CreateRoomListMessage(10, thisMuc);
+        for(Message message : messages){
             String from = message.getFrom().asBareJid().toString().trim();
             if (from.equals(XMPPClass.myJid.asEntityBareJidString().trim())){
                 addMessage(message.getFrom().toString().split("/")[1], message.getBody(), false);
@@ -74,17 +71,19 @@ public class Room extends AppCompatActivity {
         roomLayout.addView(linearLayout);
     }
     public void runMessageListener(){
-        chatManager.addIncomingListener(new IncomingChatMessageListener() {
+        thisMuc.addMessageListener(new MessageListener() {
             @Override
-            public void newIncomingMessage(EntityBareJid from, Message message, Chat chat) {
+            public void processMessage(Message message) {
                 runOnUiThread(new Runnable() {
                     @Override
                     public void run() {
-                        addMessage(from.asBareJid().toString(), message.getBody(), true);
-                        System.out.println("New message from:" + from + ": " + message.toXML().toString());
+                        if (message.getBody() != null && message.getBody() != ""){
+                            addMessage(message.getFrom().toString().split("/")[1], message.getBody(), true);
+                        }
+
+                        //System.out.println("New message from:" + from + ": " + message.toXML().toString());
                     }
                 });
-
             }
         });
     }
@@ -92,7 +91,7 @@ public class Room extends AppCompatActivity {
     public void sendMessage(View view) {
         try {
             String text = roomMessageET.getText().toString();
-            XMPPClass.muc.sendMessage(text);
+            thisMuc.sendMessage(text);
             addMessage(XMPPClass.myJid.asBareJid().toString(), text, false);
             roomMessageET.setText("");
         }catch (Exception e){

app/src/main/java/com/drinkertea/test2smack/XMPPClass.java

@@ -1,6 +1,7 @@
 package com.drinkertea.test2smack;
 
 import org.jivesoftware.smack.AbstractXMPPConnection;
+import org.jivesoftware.smack.MessageListener;
 import org.jivesoftware.smack.chat2.ChatManager;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Presence;
@@ -9,17 +10,21 @@ import org.jivesoftware.smack.roster.RosterEntry;
 import org.jivesoftware.smack.tcp.XMPPTCPConnection;
 import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration;
 import org.jivesoftware.smackx.mam.MamManager;
+import org.jivesoftware.smackx.muc.HostedRoom;
 import org.jivesoftware.smackx.muc.MultiUserChat;
 import org.jivesoftware.smackx.muc.MultiUserChatManager;
+import org.jxmpp.jid.DomainBareJid;
 import org.jxmpp.jid.EntityBareJid;
 import org.jxmpp.jid.EntityFullJid;
 import org.jxmpp.jid.impl.JidCreate;
 import org.jxmpp.jid.parts.Resourcepart;
 import org.jxmpp.stringprep.XmppStringprepException;
+import org.minidns.record.A;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 
 public class XMPPClass {
 
@@ -30,15 +35,20 @@ public class XMPPClass {
     public static EntityBareJid myJid;
     public static ArrayList<ChatItem> chatItems = new ArrayList<ChatItem>();
     public static List<Message> messages;
-    public static MultiUserChat muc;
+    public static MultiUserChatManager manager;
+    public static List<MultiUserChat> listMuc = new ArrayList<>();
+    public static MultiUserChat activeMuc;
 
     public static void XMPP_JoinRoom(String room_name, String nickname){
         try {
-            EntityBareJid jid = JidCreate.entityBareFrom(room_name);
-            MultiUserChatManager manager = MultiUserChatManager.getInstanceFor(XMPPClass.connection);
-            muc = manager.getMultiUserChat(jid);
+            EntityBareJid JIDRoom = JidCreate.entityBareFrom(room_name);
+            MultiUserChat muc = manager.getMultiUserChat(JIDRoom);
+            listMuc.add(muc);
             Resourcepart room  = Resourcepart.from(nickname);
-            muc.join(room);
+            if(!muc.isJoined()){
+                muc.join(room);
+            }
+            activeMuc = muc;
             for(EntityFullJid jid1 : muc.getOccupants()){
                 System.out.println(jid1);
             }
@@ -81,17 +91,33 @@ public class XMPPClass {
         }
     }
 
-    public static void CreateRoomListMessage(int message_count){
+    public static List<Message> CreateRoomListMessage(int message_count, MultiUserChat muc_conn){
         try {
-            MamManager mamManager = MamManager.getInstanceFor(muc);
+
+            MamManager mamManager = MamManager.getInstanceFor(muc_conn);
             MamManager.MamQueryArgs mamQueryArgs = MamManager.MamQueryArgs.builder()
                     .setResultPageSizeTo(message_count)
                     .queryLastPage()
                     .build();
             MamManager.MamQuery mamQuery = mamManager.queryArchive(mamQueryArgs);
-            messages = mamQuery.getMessages();
+            return mamQuery.getMessages();
         }catch (Exception ex){
+            return null;
+        }
+    }
+
+    public static List<EntityBareJid> GenerateRoomList() throws Exception{
+        List<EntityBareJid> listRoom = new ArrayList<>();
+        manager = MultiUserChatManager.getInstanceFor(XMPPClass.connection);
+        List<DomainBareJid> domains = manager.getMucServiceDomains();
+        for (DomainBareJid domain : domains){
+            Map<EntityBareJid, HostedRoom> map = manager.getRoomsHostedBy(domain);
+            for(EntityBareJid ent : map.keySet()){
+                listRoom.add(ent);
+                System.out.println(ent);
+            }
         }
+        return listRoom;
     }
 
     public static void GenerateChatList(){

app/src/main/java/com/drinkertea/test2smack/rooms.java

@@ -3,27 +3,65 @@ package com.drinkertea.test2smack;
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.content.Intent;
+import android.graphics.Color;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import org.jivesoftware.smack.packet.Message;
+import org.jivesoftware.smackx.muc.MultiUserChat;
+import org.jxmpp.jid.EntityBareJid;
 
 public class rooms extends AppCompatActivity {
 
+    LinearLayout mainListRooms;
+
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState)  {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_rooms);
+        mainListRooms = (LinearLayout) findViewById(R.id.roomsListLayout);
+        try {
+            GenerateRoomsList();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
     }
 
-    public void goToRoom(View view) {
-        LinearLayout linearLayout = (LinearLayout) view;
-        TextView textView = (TextView) linearLayout.getChildAt(1);
-        String room_name = textView.getText().toString();
-        XMPPClass.XMPP_JoinRoom(room_name, "Evgen Polivanov");
-        Intent intent = new Intent(this, Room.class);
-        startActivity(intent);
+
+    public void GenerateRoomsList() throws Exception{
+        for(EntityBareJid entity : XMPPClass.GenerateRoomList()){
+            LinearLayout Container = new LinearLayout(this);
+            TextView NameRoom = new TextView(this);
+            TextView JIDRoom = new TextView(this);
+
+            Container.setOrientation(LinearLayout.VERTICAL);
+            Container.setBackgroundColor(Color.parseColor("#C0C0C0"));
+            LinearLayout.LayoutParams layoutParams = new LinearLayout.LayoutParams(
+                    LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+
+            layoutParams.setMargins(55, 15, 55, 15);
+            Container.setPadding(15, 15, 15, 15);
+            Container.setLayoutParams(layoutParams);
+
+            NameRoom.setTextColor(Color.parseColor("#000000"));
+            NameRoom.setText(entity.asBareJid().toString().split("@")[0].toUpperCase());
+
+            JIDRoom.setText(entity.asBareJid().toString());
+
+            Container.addView(NameRoom);
+            Container.addView(JIDRoom);
+            Container.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    XMPPClass.XMPP_JoinRoom(entity.asEntityBareJidString(), "Test Room User");
+                    Intent intent = new Intent(rooms.this, Room.class);
+                    startActivity(intent);
+                }
+            });
+
+            mainListRooms.addView(Container);
+        }
     }
 }

app/src/main/res/layout/activity_main.xml

@@ -22,7 +22,12 @@
             android:layout_height="wrap_content"
             android:hint="Email"
             app:layout_constraintBottom_toTopOf="@+id/ETPassword" />
-
+        <TextView
+            android:textColor="@color/teal_700"
+            android:textSize="10dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="without @msg.sharix-app.org"/>
         <EditText
             android:id="@+id/ETPassword"
             android:layout_width="250dp"
@@ -50,7 +55,7 @@
             android:layout_width="200dp"
             android:layout_height="40dp"
             android:onClick="goToPageWithChats"
-            android:text="Chats"
+            android:text="Join to Chats"
             app:layout_constraintBottom_toTopOf="@+id/test"
             app:layout_constraintTop_toBottomOf="@+id/ETPassword" />
 
@@ -59,7 +64,7 @@
             android:layout_width="200dp"
             android:layout_height="40dp"
             android:onClick="testMethod"
-            android:text="Rooms"
+            android:text="Join to Rooms"
             app:layout_constraintBottom_toTopOf="@+id/button"
             app:layout_constraintTop_toBottomOf="@+id/BtnConnect" />
 

app/src/main/res/layout/activity_room.xml

@@ -23,8 +23,9 @@
     </ScrollView>
     <LinearLayout
         android:id="@+id/linearLayout"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="60dp"
+        android:background="@color/white"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">

app/src/main/res/layout/activity_rooms.xml

@@ -18,46 +18,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-            <LinearLayout
-                android:layout_margin="8dp"
-                android:padding="5dp"
-                android:onClick="goToRoom"
-                android:background="@color/cardview_shadow_start_color"
-                android:orientation="vertical"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-                <TextView
-                    android:text="ShariX Backend"
-                    android:textColor="@color/black"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-                <TextView
-                    android:text="backend@chat.msg.sharix-app.org"
-                    android:textSize="12dp"
 
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </LinearLayout>
-            <LinearLayout
-                android:layout_margin="8dp"
-                android:padding="5dp"
-                android:background="@color/cardview_shadow_start_color"
-                android:orientation="vertical"
-                android:onClick="goToRoom"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-                <TextView
-                    android:text="ShariX TEAM"
-                    android:textColor="@color/black"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-                <TextView
-
-                    android:text="team@chat.msg.sharix-app.org"
-                    android:textSize="12dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-            </LinearLayout>
         </LinearLayout>
     </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@mipmap/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <background android:drawable="@mipmap/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_round"/>
 </adaptive-icon>

app/src/main/res/values/colors.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
+    <color name="purple_200">#0081FF</color>
+    <color name="purple_500">#0081FF</color>
+    <color name="purple_700">#0081FF</color>
     <color name="teal_200">#FF03DAC5</color>
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>

app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>

app/src/main/res/values/ic_launcher_foreground.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>