Mercury-IM/Mercury-IM
Mercury-IM/Mercury-IM
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Mercury-IM synced 2024-06-18 09:34:52 +02:00
Code Issues Projects Releases Wiki Activity

More package renaming shenaningans

Browse source
This commit is contained in:
Paul Schaub 2019-11-18 23:51:27 +01:00
parent cf034939b4
commit 80ebce7c90
Signed by: vanitasvitae
GPG key ID: 62BEE9264BF17311
95 changed files with 248 additions and 338 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/build.gradle
View file

@ -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'

11
app/src/main/java/org/mercury_im/messenger/MercuryImApplication.java
View file

@ -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;
}

4
app/src/main/java/org/mercury_im/messenger/Notifications.java
View file

@ -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();

86
app/src/main/java/org/mercury_im/messenger/ParcelableXMPPTCPConnectionConfiguration.java
View file

@ -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<ParcelableXMPPTCPConnectionConfiguration> CREATOR = new Creator<ParcelableXMPPTCPConnectionConfiguration>() {
@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;
}
}

2
app/src/main/java/org/mercury_im/messenger/di/module/AndroidPersistenceModule.java
View file

@ -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;

15
app/src/main/java/org/mercury_im/messenger/di/module/AppModule.java
View file

@ -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;
}
}

2
app/src/main/java/org/mercury_im/messenger/ui/MainActivity.java
View file

@ -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;

2
app/src/main/java/org/mercury_im/messenger/ui/chat/ChatActivity.java
View file

@ -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;

6
app/src/main/java/org/mercury_im/messenger/ui/chat/ChatViewModel.java
View file

@ -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;

4
app/src/main/java/org/mercury_im/messenger/ui/chatlist/ChatListViewModel.java
View file

@ -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;

2
app/src/main/java/org/mercury_im/messenger/ui/roster/contacts/ContactListItemViewModel.java
View file

@ -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;

2
app/src/main/java/org/mercury_im/messenger/ui/roster/contacts/ContactListViewModel.java
View file

@ -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;

2
core-old/src/main/java/org/mercury_im/core/data/util/ContactNameUtil.java → core-old/src/main/java/org/mercury_im/domain/data/util/ContactNameUtil.java
View file

@ -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;

1
core-old/src/main/java/org/mercury_im/messenger/core/di/CenterModule.java
View file

@ -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;

4
data/src/main/java/org/mercury_im/messenger/xmpp/converter/SaslConditionConverter.java → data/src/main/java/org/mercury_im/messenger/data/converter/SaslConditionConverter.java
View file

@ -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;

4
data/src/main/java/org/mercury_im/messenger/xmpp/converter/SubscriptionDirectionConverter.java → data/src/main/java/org/mercury_im/messenger/data/converter/SubscriptionDirectionConverter.java
View file

@ -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;

12
data/src/main/java/org/mercury_im/messenger/xmpp/di/RequeryModule.java → data/src/main/java/org/mercury_im/messenger/data/di/RequeryModule.java
View file

@ -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;

2
data/src/main/java/org/mercury_im/messenger/xmpp/enums/SaslCondition.java → data/src/main/java/org/mercury_im/messenger/data/enums/SaslCondition.java
View file

@ -1,4 +1,4 @@
package org.mercury_im.messenger.xmpp.enums;
package org.mercury_im.messenger.data.enums;
public enum SaslCondition {

2
data/src/main/java/org/mercury_im/messenger/xmpp/enums/SubscriptionDirection.java → data/src/main/java/org/mercury_im/messenger/data/enums/SubscriptionDirection.java
View file

@ -1,4 +1,4 @@
package org.mercury_im.messenger.xmpp.enums;
package org.mercury_im.messenger.data.enums;
public enum SubscriptionDirection {
none,

8
data/src/main/java/org/mercury_im/messenger/xmpp/mapping/AccountMapping.java → data/src/main/java/org/mercury_im/messenger/data/mapping/AccountMapping.java
View file

@ -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 {

2
data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractAccountModel.java → data/src/main/java/org/mercury_im/messenger/data/model/AbstractAccountModel.java
View file

@ -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;

4
data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractChatModel.java → data/src/main/java/org/mercury_im/messenger/data/model/AbstractChatModel.java
View file

@ -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;

7
data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractContactModel.java → data/src/main/java/org/mercury_im/messenger/data/model/AbstractContactModel.java
View file

@ -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;

2
data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractEntityCapsModel.java → data/src/main/java/org/mercury_im/messenger/data/model/AbstractEntityCapsModel.java
View file

@ -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;

5
data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractLastChatMessageRelation.java → data/src/main/java/org/mercury_im/messenger/data/model/AbstractLastChatMessageRelation.java
View file

@ -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;

5
data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractLastReadChatMessageRelation.java → data/src/main/java/org/mercury_im/messenger/data/model/AbstractLastReadChatMessageRelation.java
View file

@ -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;

4
data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractMessageModel.java → data/src/main/java/org/mercury_im/messenger/data/model/AbstractMessageModel.java
View file

@ -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;

4
data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractPeerModel.java → data/src/main/java/org/mercury_im/messenger/data/model/AbstractPeerModel.java
View file

@ -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;

5
data/src/main/java/org/mercury_im/messenger/xmpp/model/AbstractSaslAuthenticationResultModel.java → data/src/main/java/org/mercury_im/messenger/data/model/AbstractSaslAuthenticationResultModel.java
View file

@ -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;

4
data/src/main/java/org/mercury_im/messenger/xmpp/repository/AbstractRepository.java → data/src/main/java/org/mercury_im/messenger/data/repository/AbstractRepository.java
View file

@ -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;

6
data/src/main/java/org/mercury_im/messenger/xmpp/repository/ChatRepository.java → data/src/main/java/org/mercury_im/messenger/data/repository/ChatRepository.java
View file

@ -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;

4
data/src/main/java/org/mercury_im/messenger/xmpp/repository/EntityCapsRepository.java → data/src/main/java/org/mercury_im/messenger/data/repository/EntityCapsRepository.java
View file

@ -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;

4
data/src/main/java/org/mercury_im/messenger/xmpp/repository/MessageRepository.java → data/src/main/java/org/mercury_im/messenger/data/repository/MessageRepository.java
View file

@ -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;

11
data/src/main/java/org/mercury_im/messenger/xmpp/repository/ReactiveXmppAccountRepository.java → data/src/main/java/org/mercury_im/messenger/data/repository/ReactiveXmppAccountRepository.java
View file

@ -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;

2
data/src/main/java/org/mercury_im/messenger/xmpp/repository/RequeryRepository.java → data/src/main/java/org/mercury_im/messenger/data/repository/RequeryRepository.java
View file

@ -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;

4
data/src/main/java/org/mercury_im/messenger/xmpp/repository/RosterRepository.java → data/src/main/java/org/mercury_im/messenger/data/repository/RosterRepository.java
View file

@ -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;

2
data/src/main/java/org/mercury_im/messenger/xmpp/util/ChatAndPossiblyContact.java → data/src/main/java/org/mercury_im/messenger/data/util/ChatAndPossiblyContact.java
View file

@ -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;

17
domain/src/main/java/org/mercury_im/core/MessageCenter.java
View file

@ -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<C extends Chat> {
Messenger getMessenger();
Completable sendMessage(Message message, C chat);
void addIncomingMessageListener(IncomingDirectMessageListener listener);
}

18
domain/src/main/java/org/mercury_im/core/transport/connection/ConnectionMethod.java
View file

@ -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();
}

11
domain/src/main/java/org/mercury_im/core/transport/listener/IncomingDirectMessageListener.java
View file

@ -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);
}

11
domain/src/main/java/org/mercury_im/core/transport/listener/IncomingGroupChatMessageListener.java
View file

@ -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);
}

9
domain/src/main/java/org/mercury_im/core/transport/listener/TypingEventListener.java
View file

@ -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);
}

16
domain/src/main/java/org/mercury_im/messenger/MessageCenter.java Normal file
View file

@ -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<C extends Chat> {
Messenger getMessenger();
Completable sendMessage(Message message, C chat);
void addIncomingMessageListener(IncomingDirectMessageListener listener);
}

6
domain/src/main/java/org/mercury_im/core/Messenger.java → domain/src/main/java/org/mercury_im/messenger/Messenger.java
View file

@ -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;

6
domain/src/main/java/org/mercury_im/core/data/repository/AccountRepository.java → domain/src/main/java/org/mercury_im/messenger/data/repository/AccountRepository.java
View file

@ -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;

6
domain/src/main/java/org/mercury_im/core/data/repository/ContactRepository.java → domain/src/main/java/org/mercury_im/messenger/data/repository/ContactRepository.java
View file

@ -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;

10
domain/src/main/java/org/mercury_im/core/data/repository/DirectChatRepository.java → domain/src/main/java/org/mercury_im/messenger/data/repository/DirectChatRepository.java
View file

@ -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;

8
domain/src/main/java/org/mercury_im/core/data/repository/GroupChatRepository.java → domain/src/main/java/org/mercury_im/messenger/data/repository/GroupChatRepository.java
View file

@ -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;

2
domain/src/main/java/org/mercury_im/core/data/util/Optional.java → domain/src/main/java/org/mercury_im/messenger/data/util/Optional.java
View file

@ -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.

2
domain/src/main/java/org/mercury_im/core/transport/ConnectionType.java → domain/src/main/java/org/mercury_im/messenger/transport/ConnectionType.java
View file

@ -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.

6
domain/src/main/java/org/mercury_im/core/transport/connection/AbstractConnectionMethod.java → domain/src/main/java/org/mercury_im/messenger/transport/connection/AbstractConnectionMethod.java
View file

@ -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 {

6
domain/src/main/java/org/mercury_im/core/transport/connection/ConnectionFactory.java → domain/src/main/java/org/mercury_im/messenger/transport/connection/ConnectionFactory.java
View file

@ -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> {

18
domain/src/main/java/org/mercury_im/messenger/transport/connection/ConnectionMethod.java Normal file
View file

@ -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();
}

2
domain/src/main/java/org/mercury_im/core/transport/connection/exception/ConnectionFailedException.java → domain/src/main/java/org/mercury_im/messenger/transport/connection/exception/ConnectionFailedException.java
View file

@ -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 {

11
domain/src/main/java/org/mercury_im/messenger/transport/listener/IncomingDirectMessageListener.java Normal file
View file

@ -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);
}

11
domain/src/main/java/org/mercury_im/messenger/transport/listener/IncomingGroupChatMessageListener.java Normal file
View file

@ -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);
}

9
domain/src/main/java/org/mercury_im/messenger/transport/listener/TypingEventListener.java Normal file
View file

@ -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);
}

6
domain/src/main/java/org/mercury_im/core/usecase/SendDirectMessage.java → domain/src/main/java/org/mercury_im/messenger/usecase/SendDirectMessage.java
View file

@ -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 {

2
domain/src/main/java/org/mercury_im/core/util/ThreadUtils.java → domain/src/main/java/org/mercury_im/messenger/util/ThreadUtils.java
View file

@ -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.

11
entity/src/main/java/org/mercury_im/messenger/core/entity/chat/DirectChat.java
View file

@ -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);
}

2
entity/src/main/java/org/mercury_im/messenger/core/entity/Account.java → entity/src/main/java/org/mercury_im/messenger/entity/Account.java
View file

@ -1,4 +1,4 @@
package org.mercury_im.messenger.core.entity;
package org.mercury_im.messenger.entity;
/**
* User Account entity.

2
entity/src/main/java/org/mercury_im/messenger/core/entity/IAccount.java → entity/src/main/java/org/mercury_im/messenger/entity/IAccount.java
View file

@ -1,4 +1,4 @@
package org.mercury_im.messenger.core.entity;
package org.mercury_im.messenger.entity;
public class IAccount implements Account {

2
entity/src/main/java/org/mercury_im/messenger/core/entity/PasswordAuthentication.java → entity/src/main/java/org/mercury_im/messenger/entity/PasswordAuthentication.java
View file

@ -1,4 +1,4 @@
package org.mercury_im.messenger.core.entity;
package org.mercury_im.messenger.entity;
public class PasswordAuthentication implements Account.AuthMethod {

4
entity/src/main/java/org/mercury_im/messenger/core/entity/chat/Chat.java → entity/src/main/java/org/mercury_im/messenger/entity/chat/Chat.java
View file

@ -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 {

2
entity/src/main/java/org/mercury_im/messenger/core/entity/chat/ChatPreferences.java → entity/src/main/java/org/mercury_im/messenger/entity/chat/ChatPreferences.java
View file

@ -1,4 +1,4 @@
package org.mercury_im.messenger.core.entity.chat;
package org.mercury_im.messenger.entity.chat;
public interface ChatPreferences {

11
entity/src/main/java/org/mercury_im/messenger/entity/chat/DirectChat.java Normal file
View file

@ -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);
}

4
entity/src/main/java/org/mercury_im/messenger/core/entity/chat/GroupChat.java → entity/src/main/java/org/mercury_im/messenger/entity/chat/GroupChat.java
View file

@ -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;

2
entity/src/main/java/org/mercury_im/messenger/core/entity/chat/IChatPreferences.java → entity/src/main/java/org/mercury_im/messenger/entity/chat/IChatPreferences.java
View file

@ -1,4 +1,4 @@
package org.mercury_im.messenger.core.entity.chat;
package org.mercury_im.messenger.entity.chat;
public class IChatPreferences implements ChatPreferences {

6
entity/src/main/java/org/mercury_im/messenger/core/entity/chat/IDirectChat.java → entity/src/main/java/org/mercury_im/messenger/entity/chat/IDirectChat.java
View file

@ -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 {

6
entity/src/main/java/org/mercury_im/messenger/core/entity/chat/IGroupChat.java → entity/src/main/java/org/mercury_im/messenger/entity/chat/IGroupChat.java
View file

@ -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;

2
entity/src/main/java/org/mercury_im/messenger/core/entity/chat/INotificationPreferences.java → entity/src/main/java/org/mercury_im/messenger/entity/chat/INotificationPreferences.java
View file

@ -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 {

2
entity/src/main/java/org/mercury_im/messenger/core/entity/contact/Contact.java → entity/src/main/java/org/mercury_im/messenger/entity/contact/Contact.java
View file

@ -1,4 +1,4 @@
package org.mercury_im.messenger.core.entity.contact;
package org.mercury_im.messenger.entity.contact;
public interface Contact extends Peer {

4
entity/src/main/java/org/mercury_im/messenger/core/entity/contact/IContact.java → entity/src/main/java/org/mercury_im/messenger/entity/contact/IContact.java
View file

@ -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 {

4
entity/src/main/java/org/mercury_im/messenger/core/entity/contact/IPeer.java → entity/src/main/java/org/mercury_im/messenger/entity/contact/IPeer.java
View file

@ -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 {

4
entity/src/main/java/org/mercury_im/messenger/core/entity/contact/Peer.java → entity/src/main/java/org/mercury_im/messenger/entity/contact/Peer.java
View file

@ -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).

4
entity/src/main/java/org/mercury_im/messenger/core/entity/event/ITypingEvent.java → entity/src/main/java/org/mercury_im/messenger/entity/event/ITypingEvent.java
View file

@ -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;

4
entity/src/main/java/org/mercury_im/messenger/core/entity/event/TypingEvent.java → entity/src/main/java/org/mercury_im/messenger/entity/event/TypingEvent.java
View file

@ -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;

2
entity/src/main/java/org/mercury_im/messenger/core/entity/event/TypingState.java → entity/src/main/java/org/mercury_im/messenger/entity/event/TypingState.java
View file

@ -1,4 +1,4 @@
package org.mercury_im.messenger.core.entity.event;
package org.mercury_im.messenger.entity.event;
public enum TypingState {
/**

2
entity/src/main/java/org/mercury_im/messenger/core/entity/message/IMessage.java → entity/src/main/java/org/mercury_im/messenger/entity/message/IMessage.java
View file

@ -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;

4
entity/src/main/java/org/mercury_im/messenger/core/entity/message/IMessagePayload.java → entity/src/main/java/org/mercury_im/messenger/entity/message/IMessagePayload.java
View file

@ -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;

2
entity/src/main/java/org/mercury_im/messenger/core/entity/message/Message.java → entity/src/main/java/org/mercury_im/messenger/entity/message/Message.java
View file

@ -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;

2
entity/src/main/java/org/mercury_im/messenger/core/entity/message/MessageDeliveryState.java → entity/src/main/java/org/mercury_im/messenger/entity/message/MessageDeliveryState.java
View file

@ -1,4 +1,4 @@
package org.mercury_im.messenger.core.entity.message;
package org.mercury_im.messenger.entity.message;
public enum MessageDeliveryState {
pending_delivery,

2
entity/src/main/java/org/mercury_im/messenger/core/entity/message/MessageMetadata.java → entity/src/main/java/org/mercury_im/messenger/entity/message/MessageMetadata.java
View file

@ -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.

4
entity/src/main/java/org/mercury_im/messenger/core/entity/message/MessagePayload.java → entity/src/main/java/org/mercury_im/messenger/entity/message/MessagePayload.java
View file

@ -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;

2
entity/src/main/java/org/mercury_im/messenger/core/entity/message/content/MessageContent.java → entity/src/main/java/org/mercury_im/messenger/entity/message/content/MessageContent.java
View file

@ -1,4 +1,4 @@
package org.mercury_im.messenger.core.entity.message.content;
package org.mercury_im.messenger.entity.message.content;
public interface MessageContent {

2
entity/src/main/java/org/mercury_im/messenger/core/entity/message/content/TextMessageContent.java → entity/src/main/java/org/mercury_im/messenger/entity/message/content/TextMessageContent.java
View file

@ -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 {

2
settings.gradle
View file

@ -1,7 +1,7 @@
include ':entity',
':data',
':domain',
':transport_xmpp',
':xmpp',
':app',
':core-old',
':view_entity'

2
view_entity/src/main/java/org/mercury_im/messenger/view/entity/ViewInterlocutor.java
View file

@ -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<A> implements InterlocutorViewEntity {

2
view_entity/src/main/java/org/mercury_im/messenger/view/entity/definition/InterlocutorViewEntity.java
View file

@ -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 {

0
transport_xmpp/.gitignore → xmpp/.gitignore vendored
View file

0
transport_xmpp/build.gradle → xmpp/build.gradle
View file

14
transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/message/XmppDirectMessageCenter.java → xmpp/src/main/java/org/mercury_im/messenger/domain/xmpp/XmppDirectMessageCenter.java
View file

@ -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;

8
transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppConnectionFactory.java → xmpp/src/main/java/org/mercury_im/messenger/transport/xmpp/XmppConnectionFactory.java
View file

@ -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<CF extends ConnectionConfiguration>
implements ConnectionFactory<XmppTcpConnectionMethod> {

8
transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppTcpConnectionFactory.java → xmpp/src/main/java/org/mercury_im/messenger/transport/xmpp/XmppTcpConnectionFactory.java
View file

@ -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<XMPPTCPConnectionConfiguration> {

10
transport_xmpp/src/main/java/org/mercury_im/xmpp/domain/connection/XmppTcpConnectionMethod.java → xmpp/src/main/java/org/mercury_im/messenger/transport/xmpp/XmppTcpConnectionMethod.java
View file

@ -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;