moved merged files to correct location

3 files changed, 16 insertions, 15 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
index 26e2b3c1..8bd7e81e 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
@@ -42,6 +42,7 @@ import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
+import de.thedevstack.conversationsplus.ui.listeners.ConversationSwipeRefreshListener;
 import de.tzur.conversations.Settings;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.R;
diff --git a/src/main/java/eu/siacs/conversations/ui/listeners/ConversationMoreMessagesLoadedListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationMoreMessagesLoadedListener.java
index 2154f8d8..6e7d5d6a 100644
--- a/src/main/java/eu/siacs/conversations/ui/listeners/ConversationMoreMessagesLoadedListener.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationMoreMessagesLoadedListener.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.ui.listeners;
+package de.thedevstack.conversationsplus.ui.listeners;
 
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.view.View;
@@ -7,12 +7,12 @@ import android.widget.Toast;
 
 import java.util.List;
 
-import eu.siacs.conversations.entities.Conversation;
-import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.services.XmppConnectionService;
-import eu.siacs.conversations.ui.ConversationActivity;
-import eu.siacs.conversations.ui.ConversationFragment;
-import eu.siacs.conversations.ui.adapter.MessageAdapter;
+import de.thedevstack.conversationsplus.entities.Conversation;
+import de.thedevstack.conversationsplus.entities.Message;
+import de.thedevstack.conversationsplus.services.XmppConnectionService;
+import de.thedevstack.conversationsplus.ui.ConversationActivity;
+import de.thedevstack.conversationsplus.ui.ConversationFragment;
+import de.thedevstack.conversationsplus.ui.adapter.MessageAdapter;
 
 /**
  * This listener updates the UI when messages are loaded from the server.
diff --git a/src/main/java/eu/siacs/conversations/ui/listeners/ConversationSwipeRefreshListener.java b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationSwipeRefreshListener.java
index 09a8d730..5329d626 100644
--- a/src/main/java/eu/siacs/conversations/ui/listeners/ConversationSwipeRefreshListener.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/listeners/ConversationSwipeRefreshListener.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.ui.listeners;
+package de.thedevstack.conversationsplus.ui.listeners;
 
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.util.Log;
@@ -8,13 +8,13 @@ import android.widget.Toast;
 
 import java.util.List;
 
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.entities.Conversation;
-import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.services.XmppConnectionService;
-import eu.siacs.conversations.ui.ConversationActivity;
-import eu.siacs.conversations.ui.ConversationFragment;
-import eu.siacs.conversations.ui.adapter.MessageAdapter;
+import de.thedevstack.conversationsplus.Config;
+import de.thedevstack.conversationsplus.entities.Conversation;
+import de.thedevstack.conversationsplus.entities.Message;
+import de.thedevstack.conversationsplus.services.XmppConnectionService;
+import de.thedevstack.conversationsplus.ui.ConversationActivity;
+import de.thedevstack.conversationsplus.ui.ConversationFragment;
+import de.thedevstack.conversationsplus.ui.adapter.MessageAdapter;
 
 /**
  * This listener starts loading messages from the server.