Mercury-IM/Mercury-IM
Mercury-IM
/
Mercury-IM
mirror of https://codeberg.org/Mercury-IM/Mercury-IM
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Temporary commit

This commit is contained in:
Paul Schaub 2019-11-16 09:58:00 +01:00
parent 78d5376724
commit baeabc0602
Signed by: vanitasvitae
GPG Key ID: 62BEE9264BF17311
13 changed files with 320 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
core/src/main/java/org/mercury_im/core/usecase/SendDirectMessage.java Normal file
View File

@ -0,0 +1,33 @@
package org.mercury_im.core.usecase;
import org.mercury_im.messenger.core.entity.Account;
import org.mercury_im.messenger.core.entity.Address;
import org.mercury_im.messenger.core.entity.chat.DirectChat;
import org.mercury_im.messenger.core.entity.contact.Interlocutor;
import org.mercury_im.messenger.core.entity.message.Message;
import org.mercury_im.messenger.core.entity.message.MessageMetadata;
public class SendDirectMessage<
M extends Message<AD, MM>,
C extends DirectChat<IL, AC, AD>,
AD extends Address.UserAddress,
MM extends MessageMetadata,
IL extends Interlocutor<AC, AD, AD>,
AC extends Account<AD, ?>> {
private final M message;
private final C chat;
public SendDirectMessage(M message, C chat) {
this.message = message;
this.chat = chat;
}
public M getMessage() {
return message;
}
public C getChat() {
return chat;
}
}

4
entity_xmpp/src/main/java/org/mercury_im/messenger/xmpp/entity/message/XmppMessage.java
View File

@ -3,9 +3,7 @@ package org.mercury_im.messenger.xmpp.entity.message;
import org.mercury_im.messenger.core.entity.message.AbstractMessage;
import org.mercury_im.messenger.xmpp.entity.XmppAddress;
public final class XmppMessage extends AbstractMessage<
XmppAddress,
XmppMessageMetadata> {
public final class XmppMessage {
private XmppMessage() {

3
settings.gradle
View File

@ -7,6 +7,7 @@ include ':entity',
':transport_xmpp',
':app',
':thread_utils',
':core-old'
':core-old',
':view_entity'
includeBuild 'libs/Smack'

21
transport/src/main/java/org/mercury_im/core/message/MessageCenter.java Normal file
View File

@ -0,0 +1,21 @@
package org.mercury_im.core.message;
import org.mercury_im.messenger.core.entity.Account;
import org.mercury_im.messenger.core.entity.Address;
import org.mercury_im.messenger.core.entity.chat.Chat;
import org.mercury_im.messenger.core.entity.message.Message;
import org.mercury_im.messenger.core.entity.message.MessageMetadata;
import io.reactivex.Completable;
public interface MessageCenter<
M extends Message<AD, MM>,
C extends Chat<AC, AD>,
AD extends Address.UserAddress,
MM extends MessageMetadata,
AC extends Account<AD, ?>> {
Completable sendMessage(M message, C chat);
void addIncomingMessageListener();
}

8
transport_xmpp/build.gradle
View File

@ -4,6 +4,14 @@ dependencies {
implementation project(":repository_xmpp")
implementation project(":entity_xmpp")
implementation project(":transport")
// Smack
// Not all of those are needed, but it may be a good idea to define those versions explicitly
api "org.igniterealtime.smack:smack-core:$smackCoreVersion"
api "org.igniterealtime.smack:smack-experimental:$smackExperimentalVersion"
api "org.igniterealtime.smack:smack-extensions:$smackExtensionsVersion"
api "org.igniterealtime.smack:smack-im:$smackImVersion"
api "org.igniterealtime.smack:smack-tcp:$smackTcpVersion"
}
sourceCompatibility = "8"

14
transport_xmpp/src/main/java/org/mercury_im/xmpp/connection/XmppConnectionFactory.java
View File

@ -1,14 +1,20 @@
package org.mercury_im.xmpp.connection;
import org.jivesoftware.smack.ConnectionConfiguration;
import org.jivesoftware.smack.XMPPConnection;
import org.mercury_im.core.ConnectionFactory;
import org.mercury_im.core.Messenger;
import org.mercury_im.messenger.xmpp.entity.XmppAccount;
import org.mercury_im.messenger.xmpp.entity.XmppAddress;
import org.mercury_im.messenger.xmpp.entity.XmppAuthMethod;
public class XmppConnectionFactory implements ConnectionFactory<XmppConnectionMethod, XmppAccount, XmppAddress.XmppUserAddress, XmppAuthMethod> {
public abstract class XmppConnectionFactory implements ConnectionFactory<XmppConnectionMethod, XmppAccount, XmppAddress.XmppUserAddress, XmppAuthMethod> {
protected Messenger messenger;
protected final Messenger messenger;
public XmppConnectionFactory(Messenger messenger) {
this.messenger = messenger;
}
public Messenger getMessenger() {
return messenger;
@ -16,6 +22,8 @@ public class XmppConnectionFactory implements ConnectionFactory<XmppConnectionMe
@Override
public XmppConnectionMethod provideConnection(XmppAccount account) {
return new XmppConnectionMethod(account, getMessenger());
return new XmppConnectionMethod(account, getMessenger(), createXmppConnection());
}
protected abstract XMPPConnection createXmppConnection(ConnectionConfiguration connectionConfiguration);
}

13
transport_xmpp/src/main/java/org/mercury_im/xmpp/connection/XmppConnectionMethod.java
View File

@ -1,5 +1,7 @@
package org.mercury_im.xmpp.connection;
import org.jivesoftware.smack.AbstractXMPPConnection;
import org.jivesoftware.smack.XMPPConnection;
import org.mercury_im.core.Messenger;
import org.mercury_im.core.connection.AbstractConnectionMethod;
import org.mercury_im.messenger.xmpp.entity.XmppAccount;
@ -9,12 +11,19 @@ import io.reactivex.Completable;
public class XmppConnectionMethod extends AbstractConnectionMethod<XmppAccount, XmppAddress.XmppUserAddress> {
public XmppConnectionMethod(XmppAccount account, Messenger messenger) {
private XMPPConnection connection;
public XmppConnectionMethod(XmppAccount account, Messenger messenger, XMPPConnection connection) {
super(account, messenger);
this.connection = connection;
}
@Override
public Completable connect() {
return null;
if (connection.isConnected()) {
return Completable.complete();
}
return Completable.fromAction(() -> ((AbstractXMPPConnection) connection).connect().login());
}
}

20
transport_xmpp/src/main/java/org/mercury_im/xmpp/connection/XmppTcpConnectionFactory.java Normal file
View File

@ -0,0 +1,20 @@
package org.mercury_im.xmpp.connection;
import org.jivesoftware.smack.ConnectionConfiguration;
import org.jivesoftware.smack.XMPPConnection;
import org.jivesoftware.smack.tcp.XMPPTCPConnection;
import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration;
import org.mercury_im.core.Messenger;
public class XmppTcpConnectionFactory extends XmppConnectionFactory {
public XmppTcpConnectionFactory(Messenger messenger) {
super(messenger);
}
@Override
protected XMPPConnection createXmppConnection(ConnectionConfiguration configuration) {
XMPPTCPConnectionConfiguration tcpConfiguration = (XMPPTCPConnectionConfiguration) configuration;
return new XMPPTCPConnection(tcpConfiguration);
}
}

50
transport_xmpp/src/main/java/org/mercury_im/xmpp/connection/message/XmppDirectMessageCenter.java Normal file
View File

@ -0,0 +1,50 @@
package org.mercury_im.xmpp.connection.message;
import org.jivesoftware.smack.chat2.Chat;
import org.jivesoftware.smack.chat2.ChatManager;
import org.jivesoftware.smack.packet.Message;
import org.jivesoftware.smackx.sid.element.OriginIdElement;
import org.mercury_im.core.message.MessageCenter;
import org.mercury_im.messenger.xmpp.entity.XmppAccount;
import org.mercury_im.messenger.xmpp.entity.XmppAddress;
import org.mercury_im.messenger.xmpp.entity.chat.XmppDirectChat;
import org.mercury_im.messenger.xmpp.entity.message.XmppMessage;
import org.mercury_im.messenger.xmpp.entity.message.XmppMessageMetadata;
import io.reactivex.Completable;
public class XmppDirectMessageCenter
implements MessageCenter<
XmppMessage.DirectMessage,
XmppDirectChat,
XmppAddress.XmppUserAddress,
XmppMessageMetadata,
XmppAccount> {
@Override
public Completable sendMessage(XmppMessage.DirectMessage message, XmppDirectChat chat) {
ChatManager chatManager = getChatManager(chat);
Message smackMessage = new Message();
smackMessage.setFrom(chat.getAccount().getAddress().getJid());
smackMessage.setTo(chat.getInterlocutor().getAddress().getJid());
smackMessage.setType(Message.Type.chat);
OriginIdElement.addOriginId(smackMessage);
Chat smackChat = chatManager.chatWith(chat.getInterlocutor().getAddress().getJid());
return Completable.fromAction(
() -> smackChat.send(smackMessage));
}
@Override
public void addIncomingMessageListener() {
}
protected ChatManager getChatManager(XmppDirectChat chat) {
return null;
}
}

1
view_entity/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/build

8
view_entity/build.gradle Normal file
View File

@ -0,0 +1,8 @@
apply plugin: 'java-library'
dependencies {
implementation project(':entity')
}
sourceCompatibility = "8"
targetCompatibility = "8"

134
view_entity/src/main/java/org/mercury_im/messenger/view/entity/ViewInterlocutor.java Normal file
View File

@ -0,0 +1,134 @@
package org.mercury_im.messenger.view.entity;
import org.mercury_im.messenger.core.entity.contact.Contact;
import org.mercury_im.messenger.view.entity.definition.InterlocutorViewEntity;
public class ViewInterlocutor<A> implements InterlocutorViewEntity {
private final String name;
private final String address;
private final String accountAddress;
private final Contact.SubscriptionMode subscriptionMode;
private final String lastActivity;
private final boolean isTyping;
private final String status;
private final A avatar;
private ViewInterlocutor(String name,
String address,
String accountAddress,
Contact.SubscriptionMode subscriptionMode,
String lastActivity,
boolean isTyping,
String status,
A avatar) {
this.name = name;
this.address = address;
this.accountAddress = accountAddress;
this.subscriptionMode = subscriptionMode;
this.lastActivity = lastActivity;
this.isTyping = isTyping;
this.status = status;
this.avatar = avatar;
}
@Override
public String getName() {
return name;
}
@Override
public String getAddress() {
return address;
}
@Override
public String getAccountAddress() {
return accountAddress;
}
@Override
public Contact.SubscriptionMode getSubscriptionMode() {
return subscriptionMode;
}
@Override
public String getLastActivity() {
return lastActivity;
}
@Override
public boolean isTyping() {
return isTyping;
}
@Override
public String getStatus() {
return status;
}
public A getAvatar() {
return avatar;
}
public static <A> Builder<A> builder() {
return new Builder<>();
}
private static class Builder<A> {
private String name;
private String address;
private String accountAddress;
private Contact.SubscriptionMode subscriptionMode;
private String lastActivity;
private boolean isTyping;
private String status;
private A avatar;
public Builder setName(String name) {
this.name = name;
return this;
}
public Builder setAddress(String address) {
this.address = address;
return this;
}
public Builder setAccountAddress(String accountAddress) {
this.accountAddress = accountAddress;
return this;
}
public Builder setSubscriptionMode(Contact.SubscriptionMode subscriptionMode) {
this.subscriptionMode = subscriptionMode;
return this;
}
public Builder setLastActivity(String lastActivity) {
this.lastActivity = lastActivity;
return this;
}
public Builder setIsTyping(boolean isTyping) {
this.isTyping = isTyping;
return this;
}
public Builder setStatus(String status) {
this.status = status;
return this;
}
public Builder setAvatar(A avatar) {
this.avatar = avatar;
return this;
}
public ViewInterlocutor<A> build() {
return new ViewInterlocutor<>(name, address, accountAddress, subscriptionMode,
lastActivity, isTyping, status, avatar);
}
}
}

20
view_entity/src/main/java/org/mercury_im/messenger/view/entity/definition/InterlocutorViewEntity.java Normal file
View File

@ -0,0 +1,20 @@
package org.mercury_im.messenger.view.entity.definition;
import org.mercury_im.messenger.core.entity.contact.Contact;
public interface InterlocutorViewEntity {
String getName();
String getAddress();
String getAccountAddress();
Contact.SubscriptionMode getSubscriptionMode();
String getLastActivity();
boolean isTyping();
String getStatus();
}