diff options
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/JingleCandidate.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java) | 46 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnectionManager.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java) | 26 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java) | 20 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java) | 14 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/JingleTransport.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/OnFileTransmissionStatusChanged.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/OnJinglePacketReceived.java | 9 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/OnPrimaryCandidateFound.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/OnTransportConnected.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Content.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java) | 6 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/JinglePacket.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Reason.java (renamed from src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java) | 4 |
13 files changed, 80 insertions, 71 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleCandidate.java index dcadb92f1..166fa6c69 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleCandidate.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleCandidate.java @@ -1,10 +1,10 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.pixart.messenger.xmpp.jingle; import java.util.ArrayList; import java.util.List; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.jid.Jid; public class JingleCandidate { diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java index 86c445279..29c5acfb8 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.pixart.messenger.xmpp.jingle; import android.util.Log; import android.util.Pair; @@ -15,28 +15,28 @@ import java.util.Locale; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.crypto.axolotl.AxolotlService; -import eu.siacs.conversations.crypto.axolotl.OnMessageCreatedCallback; -import eu.siacs.conversations.crypto.axolotl.XmppAxolotlMessage; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Conversation; -import eu.siacs.conversations.entities.DownloadableFile; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.entities.Presence; -import eu.siacs.conversations.entities.ServiceDiscoveryResult; -import eu.siacs.conversations.entities.Transferable; -import eu.siacs.conversations.entities.TransferablePlaceholder; -import eu.siacs.conversations.persistance.FileBackend; -import eu.siacs.conversations.services.AbstractConnectionManager; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.OnIqPacketReceived; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.jingle.stanzas.Content; -import eu.siacs.conversations.xmpp.jingle.stanzas.JinglePacket; -import eu.siacs.conversations.xmpp.jingle.stanzas.Reason; -import eu.siacs.conversations.xmpp.stanzas.IqPacket; +import de.pixart.messenger.Config; +import de.pixart.messenger.crypto.axolotl.AxolotlService; +import de.pixart.messenger.crypto.axolotl.OnMessageCreatedCallback; +import de.pixart.messenger.crypto.axolotl.XmppAxolotlMessage; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.entities.Conversation; +import de.pixart.messenger.entities.DownloadableFile; +import de.pixart.messenger.entities.Message; +import de.pixart.messenger.entities.Presence; +import de.pixart.messenger.entities.ServiceDiscoveryResult; +import de.pixart.messenger.entities.Transferable; +import de.pixart.messenger.entities.TransferablePlaceholder; +import de.pixart.messenger.persistance.FileBackend; +import de.pixart.messenger.services.AbstractConnectionManager; +import de.pixart.messenger.services.XmppConnectionService; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.OnIqPacketReceived; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.jingle.stanzas.Content; +import de.pixart.messenger.xmpp.jingle.stanzas.JinglePacket; +import de.pixart.messenger.xmpp.jingle.stanzas.Reason; +import de.pixart.messenger.xmpp.stanzas.IqPacket; public class JingleConnection implements Transferable { private final SimpleDateFormat fileDateFormat = new SimpleDateFormat("yyyyMMdd_HHmmssSSS", Locale.US); diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnectionManager.java index 0f0361cd3..b8f96bded 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnectionManager.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.pixart.messenger.xmpp.jingle; import android.annotation.SuppressLint; import android.util.Log; @@ -9,18 +9,18 @@ import java.util.HashMap; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.Message; -import eu.siacs.conversations.entities.Transferable; -import eu.siacs.conversations.services.AbstractConnectionManager; -import eu.siacs.conversations.services.XmppConnectionService; -import eu.siacs.conversations.utils.Xmlns; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.OnIqPacketReceived; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.jingle.stanzas.JinglePacket; -import eu.siacs.conversations.xmpp.stanzas.IqPacket; +import de.pixart.messenger.Config; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.entities.Message; +import de.pixart.messenger.entities.Transferable; +import de.pixart.messenger.services.AbstractConnectionManager; +import de.pixart.messenger.services.XmppConnectionService; +import de.pixart.messenger.utils.Xmlns; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.OnIqPacketReceived; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.jingle.stanzas.JinglePacket; +import de.pixart.messenger.xmpp.stanzas.IqPacket; public class JingleConnectionManager extends AbstractConnectionManager { private List<JingleConnection> connections = new CopyOnWriteArrayList<>(); diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java index 0b0cb4083..e8b7d45d8 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleInbandTransport.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.pixart.messenger.xmpp.jingle; import android.util.Base64; import android.util.Log; @@ -10,15 +10,15 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.Arrays; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.entities.Account; -import eu.siacs.conversations.entities.DownloadableFile; -import eu.siacs.conversations.persistance.FileBackend; -import eu.siacs.conversations.utils.CryptoHelper; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.OnIqPacketReceived; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.stanzas.IqPacket; +import de.pixart.messenger.Config; +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.entities.DownloadableFile; +import de.pixart.messenger.persistance.FileBackend; +import de.pixart.messenger.utils.CryptoHelper; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.OnIqPacketReceived; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.stanzas.IqPacket; public class JingleInbandTransport extends JingleTransport { diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java index 140f20b91..4f3e78394 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleSocks5Transport.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.pixart.messenger.xmpp.jingle; import android.os.PowerManager; import android.util.Log; @@ -12,12 +12,12 @@ import java.net.SocketAddress; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.entities.DownloadableFile; -import eu.siacs.conversations.persistance.FileBackend; -import eu.siacs.conversations.utils.CryptoHelper; -import eu.siacs.conversations.utils.SocksSocketFactory; -import eu.siacs.conversations.xmpp.jingle.stanzas.Content; +import de.pixart.messenger.Config; +import de.pixart.messenger.entities.DownloadableFile; +import de.pixart.messenger.persistance.FileBackend; +import de.pixart.messenger.utils.CryptoHelper; +import de.pixart.messenger.utils.SocksSocketFactory; +import de.pixart.messenger.xmpp.jingle.stanzas.Content; public class JingleSocks5Transport extends JingleTransport { private JingleCandidate candidate; diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleTransport.java index e832d3f58..1ee97b415 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleTransport.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleTransport.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.pixart.messenger.xmpp.jingle; -import eu.siacs.conversations.entities.DownloadableFile; +import de.pixart.messenger.entities.DownloadableFile; public abstract class JingleTransport { public abstract void connect(final OnTransportConnected callback); diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java b/src/main/java/de/pixart/messenger/xmpp/jingle/OnFileTransmissionStatusChanged.java index 91cba39f5..6bbf7111a 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnFileTransmissionStatusChanged.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/OnFileTransmissionStatusChanged.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.pixart.messenger.xmpp.jingle; -import eu.siacs.conversations.entities.DownloadableFile; +import de.pixart.messenger.entities.DownloadableFile; public interface OnFileTransmissionStatusChanged { void onFileTransmitted(DownloadableFile file); diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/OnJinglePacketReceived.java b/src/main/java/de/pixart/messenger/xmpp/jingle/OnJinglePacketReceived.java new file mode 100644 index 000000000..82dfefa5e --- /dev/null +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/OnJinglePacketReceived.java @@ -0,0 +1,9 @@ +package de.pixart.messenger.xmpp.jingle; + +import de.pixart.messenger.entities.Account; +import de.pixart.messenger.xmpp.PacketReceived; +import de.pixart.messenger.xmpp.jingle.stanzas.JinglePacket; + +public interface OnJinglePacketReceived extends PacketReceived { + void onJinglePacketReceived(Account account, JinglePacket packet); +} diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java b/src/main/java/de/pixart/messenger/xmpp/jingle/OnPrimaryCandidateFound.java index 76e337177..fad7bb4d4 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnPrimaryCandidateFound.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/OnPrimaryCandidateFound.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.pixart.messenger.xmpp.jingle; public interface OnPrimaryCandidateFound { void onPrimaryCandidateFound(boolean success, JingleCandidate canditate); diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java b/src/main/java/de/pixart/messenger/xmpp/jingle/OnTransportConnected.java index 38f03c5d0..10efd76d7 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/OnTransportConnected.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/OnTransportConnected.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.xmpp.jingle; +package de.pixart.messenger.xmpp.jingle; public interface OnTransportConnected { public void failed(); diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Content.java index 49f52bf33..bef32926f 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Content.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Content.java @@ -1,7 +1,7 @@ -package eu.siacs.conversations.xmpp.jingle.stanzas; +package de.pixart.messenger.xmpp.jingle.stanzas; -import eu.siacs.conversations.entities.DownloadableFile; -import eu.siacs.conversations.xml.Element; +import de.pixart.messenger.entities.DownloadableFile; +import de.pixart.messenger.xml.Element; public class Content extends Element { diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/JinglePacket.java index 4f73a83a7..971ab8e1b 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/JinglePacket.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/JinglePacket.java @@ -1,8 +1,8 @@ -package eu.siacs.conversations.xmpp.jingle.stanzas; +package de.pixart.messenger.xmpp.jingle.stanzas; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.jid.Jid; -import eu.siacs.conversations.xmpp.stanzas.IqPacket; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.stanzas.IqPacket; public class JinglePacket extends IqPacket { Content content = null; diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Reason.java index 610d5e760..3c77a91a6 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/stanzas/Reason.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/stanzas/Reason.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.xmpp.jingle.stanzas; +package de.pixart.messenger.xmpp.jingle.stanzas; -import eu.siacs.conversations.xml.Element; +import de.pixart.messenger.xml.Element; public class Reason extends Element { private Reason(String name) { |