diff --git a/app/build.gradle b/app/build.gradle index ff60256..4c1f862 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,7 +73,8 @@ check.configure { dependencies { // Depend on the core project for XMPP related stuff - implementation project(':core-old') + implementation project(":domain") + implementation project(":data") implementation "io.requery:requery-android:$requeryVersion" implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.41' diff --git a/app/src/main/java/org/mercury_im/messenger/MercuryImApplication.java b/app/src/main/java/org/mercury_im/messenger/MercuryImApplication.java index e3e475b..0198b74 100644 --- a/app/src/main/java/org/mercury_im/messenger/MercuryImApplication.java +++ b/app/src/main/java/org/mercury_im/messenger/MercuryImApplication.java @@ -11,8 +11,6 @@ import android.os.Build; import org.mercury_im.messenger.core.centers.ConnectionCenter; import org.mercury_im.messenger.core.connection.MercuryConfiguration; -import org.mercury_im.messenger.xmpp.util.ChatAndPossiblyContact; -import org.mercury_im.core.data.util.ContactNameUtil; import org.mercury_im.messenger.di.component.AppComponent; import org.mercury_im.messenger.di.component.DaggerAppComponent; import org.mercury_im.messenger.di.module.AppModule; @@ -24,7 +22,7 @@ import java.util.concurrent.atomic.AtomicInteger; import javax.inject.Inject; -public class MercuryImApplication extends Application implements org.mercury_im.messenger.core.NotificationManager { +public class MercuryImApplication extends Application { public static final String TAG = "Mercury-IM"; @@ -117,13 +115,6 @@ public class MercuryImApplication extends Application implements org.mercury_im. notificationManager.createNotificationChannel(messages); } - @Override - public int chatMessageReceived(ChatAndPossiblyContact chatAndPossiblyContact, String body) { - return Notifications.chatMessageReceived(this, - chatAndPossiblyContact.getChat(), - ContactNameUtil.displayableNameFrom(chatAndPossiblyContact.getContact()), body); - } - public AppComponent getAppComponent() { return appComponent; } diff --git a/app/src/main/java/org/mercury_im/messenger/Notifications.java b/app/src/main/java/org/mercury_im/messenger/Notifications.java index 8673aa9..bdab127 100644 --- a/app/src/main/java/org/mercury_im/messenger/Notifications.java +++ b/app/src/main/java/org/mercury_im/messenger/Notifications.java @@ -7,7 +7,7 @@ import android.content.Intent; import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationManagerCompat; -import org.mercury_im.messenger.xmpp.model.ChatModel; +import org.mercury_im.messenger.entity.chat.Chat; import org.mercury_im.messenger.ui.chat.ChatActivity; public class Notifications { @@ -20,7 +20,7 @@ public class Notifications { // Notification IDs public static final int FOREGROUND_SERVICE_ID = 1; // must not be 0 - public static int chatMessageReceived(Context context, ChatModel chat, String contactName, String body) { + public static int chatMessageReceived(Context context, Chat chat, String contactName, String body) { NotificationManagerCompat notificationManagerCompat = NotificationManagerCompat.from(context); int id = (int) chat.getId(); diff --git a/app/src/main/java/org/mercury_im/messenger/ParcelableXMPPTCPConnectionConfiguration.java b/app/src/main/java/org/mercury_im/messenger/ParcelableXMPPTCPConnectionConfiguration.java deleted file mode 100644 index e59013f..0000000 --- a/app/src/main/java/org/mercury_im/messenger/ParcelableXMPPTCPConnectionConfiguration.java +++ /dev/null @@ -1,86 +0,0 @@ -package org.mercury_im.messenger; - -import android.os.Parcel; -import android.os.Parcelable; - -import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration; -import org.jxmpp.stringprep.XmppStringprepException; - -public class ParcelableXMPPTCPConnectionConfiguration implements Parcelable { - - private final String username; - private final String password; - private final String xmppDomain; - private final String resourcePart; - private final String host; - private final int port; - - private XMPPTCPConnectionConfiguration configuration; - - public static final Creator CREATOR = new Creator() { - @Override - public ParcelableXMPPTCPConnectionConfiguration createFromParcel(Parcel in) { - return new ParcelableXMPPTCPConnectionConfiguration(in); - } - - @Override - public ParcelableXMPPTCPConnectionConfiguration[] newArray(int size) { - return new ParcelableXMPPTCPConnectionConfiguration[size]; - } - }; - - public ParcelableXMPPTCPConnectionConfiguration(String username, - String password, - String xmppDomain, - String resourcePart, - String host, - int port) { - this.username = username; - this.password = password; - this.xmppDomain = xmppDomain; - this.resourcePart = resourcePart; - this.host = host; - this.port = port; - } - - private ParcelableXMPPTCPConnectionConfiguration(Parcel in) { - this(in.readString(), // username - in.readString(), // password - in.readString(), // xmppDomain - in.readString(), // resourcePart - in.readString(), // host - in.readInt()); // port - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel parcel, int i) { - parcel.writeString(username); - parcel.writeString(password); - parcel.writeString(xmppDomain); - parcel.writeString(resourcePart); - parcel.writeString(host); - parcel.writeInt(port); - } - - public XMPPTCPConnectionConfiguration getConfiguration() throws XmppStringprepException { - if (configuration != null) { - return configuration; - } - - XMPPTCPConnectionConfiguration.Builder builder = XMPPTCPConnectionConfiguration.builder(); - - builder.setUsernameAndPassword(username, password); - if (xmppDomain != null) builder.setXmppDomain(xmppDomain); - if (resourcePart != null) builder.setResource(resourcePart); - if (host != null) builder.setHost(host); - if (port != -1) builder.setPort(port); - - configuration = builder.build(); - return configuration; - } -} diff --git a/app/src/main/java/org/mercury_im/messenger/di/module/AndroidPersistenceModule.java b/app/src/main/java/org/mercury_im/messenger/di/module/AndroidPersistenceModule.java index 603423d..a306090 100644 --- a/app/src/main/java/org/mercury_im/messenger/di/module/AndroidPersistenceModule.java +++ b/app/src/main/java/org/mercury_im/messenger/di/module/AndroidPersistenceModule.java @@ -2,9 +2,9 @@ package org.mercury_im.messenger.di.module; import android.app.Application; +import org.mercury_im.messenger.util.ThreadUtils; import org.mercury_im.messenger.BuildConfig; import org.mercury_im.messenger.xmpp.model.Models; -import org.mercury_im.messenger.thread_utils.ThreadUtils; import javax.inject.Named; import javax.inject.Singleton; diff --git a/app/src/main/java/org/mercury_im/messenger/di/module/AppModule.java b/app/src/main/java/org/mercury_im/messenger/di/module/AppModule.java index d3b0bd5..0c27fb3 100644 --- a/app/src/main/java/org/mercury_im/messenger/di/module/AppModule.java +++ b/app/src/main/java/org/mercury_im/messenger/di/module/AppModule.java @@ -2,16 +2,15 @@ package org.mercury_im.messenger.di.module; import android.app.Application; -import dagger.Module; -import dagger.Provides; - import org.mercury_im.messenger.MercuryImApplication; -import org.mercury_im.messenger.core.NotificationManager; import org.mercury_im.messenger.core.di.CenterModule; -import org.mercury_im.messenger.xmpp.di.RequeryModule; +import org.mercury_im.messenger.data.di.RequeryModule; import javax.inject.Singleton; +import dagger.Module; +import dagger.Provides; + @Module(includes = { CenterModule.class, RequeryModule.class @@ -29,10 +28,4 @@ public class AppModule { Application provideApplication() { return mApplication; } - - @Provides - @Singleton - NotificationManager providerNotificationManager() { - return mApplication; - } } diff --git a/app/src/main/java/org/mercury_im/messenger/ui/MainActivity.java b/app/src/main/java/org/mercury_im/messenger/ui/MainActivity.java index 2e17196..f63dcb8 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/MainActivity.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/MainActivity.java @@ -16,7 +16,7 @@ import com.google.android.material.navigation.NavigationView; import org.mercury_im.messenger.MercuryImApplication; import org.mercury_im.messenger.R; import org.mercury_im.messenger.xmpp.model.AccountModel; -import org.mercury_im.messenger.xmpp.repository.ChatRepository; +import org.mercury_im.messenger.data.repository.ChatRepository; import org.mercury_im.messenger.ui.chatlist.ChatListFragment; import org.mercury_im.messenger.ui.login.AccountsFragment; import org.mercury_im.messenger.ui.roster.RosterFragment; diff --git a/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatActivity.java b/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatActivity.java index 5981b24..dcba39e 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatActivity.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatActivity.java @@ -28,7 +28,7 @@ import org.jxmpp.jid.impl.JidCreate; import org.mercury_im.messenger.MercuryImApplication; import org.mercury_im.messenger.R; import org.mercury_im.messenger.core.centers.ConnectionCenter; -import org.mercury_im.messenger.xmpp.repository.ChatRepository; +import org.mercury_im.messenger.data.repository.ChatRepository; import java.util.logging.Level; import java.util.logging.Logger; diff --git a/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatViewModel.java b/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatViewModel.java index 69f2799..570767a 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatViewModel.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/chat/ChatViewModel.java @@ -11,9 +11,9 @@ import org.mercury_im.messenger.xmpp.model.ChatModel; import org.mercury_im.messenger.xmpp.model.ContactModel; import org.mercury_im.messenger.xmpp.model.EntityModel; import org.mercury_im.messenger.xmpp.model.MessageModel; -import org.mercury_im.messenger.xmpp.repository.ChatRepository; -import org.mercury_im.messenger.xmpp.repository.MessageRepository; -import org.mercury_im.messenger.xmpp.repository.RosterRepository; +import org.mercury_im.messenger.data.repository.ChatRepository; +import org.mercury_im.messenger.data.repository.MessageRepository; +import org.mercury_im.messenger.data.repository.RosterRepository; import java.util.List; diff --git a/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListViewModel.java b/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListViewModel.java index f09e91d..c0bb5be 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListViewModel.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListViewModel.java @@ -6,8 +6,8 @@ import androidx.lifecycle.ViewModel; import org.mercury_im.messenger.MercuryImApplication; import org.mercury_im.messenger.xmpp.model.ChatModel; -import org.mercury_im.messenger.xmpp.repository.ChatRepository; -import org.mercury_im.messenger.xmpp.repository.MessageRepository; +import org.mercury_im.messenger.data.repository.ChatRepository; +import org.mercury_im.messenger.data.repository.MessageRepository; import java.util.List; diff --git a/app/src/main/java/org/mercury_im/messenger/ui/roster/contacts/ContactListItemViewModel.java b/app/src/main/java/org/mercury_im/messenger/ui/roster/contacts/ContactListItemViewModel.java index 5a98b8a..622fd2b 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/roster/contacts/ContactListItemViewModel.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/roster/contacts/ContactListItemViewModel.java @@ -7,7 +7,7 @@ import androidx.lifecycle.AndroidViewModel; import androidx.lifecycle.LiveData; import org.mercury_im.messenger.xmpp.model.ContactModel; -import org.mercury_im.messenger.xmpp.repository.RosterRepository; +import org.mercury_im.messenger.data.repository.RosterRepository; import javax.inject.Inject; diff --git a/app/src/main/java/org/mercury_im/messenger/ui/roster/contacts/ContactListViewModel.java b/app/src/main/java/org/mercury_im/messenger/ui/roster/contacts/ContactListViewModel.java index b3ecf8b..cf05994 100644 --- a/app/src/main/java/org/mercury_im/messenger/ui/roster/contacts/ContactListViewModel.java +++ b/app/src/main/java/org/mercury_im/messenger/ui/roster/contacts/ContactListViewModel.java @@ -8,7 +8,7 @@ import androidx.lifecycle.ViewModel; import org.mercury_im.messenger.MercuryImApplication; import org.mercury_im.messenger.xmpp.model.ContactModel; -import org.mercury_im.messenger.xmpp.repository.RosterRepository; +import org.mercury_im.messenger.data.repository.RosterRepository; import java.util.List; diff --git a/core-old/src/main/java/org/mercury_im/core/data/util/ContactNameUtil.java b/core-old/src/main/java/org/mercury_im/domain/data/util/ContactNameUtil.java similarity index 95% rename from core-old/src/main/java/org/mercury_im/core/data/util/ContactNameUtil.java rename to core-old/src/main/java/org/mercury_im/domain/data/util/ContactNameUtil.java index cf6c932..43c538a 100644 --- a/core-old/src/main/java/org/mercury_im/core/data/util/ContactNameUtil.java +++ b/core-old/src/main/java/org/mercury_im/domain/data/util/ContactNameUtil.java @@ -1,4 +1,4 @@ -package org.mercury_im.core.data.util; +package org.mercury_im.domain.data.util; import org.mercury_im.messenger.xmpp.model.ContactModel; import org.mercury_im.messenger.xmpp.model.EntityModel; diff --git a/core-old/src/main/java/org/mercury_im/messenger/core/di/CenterModule.java b/core-old/src/main/java/org/mercury_im/messenger/core/di/CenterModule.java index 6a295a1..4c9f2a4 100644 --- a/core-old/src/main/java/org/mercury_im/messenger/core/di/CenterModule.java +++ b/core-old/src/main/java/org/mercury_im/messenger/core/di/CenterModule.java @@ -2,7 +2,6 @@ package org.mercury_im.messenger.core.di; import org.mercury_im.messenger.core.NotificationManager; import org.mercury_im.messenger.core.centers.ConnectionCenter; -import org.mercury_im.core.data.repository.AccountRepository; import org.mercury_im.messenger.core.stores.EntityCapsStore; import org.mercury_im.messenger.core.stores.PlainMessageStore; diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/converter/SaslConditionConverter.java b/data/src/main/java/org/mercury_im/messenger/data/converter/SaslConditionConverter.java similarity index 87% rename from data/src/main/java/org/mercury_im/messenger/xmpp/converter/SaslConditionConverter.java rename to data/src/main/java/org/mercury_im/messenger/data/converter/SaslConditionConverter.java index cd90fb6..0b93393 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/converter/SaslConditionConverter.java +++ b/data/src/main/java/org/mercury_im/messenger/data/converter/SaslConditionConverter.java @@ -1,6 +1,6 @@ -package org.mercury_im.messenger.xmpp.converter; +package org.mercury_im.messenger.data.converter; -import org.mercury_im.messenger.xmpp.enums.SaslCondition; +import org.mercury_im.messenger.data.enums.SaslCondition; import io.requery.Converter; diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/converter/SubscriptionDirectionConverter.java b/data/src/main/java/org/mercury_im/messenger/data/converter/SubscriptionDirectionConverter.java similarity index 88% rename from data/src/main/java/org/mercury_im/messenger/xmpp/converter/SubscriptionDirectionConverter.java rename to data/src/main/java/org/mercury_im/messenger/data/converter/SubscriptionDirectionConverter.java index d516b49..af84446 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/converter/SubscriptionDirectionConverter.java +++ b/data/src/main/java/org/mercury_im/messenger/data/converter/SubscriptionDirectionConverter.java @@ -1,6 +1,6 @@ -package org.mercury_im.messenger.xmpp.converter; +package org.mercury_im.messenger.data.converter; -import org.mercury_im.messenger.xmpp.enums.SubscriptionDirection; +import org.mercury_im.messenger.data.enums.SubscriptionDirection; import io.requery.Converter; diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/di/RequeryModule.java b/data/src/main/java/org/mercury_im/messenger/data/di/RequeryModule.java similarity index 85% rename from data/src/main/java/org/mercury_im/messenger/xmpp/di/RequeryModule.java rename to data/src/main/java/org/mercury_im/messenger/data/di/RequeryModule.java index 22746c7..0f90be9 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/di/RequeryModule.java +++ b/data/src/main/java/org/mercury_im/messenger/data/di/RequeryModule.java @@ -1,10 +1,10 @@ -package org.mercury_im.messenger.xmpp.di; +package org.mercury_im.messenger.data.di; -import org.mercury_im.messenger.xmpp.repository.ReactiveXmppAccountRepository; -import org.mercury_im.messenger.xmpp.repository.ChatRepository; -import org.mercury_im.messenger.xmpp.repository.EntityCapsRepository; -import org.mercury_im.messenger.xmpp.repository.RosterRepository; -import org.mercury_im.core.util.ThreadUtils; +import org.mercury_im.messenger.data.repository.ChatRepository; +import org.mercury_im.messenger.data.repository.EntityCapsRepository; +import org.mercury_im.messenger.data.repository.ReactiveXmppAccountRepository; +import org.mercury_im.messenger.data.repository.RosterRepository; +import org.mercury_im.messenger.util.ThreadUtils; import javax.inject.Named; import javax.inject.Singleton; diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/enums/SaslCondition.java b/data/src/main/java/org/mercury_im/messenger/data/enums/SaslCondition.java similarity index 99% rename from data/src/main/java/org/mercury_im/messenger/xmpp/enums/SaslCondition.java rename to data/src/main/java/org/mercury_im/messenger/data/enums/SaslCondition.java index ebc2de0..df23da2 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/enums/SaslCondition.java +++ b/data/src/main/java/org/mercury_im/messenger/data/enums/SaslCondition.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.xmpp.enums; +package org.mercury_im.messenger.data.enums; public enum SaslCondition { diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/enums/SubscriptionDirection.java b/data/src/main/java/org/mercury_im/messenger/data/enums/SubscriptionDirection.java similarity index 66% rename from data/src/main/java/org/mercury_im/messenger/xmpp/enums/SubscriptionDirection.java rename to data/src/main/java/org/mercury_im/messenger/data/enums/SubscriptionDirection.java index daf77f8..38ea670 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/enums/SubscriptionDirection.java +++ b/data/src/main/java/org/mercury_im/messenger/data/enums/SubscriptionDirection.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.xmpp.enums; +package org.mercury_im.messenger.data.enums; public enum SubscriptionDirection { none, diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/mapping/AccountMapping.java b/data/src/main/java/org/mercury_im/messenger/data/mapping/AccountMapping.java similarity index 79% rename from data/src/main/java/org/mercury_im/messenger/xmpp/mapping/AccountMapping.java rename to data/src/main/java/org/mercury_im/messenger/data/mapping/AccountMapping.java index d6b0599..703f021 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/mapping/AccountMapping.java +++ b/data/src/main/java/org/mercury_im/messenger/data/mapping/AccountMapping.java @@ -1,8 +1,8 @@ -package org.mercury_im.messenger.xmpp.mapping; +package org.mercury_im.messenger.data.mapping; -import org.mercury_im.messenger.core.entity.Account; -import org.mercury_im.messenger.core.entity.IAccount; -import org.mercury_im.messenger.core.entity.PasswordAuthentication; +import org.mercury_im.messenger.entity.Account; +import org.mercury_im.messenger.entity.IAccount; +import org.mercury_im.messenger.entity.PasswordAuthentication; import org.mercury_im.messenger.xmpp.model.AccountModel; public class AccountMapping { diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractAccountModel.java b/data/src/main/java/org/mercury_im/messenger/data/model/AbstractAccountModel.java similarity index 93% rename from data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractAccountModel.java rename to data/src/main/java/org/mercury_im/messenger/data/model/AbstractAccountModel.java index 36cbc8b..bc653e5 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractAccountModel.java +++ b/data/src/main/java/org/mercury_im/messenger/data/model/AbstractAccountModel.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.xmpp.model; +package org.mercury_im.messenger.data.model; import io.requery.Column; import io.requery.Entity; diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractChatModel.java b/data/src/main/java/org/mercury_im/messenger/data/model/AbstractChatModel.java similarity index 80% rename from data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractChatModel.java rename to data/src/main/java/org/mercury_im/messenger/data/model/AbstractChatModel.java index 197ab86..62dab4a 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractChatModel.java +++ b/data/src/main/java/org/mercury_im/messenger/data/model/AbstractChatModel.java @@ -1,4 +1,6 @@ -package org.mercury_im.messenger.xmpp.model; +package org.mercury_im.messenger.data.model; + +import org.mercury_im.messenger.xmpp.model.PeerModel; import io.requery.Entity; import io.requery.ForeignKey; diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractContactModel.java b/data/src/main/java/org/mercury_im/messenger/data/model/AbstractContactModel.java similarity index 80% rename from data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractContactModel.java rename to data/src/main/java/org/mercury_im/messenger/data/model/AbstractContactModel.java index c18ad61..0c8f5ee 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractContactModel.java +++ b/data/src/main/java/org/mercury_im/messenger/data/model/AbstractContactModel.java @@ -1,7 +1,8 @@ -package org.mercury_im.messenger.xmpp.model; +package org.mercury_im.messenger.data.model; -import org.mercury_im.messenger.xmpp.converter.SubscriptionDirectionConverter; -import org.mercury_im.messenger.xmpp.enums.SubscriptionDirection; +import org.mercury_im.messenger.data.converter.SubscriptionDirectionConverter; +import org.mercury_im.messenger.data.enums.SubscriptionDirection; +import org.mercury_im.messenger.xmpp.model.PeerModel; import io.requery.Convert; import io.requery.Entity; diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractEntityCapsModel.java b/data/src/main/java/org/mercury_im/messenger/data/model/AbstractEntityCapsModel.java similarity index 87% rename from data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractEntityCapsModel.java rename to data/src/main/java/org/mercury_im/messenger/data/model/AbstractEntityCapsModel.java index 4ff1ebf..165f568 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractEntityCapsModel.java +++ b/data/src/main/java/org/mercury_im/messenger/data/model/AbstractEntityCapsModel.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.xmpp.model; +package org.mercury_im.messenger.data.model; import io.requery.Column; import io.requery.Entity; diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractLastChatMessageRelation.java b/data/src/main/java/org/mercury_im/messenger/data/model/AbstractLastChatMessageRelation.java similarity index 71% rename from data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractLastChatMessageRelation.java rename to data/src/main/java/org/mercury_im/messenger/data/model/AbstractLastChatMessageRelation.java index da4b0c3..cbc6691 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractLastChatMessageRelation.java +++ b/data/src/main/java/org/mercury_im/messenger/data/model/AbstractLastChatMessageRelation.java @@ -1,4 +1,7 @@ -package org.mercury_im.messenger.xmpp.model; +package org.mercury_im.messenger.data.model; + +import org.mercury_im.messenger.xmpp.model.ChatModel; +import org.mercury_im.messenger.xmpp.model.MessageModel; import io.requery.Entity; import io.requery.ForeignKey; diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractLastReadChatMessageRelation.java b/data/src/main/java/org/mercury_im/messenger/data/model/AbstractLastReadChatMessageRelation.java similarity index 72% rename from data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractLastReadChatMessageRelation.java rename to data/src/main/java/org/mercury_im/messenger/data/model/AbstractLastReadChatMessageRelation.java index 236d819..3d052b3 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractLastReadChatMessageRelation.java +++ b/data/src/main/java/org/mercury_im/messenger/data/model/AbstractLastReadChatMessageRelation.java @@ -1,4 +1,7 @@ -package org.mercury_im.messenger.xmpp.model; +package org.mercury_im.messenger.data.model; + +import org.mercury_im.messenger.xmpp.model.ChatModel; +import org.mercury_im.messenger.xmpp.model.MessageModel; import io.requery.Entity; import io.requery.ForeignKey; diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractMessageModel.java b/data/src/main/java/org/mercury_im/messenger/data/model/AbstractMessageModel.java similarity index 89% rename from data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractMessageModel.java rename to data/src/main/java/org/mercury_im/messenger/data/model/AbstractMessageModel.java index 809d14a..5012a93 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractMessageModel.java +++ b/data/src/main/java/org/mercury_im/messenger/data/model/AbstractMessageModel.java @@ -1,4 +1,6 @@ -package org.mercury_im.messenger.xmpp.model; +package org.mercury_im.messenger.data.model; + +import org.mercury_im.messenger.xmpp.model.ChatModel; import java.util.Date; diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractPeerModel.java b/data/src/main/java/org/mercury_im/messenger/data/model/AbstractPeerModel.java similarity index 84% rename from data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractPeerModel.java rename to data/src/main/java/org/mercury_im/messenger/data/model/AbstractPeerModel.java index 975be98..02fe61d 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractPeerModel.java +++ b/data/src/main/java/org/mercury_im/messenger/data/model/AbstractPeerModel.java @@ -1,4 +1,6 @@ -package org.mercury_im.messenger.xmpp.model; +package org.mercury_im.messenger.data.model; + +import org.mercury_im.messenger.xmpp.model.AccountModel; import io.requery.Column; import io.requery.Entity; diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractSaslAuthenticationResultModel.java b/data/src/main/java/org/mercury_im/messenger/data/model/AbstractSaslAuthenticationResultModel.java similarity index 69% rename from data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractSaslAuthenticationResultModel.java rename to data/src/main/java/org/mercury_im/messenger/data/model/AbstractSaslAuthenticationResultModel.java index a8b7397..f1b98a6 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractSaslAuthenticationResultModel.java +++ b/data/src/main/java/org/mercury_im/messenger/data/model/AbstractSaslAuthenticationResultModel.java @@ -1,6 +1,7 @@ -package org.mercury_im.messenger.xmpp.model; +package org.mercury_im.messenger.data.model; -import org.mercury_im.messenger.xmpp.enums.SaslCondition; +import org.mercury_im.messenger.data.enums.SaslCondition; +import org.mercury_im.messenger.xmpp.model.AccountModel; import io.requery.Entity; import io.requery.Key; diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/repository/AbstractRepository.java b/data/src/main/java/org/mercury_im/messenger/data/repository/AbstractRepository.java similarity index 96% rename from data/src/main/java/org/mercury_im/messenger/xmpp/repository/AbstractRepository.java rename to data/src/main/java/org/mercury_im/messenger/data/repository/AbstractRepository.java index a4cd16b..5a6505c 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/repository/AbstractRepository.java +++ b/data/src/main/java/org/mercury_im/messenger/data/repository/AbstractRepository.java @@ -1,6 +1,6 @@ -package org.mercury_im.messenger.xmpp.repository; +package org.mercury_im.messenger.data.repository; -import org.mercury_im.core.util.ThreadUtils; +import org.mercury_im.messenger.util.ThreadUtils; import javax.inject.Named; diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/repository/ChatRepository.java b/data/src/main/java/org/mercury_im/messenger/data/repository/ChatRepository.java similarity index 96% rename from data/src/main/java/org/mercury_im/messenger/xmpp/repository/ChatRepository.java rename to data/src/main/java/org/mercury_im/messenger/data/repository/ChatRepository.java index 4c50845..eaeee8b 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/repository/ChatRepository.java +++ b/data/src/main/java/org/mercury_im/messenger/data/repository/ChatRepository.java @@ -1,10 +1,10 @@ -package org.mercury_im.messenger.xmpp.repository; +package org.mercury_im.messenger.data.repository; -import org.mercury_im.core.util.ThreadUtils; +import org.mercury_im.messenger.util.ThreadUtils; import org.mercury_im.messenger.xmpp.model.ChatModel; import org.mercury_im.messenger.xmpp.model.ContactModel; import org.mercury_im.messenger.xmpp.model.PeerModel; -import org.mercury_im.messenger.xmpp.util.ChatAndPossiblyContact; +import org.mercury_im.messenger.data.util.ChatAndPossiblyContact; import java.util.ArrayList; import java.util.List; diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/repository/EntityCapsRepository.java b/data/src/main/java/org/mercury_im/messenger/data/repository/EntityCapsRepository.java similarity index 87% rename from data/src/main/java/org/mercury_im/messenger/xmpp/repository/EntityCapsRepository.java rename to data/src/main/java/org/mercury_im/messenger/data/repository/EntityCapsRepository.java index ec23568..63e5c0a 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/repository/EntityCapsRepository.java +++ b/data/src/main/java/org/mercury_im/messenger/data/repository/EntityCapsRepository.java @@ -1,7 +1,7 @@ -package org.mercury_im.messenger.xmpp.repository; +package org.mercury_im.messenger.data.repository; import org.mercury_im.messenger.xmpp.model.EntityCapsModel; -import org.mercury_im.core.util.ThreadUtils; +import org.mercury_im.messenger.util.ThreadUtils; import javax.inject.Inject; import javax.inject.Named; diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/repository/MessageRepository.java b/data/src/main/java/org/mercury_im/messenger/data/repository/MessageRepository.java similarity index 96% rename from data/src/main/java/org/mercury_im/messenger/xmpp/repository/MessageRepository.java rename to data/src/main/java/org/mercury_im/messenger/data/repository/MessageRepository.java index 82ce0c4..c2df8a4 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/repository/MessageRepository.java +++ b/data/src/main/java/org/mercury_im/messenger/data/repository/MessageRepository.java @@ -1,10 +1,10 @@ -package org.mercury_im.messenger.xmpp.repository; +package org.mercury_im.messenger.data.repository; import org.mercury_im.messenger.xmpp.model.ChatModel; import org.mercury_im.messenger.xmpp.model.ContactModel; import org.mercury_im.messenger.xmpp.model.PeerModel; import org.mercury_im.messenger.xmpp.model.MessageModel; -import org.mercury_im.core.util.ThreadUtils; +import org.mercury_im.messenger.util.ThreadUtils; import javax.inject.Inject; import javax.inject.Named; diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/repository/ReactiveXmppAccountRepository.java b/data/src/main/java/org/mercury_im/messenger/data/repository/ReactiveXmppAccountRepository.java similarity index 94% rename from data/src/main/java/org/mercury_im/messenger/xmpp/repository/ReactiveXmppAccountRepository.java rename to data/src/main/java/org/mercury_im/messenger/data/repository/ReactiveXmppAccountRepository.java index 620b7e0..9f31d15 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/repository/ReactiveXmppAccountRepository.java +++ b/data/src/main/java/org/mercury_im/messenger/data/repository/ReactiveXmppAccountRepository.java @@ -1,10 +1,9 @@ -package org.mercury_im.messenger.xmpp.repository; +package org.mercury_im.messenger.data.repository; -import org.mercury_im.messenger.core.entity.Account; -import org.mercury_im.core.data.repository.AccountRepository; -import org.mercury_im.core.data.util.Optional; -import org.mercury_im.core.util.ThreadUtils; -import org.mercury_im.messenger.xmpp.mapping.AccountMapping; +import org.mercury_im.messenger.entity.Account; +import org.mercury_im.messenger.data.util.Optional; +import org.mercury_im.messenger.util.ThreadUtils; +import org.mercury_im.messenger.data.mapping.AccountMapping; import org.mercury_im.messenger.xmpp.model.AccountModel; import java.util.ArrayList; diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/repository/RequeryRepository.java b/data/src/main/java/org/mercury_im/messenger/data/repository/RequeryRepository.java similarity index 94% rename from data/src/main/java/org/mercury_im/messenger/xmpp/repository/RequeryRepository.java rename to data/src/main/java/org/mercury_im/messenger/data/repository/RequeryRepository.java index 8e7f029..1e93c3f 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/repository/RequeryRepository.java +++ b/data/src/main/java/org/mercury_im/messenger/data/repository/RequeryRepository.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.xmpp.repository; +package org.mercury_im.messenger.data.repository; import io.reactivex.Scheduler; import io.requery.Persistable; diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/repository/RosterRepository.java b/data/src/main/java/org/mercury_im/messenger/data/repository/RosterRepository.java similarity index 98% rename from data/src/main/java/org/mercury_im/messenger/xmpp/repository/RosterRepository.java rename to data/src/main/java/org/mercury_im/messenger/data/repository/RosterRepository.java index 3eeb99e..81a6fe8 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/repository/RosterRepository.java +++ b/data/src/main/java/org/mercury_im/messenger/data/repository/RosterRepository.java @@ -1,9 +1,9 @@ -package org.mercury_im.messenger.xmpp.repository; +package org.mercury_im.messenger.data.repository; import org.mercury_im.messenger.xmpp.model.AccountModel; import org.mercury_im.messenger.xmpp.model.ContactModel; import org.mercury_im.messenger.xmpp.model.PeerModel; -import org.mercury_im.core.util.ThreadUtils; +import org.mercury_im.messenger.util.ThreadUtils; import javax.inject.Inject; import javax.inject.Named; diff --git a/data/src/main/java/org/mercury_im/messenger/xmpp/util/ChatAndPossiblyContact.java b/data/src/main/java/org/mercury_im/messenger/data/util/ChatAndPossiblyContact.java similarity index 91% rename from data/src/main/java/org/mercury_im/messenger/xmpp/util/ChatAndPossiblyContact.java rename to data/src/main/java/org/mercury_im/messenger/data/util/ChatAndPossiblyContact.java index 2805f43..0245f8c 100644 --- a/data/src/main/java/org/mercury_im/messenger/xmpp/util/ChatAndPossiblyContact.java +++ b/data/src/main/java/org/mercury_im/messenger/data/util/ChatAndPossiblyContact.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.xmpp.util; +package org.mercury_im.messenger.data.util; import org.mercury_im.messenger.xmpp.model.ChatModel; import org.mercury_im.messenger.xmpp.model.ContactModel; diff --git a/domain/src/main/java/org/mercury_im/core/MessageCenter.java b/domain/src/main/java/org/mercury_im/core/MessageCenter.java deleted file mode 100644 index 8baeb10..0000000 --- a/domain/src/main/java/org/mercury_im/core/MessageCenter.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.mercury_im.core; - -import org.mercury_im.core.transport.connection.ConnectionMethod; -import org.mercury_im.core.transport.listener.IncomingDirectMessageListener; -import org.mercury_im.messenger.core.entity.chat.Chat; -import org.mercury_im.messenger.core.entity.message.Message; - -import io.reactivex.Completable; - -public interface MessageCenter { - - Messenger getMessenger(); - - Completable sendMessage(Message message, C chat); - - void addIncomingMessageListener(IncomingDirectMessageListener listener); -} diff --git a/domain/src/main/java/org/mercury_im/core/transport/connection/ConnectionMethod.java b/domain/src/main/java/org/mercury_im/core/transport/connection/ConnectionMethod.java deleted file mode 100644 index 3aceba6..0000000 --- a/domain/src/main/java/org/mercury_im/core/transport/connection/ConnectionMethod.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.mercury_im.core.transport.connection; - -import org.mercury_im.core.Messenger; -import org.mercury_im.core.transport.ConnectionType; -import org.mercury_im.messenger.core.entity.Account; - -import io.reactivex.Completable; - -public interface ConnectionMethod { - - Account getAccount(); - - Messenger getMessenger(); - - Completable connect(); - - ConnectionType getConnectionType(); -} diff --git a/domain/src/main/java/org/mercury_im/core/transport/listener/IncomingDirectMessageListener.java b/domain/src/main/java/org/mercury_im/core/transport/listener/IncomingDirectMessageListener.java deleted file mode 100644 index 153f084..0000000 --- a/domain/src/main/java/org/mercury_im/core/transport/listener/IncomingDirectMessageListener.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.mercury_im.core.transport.listener; - -import org.mercury_im.messenger.core.entity.Account; -import org.mercury_im.messenger.core.entity.chat.DirectChat; -import org.mercury_im.messenger.core.entity.message.Message; - -public interface IncomingDirectMessageListener { - - void onIncomingDirectMessage(Account account, DirectChat chat, Message message); - -} diff --git a/domain/src/main/java/org/mercury_im/core/transport/listener/IncomingGroupChatMessageListener.java b/domain/src/main/java/org/mercury_im/core/transport/listener/IncomingGroupChatMessageListener.java deleted file mode 100644 index 2e8a116..0000000 --- a/domain/src/main/java/org/mercury_im/core/transport/listener/IncomingGroupChatMessageListener.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.mercury_im.core.transport.listener; - -import org.mercury_im.messenger.core.entity.Account; -import org.mercury_im.messenger.core.entity.chat.GroupChat; -import org.mercury_im.messenger.core.entity.message.Message; - -public interface IncomingGroupChatMessageListener { - - void onIncomingDirectMessage(Account account, GroupChat chat, Message message); - -} diff --git a/domain/src/main/java/org/mercury_im/core/transport/listener/TypingEventListener.java b/domain/src/main/java/org/mercury_im/core/transport/listener/TypingEventListener.java deleted file mode 100644 index 48489e8..0000000 --- a/domain/src/main/java/org/mercury_im/core/transport/listener/TypingEventListener.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.mercury_im.core.transport.listener; - -import org.mercury_im.messenger.core.entity.chat.Chat; -import org.mercury_im.messenger.core.entity.event.TypingEvent; - -public interface TypingEventListener { - - void onTypingEventReceived(Chat chat, TypingEvent typingEvent); -} diff --git a/domain/src/main/java/org/mercury_im/messenger/MessageCenter.java b/domain/src/main/java/org/mercury_im/messenger/MessageCenter.java new file mode 100644 index 0000000..fe5ab2c --- /dev/null +++ b/domain/src/main/java/org/mercury_im/messenger/MessageCenter.java @@ -0,0 +1,16 @@ +package org.mercury_im.messenger; + +import org.mercury_im.messenger.transport.listener.IncomingDirectMessageListener; +import org.mercury_im.messenger.entity.chat.Chat; +import org.mercury_im.messenger.entity.message.Message; + +import io.reactivex.Completable; + +public interface MessageCenter { + + Messenger getMessenger(); + + Completable sendMessage(Message message, C chat); + + void addIncomingMessageListener(IncomingDirectMessageListener listener); +} diff --git a/domain/src/main/java/org/mercury_im/core/Messenger.java b/domain/src/main/java/org/mercury_im/messenger/Messenger.java similarity index 72% rename from domain/src/main/java/org/mercury_im/core/Messenger.java rename to domain/src/main/java/org/mercury_im/messenger/Messenger.java index 32f65ec..a6753e7 100644 --- a/domain/src/main/java/org/mercury_im/core/Messenger.java +++ b/domain/src/main/java/org/mercury_im/messenger/Messenger.java @@ -1,7 +1,7 @@ -package org.mercury_im.core; +package org.mercury_im.messenger; -import org.mercury_im.core.transport.connection.ConnectionMethod; -import org.mercury_im.messenger.core.entity.Account; +import org.mercury_im.messenger.transport.connection.ConnectionMethod; +import org.mercury_im.messenger.entity.Account; import java.util.HashMap; import java.util.Map; diff --git a/domain/src/main/java/org/mercury_im/core/data/repository/AccountRepository.java b/domain/src/main/java/org/mercury_im/messenger/data/repository/AccountRepository.java similarity index 82% rename from domain/src/main/java/org/mercury_im/core/data/repository/AccountRepository.java rename to domain/src/main/java/org/mercury_im/messenger/data/repository/AccountRepository.java index 53bad4c..f24af5c 100644 --- a/domain/src/main/java/org/mercury_im/core/data/repository/AccountRepository.java +++ b/domain/src/main/java/org/mercury_im/messenger/data/repository/AccountRepository.java @@ -1,7 +1,7 @@ -package org.mercury_im.core.data.repository; +package org.mercury_im.messenger.data.repository; -import org.mercury_im.messenger.core.entity.Account; -import org.mercury_im.core.data.util.Optional; +import org.mercury_im.messenger.entity.Account; +import org.mercury_im.messenger.data.util.Optional; import java.util.List; diff --git a/domain/src/main/java/org/mercury_im/core/data/repository/ContactRepository.java b/domain/src/main/java/org/mercury_im/messenger/data/repository/ContactRepository.java similarity index 81% rename from domain/src/main/java/org/mercury_im/core/data/repository/ContactRepository.java rename to domain/src/main/java/org/mercury_im/messenger/data/repository/ContactRepository.java index 8fd754e..9681eeb 100644 --- a/domain/src/main/java/org/mercury_im/core/data/repository/ContactRepository.java +++ b/domain/src/main/java/org/mercury_im/messenger/data/repository/ContactRepository.java @@ -1,7 +1,7 @@ -package org.mercury_im.core.data.repository; +package org.mercury_im.messenger.data.repository; -import org.mercury_im.messenger.core.entity.contact.Contact; -import org.mercury_im.core.data.util.Optional; +import org.mercury_im.messenger.entity.contact.Contact; +import org.mercury_im.messenger.data.util.Optional; import java.util.List; diff --git a/domain/src/main/java/org/mercury_im/core/data/repository/DirectChatRepository.java b/domain/src/main/java/org/mercury_im/messenger/data/repository/DirectChatRepository.java similarity index 79% rename from domain/src/main/java/org/mercury_im/core/data/repository/DirectChatRepository.java rename to domain/src/main/java/org/mercury_im/messenger/data/repository/DirectChatRepository.java index 77f4dbf..6cfaeb7 100644 --- a/domain/src/main/java/org/mercury_im/core/data/repository/DirectChatRepository.java +++ b/domain/src/main/java/org/mercury_im/messenger/data/repository/DirectChatRepository.java @@ -1,9 +1,9 @@ -package org.mercury_im.core.data.repository; +package org.mercury_im.messenger.data.repository; -import org.mercury_im.messenger.core.entity.chat.DirectChat; -import org.mercury_im.messenger.core.entity.contact.Peer; -import org.mercury_im.messenger.core.entity.message.Message; -import org.mercury_im.core.data.util.Optional; +import org.mercury_im.messenger.entity.chat.DirectChat; +import org.mercury_im.messenger.entity.contact.Peer; +import org.mercury_im.messenger.entity.message.Message; +import org.mercury_im.messenger.data.util.Optional; import java.util.List; diff --git a/domain/src/main/java/org/mercury_im/core/data/repository/GroupChatRepository.java b/domain/src/main/java/org/mercury_im/messenger/data/repository/GroupChatRepository.java similarity index 83% rename from domain/src/main/java/org/mercury_im/core/data/repository/GroupChatRepository.java rename to domain/src/main/java/org/mercury_im/messenger/data/repository/GroupChatRepository.java index ad79bf2..643c527 100644 --- a/domain/src/main/java/org/mercury_im/core/data/repository/GroupChatRepository.java +++ b/domain/src/main/java/org/mercury_im/messenger/data/repository/GroupChatRepository.java @@ -1,8 +1,8 @@ -package org.mercury_im.core.data.repository; +package org.mercury_im.messenger.data.repository; -import org.mercury_im.messenger.core.entity.chat.GroupChat; -import org.mercury_im.messenger.core.entity.message.Message; -import org.mercury_im.core.data.util.Optional; +import org.mercury_im.messenger.entity.chat.GroupChat; +import org.mercury_im.messenger.entity.message.Message; +import org.mercury_im.messenger.data.util.Optional; import java.util.List; diff --git a/domain/src/main/java/org/mercury_im/core/data/util/Optional.java b/domain/src/main/java/org/mercury_im/messenger/data/util/Optional.java similarity index 89% rename from domain/src/main/java/org/mercury_im/core/data/util/Optional.java rename to domain/src/main/java/org/mercury_im/messenger/data/util/Optional.java index 786661b..c334483 100644 --- a/domain/src/main/java/org/mercury_im/core/data/util/Optional.java +++ b/domain/src/main/java/org/mercury_im/messenger/data/util/Optional.java @@ -1,4 +1,4 @@ -package org.mercury_im.core.data.util; +package org.mercury_im.messenger.data.util; /** * Since j.u.Optional is only available on Android since API lvl 24, we need this utility class. diff --git a/domain/src/main/java/org/mercury_im/core/transport/ConnectionType.java b/domain/src/main/java/org/mercury_im/messenger/transport/ConnectionType.java similarity index 91% rename from domain/src/main/java/org/mercury_im/core/transport/ConnectionType.java rename to domain/src/main/java/org/mercury_im/messenger/transport/ConnectionType.java index c9b4acb..aa04e7f 100644 --- a/domain/src/main/java/org/mercury_im/core/transport/ConnectionType.java +++ b/domain/src/main/java/org/mercury_im/messenger/transport/ConnectionType.java @@ -1,4 +1,4 @@ -package org.mercury_im.core.transport; +package org.mercury_im.messenger.transport; public enum ConnectionType { // Smack Connection Types from module transport_xmpp. diff --git a/domain/src/main/java/org/mercury_im/core/transport/connection/AbstractConnectionMethod.java b/domain/src/main/java/org/mercury_im/messenger/transport/connection/AbstractConnectionMethod.java similarity index 76% rename from domain/src/main/java/org/mercury_im/core/transport/connection/AbstractConnectionMethod.java rename to domain/src/main/java/org/mercury_im/messenger/transport/connection/AbstractConnectionMethod.java index 69ba923..7d7383f 100644 --- a/domain/src/main/java/org/mercury_im/core/transport/connection/AbstractConnectionMethod.java +++ b/domain/src/main/java/org/mercury_im/messenger/transport/connection/AbstractConnectionMethod.java @@ -1,7 +1,7 @@ -package org.mercury_im.core.transport.connection; +package org.mercury_im.messenger.transport.connection; -import org.mercury_im.core.Messenger; -import org.mercury_im.messenger.core.entity.Account; +import org.mercury_im.messenger.Messenger; +import org.mercury_im.messenger.entity.Account; public abstract class AbstractConnectionMethod implements ConnectionMethod { diff --git a/domain/src/main/java/org/mercury_im/core/transport/connection/ConnectionFactory.java b/domain/src/main/java/org/mercury_im/messenger/transport/connection/ConnectionFactory.java similarity index 51% rename from domain/src/main/java/org/mercury_im/core/transport/connection/ConnectionFactory.java rename to domain/src/main/java/org/mercury_im/messenger/transport/connection/ConnectionFactory.java index 395410b..7c9369a 100644 --- a/domain/src/main/java/org/mercury_im/core/transport/connection/ConnectionFactory.java +++ b/domain/src/main/java/org/mercury_im/messenger/transport/connection/ConnectionFactory.java @@ -1,7 +1,7 @@ -package org.mercury_im.core.transport.connection; +package org.mercury_im.messenger.transport.connection; -import org.mercury_im.core.Messenger; -import org.mercury_im.messenger.core.entity.Account; +import org.mercury_im.messenger.Messenger; +import org.mercury_im.messenger.entity.Account; public interface ConnectionFactory< CM extends ConnectionMethod> { diff --git a/domain/src/main/java/org/mercury_im/messenger/transport/connection/ConnectionMethod.java b/domain/src/main/java/org/mercury_im/messenger/transport/connection/ConnectionMethod.java new file mode 100644 index 0000000..f8c0fbb --- /dev/null +++ b/domain/src/main/java/org/mercury_im/messenger/transport/connection/ConnectionMethod.java @@ -0,0 +1,18 @@ +package org.mercury_im.messenger.transport.connection; + +import org.mercury_im.messenger.Messenger; +import org.mercury_im.messenger.transport.ConnectionType; +import org.mercury_im.messenger.entity.Account; + +import io.reactivex.Completable; + +public interface ConnectionMethod { + + Account getAccount(); + + Messenger getMessenger(); + + Completable connect(); + + ConnectionType getConnectionType(); +} diff --git a/domain/src/main/java/org/mercury_im/core/transport/connection/exception/ConnectionFailedException.java b/domain/src/main/java/org/mercury_im/messenger/transport/connection/exception/ConnectionFailedException.java similarity index 64% rename from domain/src/main/java/org/mercury_im/core/transport/connection/exception/ConnectionFailedException.java rename to domain/src/main/java/org/mercury_im/messenger/transport/connection/exception/ConnectionFailedException.java index a97fca7..add6a2c 100644 --- a/domain/src/main/java/org/mercury_im/core/transport/connection/exception/ConnectionFailedException.java +++ b/domain/src/main/java/org/mercury_im/messenger/transport/connection/exception/ConnectionFailedException.java @@ -1,4 +1,4 @@ -package org.mercury_im.core.transport.connection.exception; +package org.mercury_im.messenger.transport.connection.exception; public class ConnectionFailedException extends Exception { diff --git a/domain/src/main/java/org/mercury_im/messenger/transport/listener/IncomingDirectMessageListener.java b/domain/src/main/java/org/mercury_im/messenger/transport/listener/IncomingDirectMessageListener.java new file mode 100644 index 0000000..9e7a8d2 --- /dev/null +++ b/domain/src/main/java/org/mercury_im/messenger/transport/listener/IncomingDirectMessageListener.java @@ -0,0 +1,11 @@ +package org.mercury_im.messenger.transport.listener; + +import org.mercury_im.messenger.entity.Account; +import org.mercury_im.messenger.entity.chat.DirectChat; +import org.mercury_im.messenger.entity.message.Message; + +public interface IncomingDirectMessageListener { + + void onIncomingDirectMessage(Account account, DirectChat chat, Message message); + +} diff --git a/domain/src/main/java/org/mercury_im/messenger/transport/listener/IncomingGroupChatMessageListener.java b/domain/src/main/java/org/mercury_im/messenger/transport/listener/IncomingGroupChatMessageListener.java new file mode 100644 index 0000000..b6932f3 --- /dev/null +++ b/domain/src/main/java/org/mercury_im/messenger/transport/listener/IncomingGroupChatMessageListener.java @@ -0,0 +1,11 @@ +package org.mercury_im.messenger.transport.listener; + +import org.mercury_im.messenger.entity.Account; +import org.mercury_im.messenger.entity.chat.GroupChat; +import org.mercury_im.messenger.entity.message.Message; + +public interface IncomingGroupChatMessageListener { + + void onIncomingDirectMessage(Account account, GroupChat chat, Message message); + +} diff --git a/domain/src/main/java/org/mercury_im/messenger/transport/listener/TypingEventListener.java b/domain/src/main/java/org/mercury_im/messenger/transport/listener/TypingEventListener.java new file mode 100644 index 0000000..7662eac --- /dev/null +++ b/domain/src/main/java/org/mercury_im/messenger/transport/listener/TypingEventListener.java @@ -0,0 +1,9 @@ +package org.mercury_im.messenger.transport.listener; + +import org.mercury_im.messenger.entity.chat.Chat; +import org.mercury_im.messenger.entity.event.TypingEvent; + +public interface TypingEventListener { + + void onTypingEventReceived(Chat chat, TypingEvent typingEvent); +} diff --git a/domain/src/main/java/org/mercury_im/core/usecase/SendDirectMessage.java b/domain/src/main/java/org/mercury_im/messenger/usecase/SendDirectMessage.java similarity index 69% rename from domain/src/main/java/org/mercury_im/core/usecase/SendDirectMessage.java rename to domain/src/main/java/org/mercury_im/messenger/usecase/SendDirectMessage.java index 827a0b7..9fd0c42 100644 --- a/domain/src/main/java/org/mercury_im/core/usecase/SendDirectMessage.java +++ b/domain/src/main/java/org/mercury_im/messenger/usecase/SendDirectMessage.java @@ -1,7 +1,7 @@ -package org.mercury_im.core.usecase; +package org.mercury_im.messenger.usecase; -import org.mercury_im.messenger.core.entity.chat.DirectChat; -import org.mercury_im.messenger.core.entity.message.Message; +import org.mercury_im.messenger.entity.chat.DirectChat; +import org.mercury_im.messenger.entity.message.Message; public class SendDirectMessage { diff --git a/domain/src/main/java/org/mercury_im/core/util/ThreadUtils.java b/domain/src/main/java/org/mercury_im/messenger/util/ThreadUtils.java similarity index 89% rename from domain/src/main/java/org/mercury_im/core/util/ThreadUtils.java rename to domain/src/main/java/org/mercury_im/messenger/util/ThreadUtils.java index c8615b1..6a5d196 100644 --- a/domain/src/main/java/org/mercury_im/core/util/ThreadUtils.java +++ b/domain/src/main/java/org/mercury_im/messenger/util/ThreadUtils.java @@ -1,4 +1,4 @@ -package org.mercury_im.core.util; +package org.mercury_im.messenger.util; /** * Name constants used by dagger in combination with the @Named annotation. diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/chat/DirectChat.java b/entity/src/main/java/org/mercury_im/messenger/core/entity/chat/DirectChat.java deleted file mode 100644 index c13b637..0000000 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/chat/DirectChat.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.mercury_im.messenger.core.entity.chat; - -import org.mercury_im.messenger.core.entity.contact.Peer; - -public interface DirectChat extends Chat { - - Peer getPeer(); - - void setPeer(Peer peer); - -} diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/Account.java b/entity/src/main/java/org/mercury_im/messenger/entity/Account.java similarity index 92% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/Account.java rename to entity/src/main/java/org/mercury_im/messenger/entity/Account.java index a58d562..251ce19 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/Account.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/Account.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.core.entity; +package org.mercury_im.messenger.entity; /** * User Account entity. diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/IAccount.java b/entity/src/main/java/org/mercury_im/messenger/entity/IAccount.java similarity index 95% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/IAccount.java rename to entity/src/main/java/org/mercury_im/messenger/entity/IAccount.java index 74d51ad..9af4a5e 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/IAccount.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/IAccount.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.core.entity; +package org.mercury_im.messenger.entity; public class IAccount implements Account { diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/PasswordAuthentication.java b/entity/src/main/java/org/mercury_im/messenger/entity/PasswordAuthentication.java similarity index 85% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/PasswordAuthentication.java rename to entity/src/main/java/org/mercury_im/messenger/entity/PasswordAuthentication.java index 62da690..e08d2e8 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/PasswordAuthentication.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/PasswordAuthentication.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.core.entity; +package org.mercury_im.messenger.entity; public class PasswordAuthentication implements Account.AuthMethod { diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/chat/Chat.java b/entity/src/main/java/org/mercury_im/messenger/entity/chat/Chat.java similarity index 70% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/chat/Chat.java rename to entity/src/main/java/org/mercury_im/messenger/entity/chat/Chat.java index b059a83..7882224 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/chat/Chat.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/chat/Chat.java @@ -1,6 +1,6 @@ -package org.mercury_im.messenger.core.entity.chat; +package org.mercury_im.messenger.entity.chat; -import org.mercury_im.messenger.core.entity.Account; +import org.mercury_im.messenger.entity.Account; public interface Chat { diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/chat/ChatPreferences.java b/entity/src/main/java/org/mercury_im/messenger/entity/chat/ChatPreferences.java similarity index 94% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/chat/ChatPreferences.java rename to entity/src/main/java/org/mercury_im/messenger/entity/chat/ChatPreferences.java index 77abeaf..aebc4a3 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/chat/ChatPreferences.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/chat/ChatPreferences.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.core.entity.chat; +package org.mercury_im.messenger.entity.chat; public interface ChatPreferences { diff --git a/entity/src/main/java/org/mercury_im/messenger/entity/chat/DirectChat.java b/entity/src/main/java/org/mercury_im/messenger/entity/chat/DirectChat.java new file mode 100644 index 0000000..c2ab095 --- /dev/null +++ b/entity/src/main/java/org/mercury_im/messenger/entity/chat/DirectChat.java @@ -0,0 +1,11 @@ +package org.mercury_im.messenger.entity.chat; + +import org.mercury_im.messenger.entity.contact.Peer; + +public interface DirectChat extends Chat { + + Peer getPeer(); + + void setPeer(Peer peer); + +} diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/chat/GroupChat.java b/entity/src/main/java/org/mercury_im/messenger/entity/chat/GroupChat.java similarity index 73% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/chat/GroupChat.java rename to entity/src/main/java/org/mercury_im/messenger/entity/chat/GroupChat.java index a41d85d..c825991 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/chat/GroupChat.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/chat/GroupChat.java @@ -1,6 +1,6 @@ -package org.mercury_im.messenger.core.entity.chat; +package org.mercury_im.messenger.entity.chat; -import org.mercury_im.messenger.core.entity.contact.Peer; +import org.mercury_im.messenger.entity.contact.Peer; import java.util.Set; diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/chat/IChatPreferences.java b/entity/src/main/java/org/mercury_im/messenger/entity/chat/IChatPreferences.java similarity index 97% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/chat/IChatPreferences.java rename to entity/src/main/java/org/mercury_im/messenger/entity/chat/IChatPreferences.java index 73e3558..adc1020 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/chat/IChatPreferences.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/chat/IChatPreferences.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.core.entity.chat; +package org.mercury_im.messenger.entity.chat; public class IChatPreferences implements ChatPreferences { diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/chat/IDirectChat.java b/entity/src/main/java/org/mercury_im/messenger/entity/chat/IDirectChat.java similarity index 84% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/chat/IDirectChat.java rename to entity/src/main/java/org/mercury_im/messenger/entity/chat/IDirectChat.java index 5b35ed0..5a37e9c 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/chat/IDirectChat.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/chat/IDirectChat.java @@ -1,7 +1,7 @@ -package org.mercury_im.messenger.core.entity.chat; +package org.mercury_im.messenger.entity.chat; -import org.mercury_im.messenger.core.entity.Account; -import org.mercury_im.messenger.core.entity.contact.Peer; +import org.mercury_im.messenger.entity.Account; +import org.mercury_im.messenger.entity.contact.Peer; public class IDirectChat implements DirectChat { diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/chat/IGroupChat.java b/entity/src/main/java/org/mercury_im/messenger/entity/chat/IGroupChat.java similarity index 89% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/chat/IGroupChat.java rename to entity/src/main/java/org/mercury_im/messenger/entity/chat/IGroupChat.java index b641906..b7e87f6 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/chat/IGroupChat.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/chat/IGroupChat.java @@ -1,7 +1,7 @@ -package org.mercury_im.messenger.core.entity.chat; +package org.mercury_im.messenger.entity.chat; -import org.mercury_im.messenger.core.entity.Account; -import org.mercury_im.messenger.core.entity.contact.Peer; +import org.mercury_im.messenger.entity.Account; +import org.mercury_im.messenger.entity.contact.Peer; import java.util.Set; diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/chat/INotificationPreferences.java b/entity/src/main/java/org/mercury_im/messenger/entity/chat/INotificationPreferences.java similarity index 92% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/chat/INotificationPreferences.java rename to entity/src/main/java/org/mercury_im/messenger/entity/chat/INotificationPreferences.java index e6cce4e..dfffcd2 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/chat/INotificationPreferences.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/chat/INotificationPreferences.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.core.entity.chat; +package org.mercury_im.messenger.entity.chat; public class INotificationPreferences implements ChatPreferences.NotificationPreferences { diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/contact/Contact.java b/entity/src/main/java/org/mercury_im/messenger/entity/contact/Contact.java similarity index 94% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/contact/Contact.java rename to entity/src/main/java/org/mercury_im/messenger/entity/contact/Contact.java index cde9ae3..86968b8 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/contact/Contact.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/contact/Contact.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.core.entity.contact; +package org.mercury_im.messenger.entity.contact; public interface Contact extends Peer { diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/contact/IContact.java b/entity/src/main/java/org/mercury_im/messenger/entity/contact/IContact.java similarity index 91% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/contact/IContact.java rename to entity/src/main/java/org/mercury_im/messenger/entity/contact/IContact.java index a579ff3..6f9c449 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/contact/IContact.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/contact/IContact.java @@ -1,6 +1,6 @@ -package org.mercury_im.messenger.core.entity.contact; +package org.mercury_im.messenger.entity.contact; -import org.mercury_im.messenger.core.entity.Account; +import org.mercury_im.messenger.entity.Account; public class IContact implements Contact { diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/contact/IPeer.java b/entity/src/main/java/org/mercury_im/messenger/entity/contact/IPeer.java similarity index 88% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/contact/IPeer.java rename to entity/src/main/java/org/mercury_im/messenger/entity/contact/IPeer.java index 847d94a..389236a 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/contact/IPeer.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/contact/IPeer.java @@ -1,6 +1,6 @@ -package org.mercury_im.messenger.core.entity.contact; +package org.mercury_im.messenger.entity.contact; -import org.mercury_im.messenger.core.entity.Account; +import org.mercury_im.messenger.entity.Account; public class IPeer implements Peer { diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/contact/Peer.java b/entity/src/main/java/org/mercury_im/messenger/entity/contact/Peer.java similarity index 79% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/contact/Peer.java rename to entity/src/main/java/org/mercury_im/messenger/entity/contact/Peer.java index 5f39fc2..1b1b7e7 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/contact/Peer.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/contact/Peer.java @@ -1,6 +1,6 @@ -package org.mercury_im.messenger.core.entity.contact; +package org.mercury_im.messenger.entity.contact; -import org.mercury_im.messenger.core.entity.Account; +import org.mercury_im.messenger.entity.Account; /** * Defines a user on the network (eg. a contact, chat partner, group chat member etc). diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/event/ITypingEvent.java b/entity/src/main/java/org/mercury_im/messenger/entity/event/ITypingEvent.java similarity index 76% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/event/ITypingEvent.java rename to entity/src/main/java/org/mercury_im/messenger/entity/event/ITypingEvent.java index fd02b77..bc5d4eb 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/event/ITypingEvent.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/event/ITypingEvent.java @@ -1,6 +1,6 @@ -package org.mercury_im.messenger.core.entity.event; +package org.mercury_im.messenger.entity.event; -import org.mercury_im.messenger.core.entity.contact.Peer; +import org.mercury_im.messenger.entity.contact.Peer; import java.util.Map; diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/event/TypingEvent.java b/entity/src/main/java/org/mercury_im/messenger/entity/event/TypingEvent.java similarity index 60% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/event/TypingEvent.java rename to entity/src/main/java/org/mercury_im/messenger/entity/event/TypingEvent.java index a85d364..c0db012 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/event/TypingEvent.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/event/TypingEvent.java @@ -1,6 +1,6 @@ -package org.mercury_im.messenger.core.entity.event; +package org.mercury_im.messenger.entity.event; -import org.mercury_im.messenger.core.entity.contact.Peer; +import org.mercury_im.messenger.entity.contact.Peer; import java.util.Map; diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/event/TypingState.java b/entity/src/main/java/org/mercury_im/messenger/entity/event/TypingState.java similarity index 87% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/event/TypingState.java rename to entity/src/main/java/org/mercury_im/messenger/entity/event/TypingState.java index 5c6a14e..f27c125 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/event/TypingState.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/event/TypingState.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.core.entity.event; +package org.mercury_im.messenger.entity.event; public enum TypingState { /** diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/message/IMessage.java b/entity/src/main/java/org/mercury_im/messenger/entity/message/IMessage.java similarity index 96% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/message/IMessage.java rename to entity/src/main/java/org/mercury_im/messenger/entity/message/IMessage.java index 4ded303..66c6bcf 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/message/IMessage.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/message/IMessage.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.core.entity.message; +package org.mercury_im.messenger.entity.message; import java.util.Date; import java.util.List; diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/message/IMessagePayload.java b/entity/src/main/java/org/mercury_im/messenger/entity/message/IMessagePayload.java similarity index 73% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/message/IMessagePayload.java rename to entity/src/main/java/org/mercury_im/messenger/entity/message/IMessagePayload.java index 30c7811..d2321bb 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/message/IMessagePayload.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/message/IMessagePayload.java @@ -1,6 +1,6 @@ -package org.mercury_im.messenger.core.entity.message; +package org.mercury_im.messenger.entity.message; -import org.mercury_im.messenger.core.entity.message.content.MessageContent; +import org.mercury_im.messenger.entity.message.content.MessageContent; import java.util.List; diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/message/Message.java b/entity/src/main/java/org/mercury_im/messenger/entity/message/Message.java similarity index 92% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/message/Message.java rename to entity/src/main/java/org/mercury_im/messenger/entity/message/Message.java index ce85330..c5bcc44 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/message/Message.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/message/Message.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.core.entity.message; +package org.mercury_im.messenger.entity.message; import java.util.Date; import java.util.List; diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/message/MessageDeliveryState.java b/entity/src/main/java/org/mercury_im/messenger/entity/message/MessageDeliveryState.java similarity index 72% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/message/MessageDeliveryState.java rename to entity/src/main/java/org/mercury_im/messenger/entity/message/MessageDeliveryState.java index dfeb33d..2485638 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/message/MessageDeliveryState.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/message/MessageDeliveryState.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.core.entity.message; +package org.mercury_im.messenger.entity.message; public enum MessageDeliveryState { pending_delivery, diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/message/MessageMetadata.java b/entity/src/main/java/org/mercury_im/messenger/entity/message/MessageMetadata.java similarity index 80% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/message/MessageMetadata.java rename to entity/src/main/java/org/mercury_im/messenger/entity/message/MessageMetadata.java index 3f8b225..03e7ac7 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/message/MessageMetadata.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/message/MessageMetadata.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.core.entity.message; +package org.mercury_im.messenger.entity.message; /** * Interface to allow additional, protocol specific metadata to be attached to the message. diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/message/MessagePayload.java b/entity/src/main/java/org/mercury_im/messenger/entity/message/MessagePayload.java similarity index 78% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/message/MessagePayload.java rename to entity/src/main/java/org/mercury_im/messenger/entity/message/MessagePayload.java index 24bc2b2..886a00c 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/message/MessagePayload.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/message/MessagePayload.java @@ -1,6 +1,6 @@ -package org.mercury_im.messenger.core.entity.message; +package org.mercury_im.messenger.entity.message; -import org.mercury_im.messenger.core.entity.message.content.MessageContent; +import org.mercury_im.messenger.entity.message.content.MessageContent; import java.util.List; diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/message/content/MessageContent.java b/entity/src/main/java/org/mercury_im/messenger/entity/message/content/MessageContent.java similarity index 71% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/message/content/MessageContent.java rename to entity/src/main/java/org/mercury_im/messenger/entity/message/content/MessageContent.java index 4b9f9f0..c6bce51 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/message/content/MessageContent.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/message/content/MessageContent.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.core.entity.message.content; +package org.mercury_im.messenger.entity.message.content; public interface MessageContent { diff --git a/entity/src/main/java/org/mercury_im/messenger/core/entity/message/content/TextMessageContent.java b/entity/src/main/java/org/mercury_im/messenger/entity/message/content/TextMessageContent.java similarity index 80% rename from entity/src/main/java/org/mercury_im/messenger/core/entity/message/content/TextMessageContent.java rename to entity/src/main/java/org/mercury_im/messenger/entity/message/content/TextMessageContent.java index 64c5940..7177b60 100644 --- a/entity/src/main/java/org/mercury_im/messenger/core/entity/message/content/TextMessageContent.java +++ b/entity/src/main/java/org/mercury_im/messenger/entity/message/content/TextMessageContent.java @@ -1,4 +1,4 @@ -package org.mercury_im.messenger.core.entity.message.content; +package org.mercury_im.messenger.entity.message.content; public class TextMessageContent implements MessageContent.Body { diff --git a/settings.gradle b/settings.gradle index cf4c43f..afa6a4f 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,7 @@ include ':entity', ':data', ':domain', - ':transport_xmpp', + ':xmpp', ':app', ':core-old', ':view_entity' diff --git a/view_entity/src/main/java/org/mercury_im/messenger/view/entity/ViewInterlocutor.java b/view_entity/src/main/java/org/mercury_im/messenger/view/entity/ViewInterlocutor.java index 7103a61..cc7585b 100644 --- a/view_entity/src/main/java/org/mercury_im/messenger/view/entity/ViewInterlocutor.java +++ b/view_entity/src/main/java/org/mercury_im/messenger/view/entity/ViewInterlocutor.java @@ -1,6 +1,6 @@ package org.mercury_im.messenger.view.entity; -import org.mercury_im.messenger.core.entity.contact.Contact; +import org.mercury_im.messenger.entity.contact.Contact; import org.mercury_im.messenger.view.entity.definition.InterlocutorViewEntity; public class ViewInterlocutor implements InterlocutorViewEntity { diff --git a/view_entity/src/main/java/org/mercury_im/messenger/view/entity/definition/InterlocutorViewEntity.java b/view_entity/src/main/java/org/mercury_im/messenger/view/entity/definition/InterlocutorViewEntity.java index 3bc9359..d619132 100644 --- a/view_entity/src/main/java/org/mercury_im/messenger/view/entity/definition/InterlocutorViewEntity.java +++ b/view_entity/src/main/java/org/mercury_im/messenger/view/entity/definition/InterlocutorViewEntity.java @@ -1,6 +1,6 @@ package org.mercury_im.messenger.view.entity.definition; -import org.mercury_im.messenger.core.entity.contact.Contact; +import org.mercury_im.messenger.entity.contact.Contact; public interface InterlocutorViewEntity { diff --git a/transport_xmpp/.gitignore b/xmpp/.gitignore similarity index 100% rename from transport_xmpp/.gitignore rename to xmpp/.gitignore diff --git a/transport_xmpp/build.gradle b/xmpp/build.gradle similarity index 100% rename from transport_xmpp/build.gradle rename to xmpp/build.gradle diff --git a/transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/message/XmppDirectMessageCenter.java b/xmpp/src/main/java/org/mercury_im/messenger/domain/xmpp/XmppDirectMessageCenter.java similarity index 81% rename from transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/message/XmppDirectMessageCenter.java rename to xmpp/src/main/java/org/mercury_im/messenger/domain/xmpp/XmppDirectMessageCenter.java index 76a61dc..b0ecd30 100644 --- a/transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/message/XmppDirectMessageCenter.java +++ b/xmpp/src/main/java/org/mercury_im/messenger/domain/xmpp/XmppDirectMessageCenter.java @@ -1,16 +1,16 @@ -package org.mercury_im.xmpp.domain.connection.message; +package org.mercury_im.messenger.domain.xmpp; import org.jivesoftware.smack.chat2.Chat; import org.jivesoftware.smack.chat2.ChatManager; import org.jivesoftware.smackx.sid.element.OriginIdElement; import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.impl.JidCreate; -import org.mercury_im.core.Messenger; -import org.mercury_im.core.transport.listener.IncomingDirectMessageListener; -import org.mercury_im.messenger.core.entity.message.Message; -import org.mercury_im.core.MessageCenter; -import org.mercury_im.messenger.core.entity.chat.DirectChat; -import org.mercury_im.xmpp.domain.connection.XmppTcpConnectionMethod; +import org.mercury_im.messenger.Messenger; +import org.mercury_im.messenger.transport.listener.IncomingDirectMessageListener; +import org.mercury_im.messenger.entity.message.Message; +import org.mercury_im.messenger.MessageCenter; +import org.mercury_im.messenger.entity.chat.DirectChat; +import org.mercury_im.messenger.transport.xmpp.XmppTcpConnectionMethod; import io.reactivex.Completable; diff --git a/transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppConnectionFactory.java b/xmpp/src/main/java/org/mercury_im/messenger/transport/xmpp/XmppConnectionFactory.java similarity index 79% rename from transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppConnectionFactory.java rename to xmpp/src/main/java/org/mercury_im/messenger/transport/xmpp/XmppConnectionFactory.java index 1442c84..5f07e73 100644 --- a/transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppConnectionFactory.java +++ b/xmpp/src/main/java/org/mercury_im/messenger/transport/xmpp/XmppConnectionFactory.java @@ -1,10 +1,10 @@ -package org.mercury_im.xmpp.domain.connection; +package org.mercury_im.messenger.transport.xmpp; import org.jivesoftware.smack.ConnectionConfiguration; import org.jivesoftware.smack.XMPPConnection; -import org.mercury_im.core.Messenger; -import org.mercury_im.core.transport.connection.ConnectionFactory; -import org.mercury_im.messenger.core.entity.Account; +import org.mercury_im.messenger.Messenger; +import org.mercury_im.messenger.transport.connection.ConnectionFactory; +import org.mercury_im.messenger.entity.Account; public abstract class XmppConnectionFactory implements ConnectionFactory { diff --git a/transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppTcpConnectionFactory.java b/xmpp/src/main/java/org/mercury_im/messenger/transport/xmpp/XmppTcpConnectionFactory.java similarity index 86% rename from transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppTcpConnectionFactory.java rename to xmpp/src/main/java/org/mercury_im/messenger/transport/xmpp/XmppTcpConnectionFactory.java index 9834a32..2fa9808 100644 --- a/transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppTcpConnectionFactory.java +++ b/xmpp/src/main/java/org/mercury_im/messenger/transport/xmpp/XmppTcpConnectionFactory.java @@ -1,13 +1,13 @@ -package org.mercury_im.xmpp.domain.connection; +package org.mercury_im.messenger.transport.xmpp; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.tcp.XMPPTCPConnection; import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration; import org.jxmpp.jid.EntityBareJid; import org.jxmpp.jid.impl.JidCreate; -import org.mercury_im.core.Messenger; -import org.mercury_im.messenger.core.entity.Account; -import org.mercury_im.messenger.core.entity.PasswordAuthentication; +import org.mercury_im.messenger.Messenger; +import org.mercury_im.messenger.entity.Account; +import org.mercury_im.messenger.entity.PasswordAuthentication; public class XmppTcpConnectionFactory extends XmppConnectionFactory { diff --git a/transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppTcpConnectionMethod.java b/xmpp/src/main/java/org/mercury_im/messenger/transport/xmpp/XmppTcpConnectionMethod.java similarity index 85% rename from transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppTcpConnectionMethod.java rename to xmpp/src/main/java/org/mercury_im/messenger/transport/xmpp/XmppTcpConnectionMethod.java index 4808af8..585008b 100644 --- a/transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppTcpConnectionMethod.java +++ b/xmpp/src/main/java/org/mercury_im/messenger/transport/xmpp/XmppTcpConnectionMethod.java @@ -1,11 +1,11 @@ -package org.mercury_im.xmpp.domain.connection; +package org.mercury_im.messenger.transport.xmpp; import org.jivesoftware.smack.AbstractXMPPConnection; import org.jivesoftware.smack.XMPPConnection; -import org.mercury_im.core.Messenger; -import org.mercury_im.core.transport.ConnectionType; -import org.mercury_im.core.transport.connection.AbstractConnectionMethod; -import org.mercury_im.messenger.core.entity.Account; +import org.mercury_im.messenger.Messenger; +import org.mercury_im.messenger.transport.ConnectionType; +import org.mercury_im.messenger.transport.connection.AbstractConnectionMethod; +import org.mercury_im.messenger.entity.Account; import java.util.logging.Level; import java.util.logging.Logger;