diff options
Diffstat (limited to '')
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/OtrService.java (renamed from src/main/java/de/thedevstack/conversationsplus/crypto/OtrService.java) | 20 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java (renamed from src/main/java/de/thedevstack/conversationsplus/crypto/PgpDecryptionService.java) | 8 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/PgpEngine.java (renamed from src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java) | 22 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/XmppDomainVerifier.java (renamed from src/main/java/de/thedevstack/conversationsplus/crypto/XmppDomainVerifier.java) | 2 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java (renamed from src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlService.java) | 14 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceImpl.java (renamed from src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceImpl.java) | 31 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceStub.java (renamed from src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceStub.java) | 12 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/axolotl/CryptoFailedException.java (renamed from src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/CryptoFailedException.java) | 2 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/axolotl/NoSessionsCreatedException.java (renamed from src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/NoSessionsCreatedException.java) | 2 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/axolotl/OnMessageCreatedCallback.java (renamed from src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/OnMessageCreatedCallback.java) | 2 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java (renamed from src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/SQLiteAxolotlStore.java) | 8 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java (renamed from src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/XmppAxolotlMessage.java) | 8 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java (renamed from src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/XmppAxolotlSession.java) | 6 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java (renamed from src/main/java/de/thedevstack/conversationsplus/crypto/sasl/DigestMd5.java) | 8 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/sasl/External.java (renamed from src/main/java/de/thedevstack/conversationsplus/crypto/sasl/External.java) | 6 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/sasl/Plain.java (renamed from src/main/java/de/thedevstack/conversationsplus/crypto/sasl/Plain.java) | 6 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/sasl/SaslMechanism.java (renamed from src/main/java/de/thedevstack/conversationsplus/crypto/sasl/SaslMechanism.java) | 6 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java (renamed from src/main/java/de/thedevstack/conversationsplus/crypto/sasl/ScramSha1.java) | 8 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/crypto/sasl/Tokenizer.java (renamed from src/main/java/de/thedevstack/conversationsplus/crypto/sasl/Tokenizer.java) | 2 |
19 files changed, 87 insertions, 86 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/OtrService.java b/src/main/java/eu/siacs/conversations/crypto/OtrService.java index 34023d9f..4ddf51fb 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/OtrService.java +++ b/src/main/java/eu/siacs/conversations/crypto/OtrService.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.crypto; +package eu.siacs.conversations.crypto; import net.java.otr4j.OtrEngineHost; import net.java.otr4j.OtrException; @@ -26,15 +26,15 @@ import java.security.spec.InvalidKeySpecException; import de.thedevstack.android.logcat.Logging; import de.thedevstack.conversationsplus.ConversationsPlusPreferences; -import de.thedevstack.conversationsplus.Config; -import de.thedevstack.conversationsplus.entities.Account; -import de.thedevstack.conversationsplus.entities.Conversation; -import de.thedevstack.conversationsplus.generator.MessageGenerator; -import de.thedevstack.conversationsplus.services.XmppConnectionService; -import de.thedevstack.conversationsplus.xmpp.chatstate.ChatState; -import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; -import de.thedevstack.conversationsplus.xmpp.stanzas.MessagePacket; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.generator.MessageGenerator; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.xmpp.chatstate.ChatState; +import eu.siacs.conversations.xmpp.jid.InvalidJidException; +import eu.siacs.conversations.xmpp.jid.Jid; +import eu.siacs.conversations.xmpp.stanzas.MessagePacket; public class OtrService extends OtrCryptoEngineImpl implements OtrEngineHost { diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/PgpDecryptionService.java b/src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java index b833f6e4..5afbe5c4 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/PgpDecryptionService.java +++ b/src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.crypto; +package eu.siacs.conversations.crypto; import android.app.PendingIntent; @@ -7,9 +7,9 @@ import java.util.LinkedList; import java.util.List; import java.util.concurrent.ConcurrentHashMap; -import de.thedevstack.conversationsplus.entities.Message; -import de.thedevstack.conversationsplus.services.XmppConnectionService; -import de.thedevstack.conversationsplus.ui.UiCallback; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.ui.UiCallback; public class PgpDecryptionService { diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java index d01dc867..0e79ea2c 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/PgpEngine.java +++ b/src/main/java/eu/siacs/conversations/crypto/PgpEngine.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.crypto; +package eu.siacs.conversations.crypto; import android.app.PendingIntent; import android.content.Intent; @@ -20,16 +20,16 @@ import java.net.URL; import de.thedevstack.conversationsplus.ConversationsPlusPreferences; import de.thedevstack.conversationsplus.utils.MessageUtil; import de.thedevstack.conversationsplus.utils.StreamUtil; -import de.thedevstack.conversationsplus.R; -import de.thedevstack.conversationsplus.entities.Account; -import de.thedevstack.conversationsplus.entities.Contact; -import de.thedevstack.conversationsplus.entities.Conversation; -import de.thedevstack.conversationsplus.entities.DownloadableFile; -import de.thedevstack.conversationsplus.entities.Message; -import de.thedevstack.conversationsplus.http.HttpConnectionManager; -import de.thedevstack.conversationsplus.persistance.FileBackend; -import de.thedevstack.conversationsplus.services.XmppConnectionService; -import de.thedevstack.conversationsplus.ui.UiCallback; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.DownloadableFile; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.http.HttpConnectionManager; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.ui.UiCallback; public class PgpEngine { private OpenPgpApi api; diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/XmppDomainVerifier.java b/src/main/java/eu/siacs/conversations/crypto/XmppDomainVerifier.java index c9f65a97..1fca865e 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/XmppDomainVerifier.java +++ b/src/main/java/eu/siacs/conversations/crypto/XmppDomainVerifier.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.crypto; +package eu.siacs.conversations.crypto; import android.util.Log; import android.util.Pair; diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlService.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java index 49cd6033..e490ac64 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlService.java +++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.crypto.axolotl; +package eu.siacs.conversations.crypto.axolotl; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -12,12 +12,12 @@ import java.security.cert.X509Certificate; import java.util.List; import java.util.Set; -import de.thedevstack.conversationsplus.entities.Account; -import de.thedevstack.conversationsplus.entities.Contact; -import de.thedevstack.conversationsplus.entities.Conversation; -import de.thedevstack.conversationsplus.entities.Message; -import de.thedevstack.conversationsplus.xmpp.OnAdvancedStreamFeaturesLoaded; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.xmpp.OnAdvancedStreamFeaturesLoaded; +import eu.siacs.conversations.xmpp.jid.Jid; /** * Created by tzur on 02.03.2016. diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceImpl.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceImpl.java index 2463a795..73974652 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceImpl.java +++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceImpl.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.crypto.axolotl; +package eu.siacs.conversations.crypto.axolotl; import android.os.Bundle; import android.security.KeyChain; @@ -33,20 +33,21 @@ import java.util.Map; import java.util.Random; import java.util.Set; -import de.thedevstack.conversationsplus.Config; -import de.thedevstack.conversationsplus.entities.Account; -import de.thedevstack.conversationsplus.entities.Contact; -import de.thedevstack.conversationsplus.entities.Conversation; -import de.thedevstack.conversationsplus.entities.Message; -import de.thedevstack.conversationsplus.parser.IqParser; -import de.thedevstack.conversationsplus.services.XmppConnectionService; -import de.thedevstack.conversationsplus.utils.CryptoHelper; -import de.thedevstack.conversationsplus.utils.SerialSingleThreadExecutor; -import de.thedevstack.conversationsplus.xml.Element; -import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived; -import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; -import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.parser.IqParser; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.utils.SerialSingleThreadExecutor; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.OnAdvancedStreamFeaturesLoaded; +import eu.siacs.conversations.xmpp.OnIqPacketReceived; +import eu.siacs.conversations.xmpp.jid.InvalidJidException; +import eu.siacs.conversations.xmpp.jid.Jid; +import eu.siacs.conversations.xmpp.stanzas.IqPacket; public class AxolotlServiceImpl implements AxolotlService { diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceStub.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceStub.java index 858cdf08..b0228d34 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/AxolotlServiceStub.java +++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlServiceStub.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.crypto.axolotl; +package eu.siacs.conversations.crypto.axolotl; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -13,11 +13,11 @@ import java.util.Collections; import java.util.List; import java.util.Set; -import de.thedevstack.conversationsplus.entities.Account; -import de.thedevstack.conversationsplus.entities.Contact; -import de.thedevstack.conversationsplus.entities.Conversation; -import de.thedevstack.conversationsplus.entities.Message; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.xmpp.jid.Jid; /** * Axolotl Service Stub implementation to avoid axolotl usage. diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/CryptoFailedException.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/CryptoFailedException.java index df281248..5796ef30 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/CryptoFailedException.java +++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/CryptoFailedException.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.crypto.axolotl; +package eu.siacs.conversations.crypto.axolotl; public class CryptoFailedException extends Exception { public CryptoFailedException(Exception e){ diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/NoSessionsCreatedException.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/NoSessionsCreatedException.java index bcb1c6a8..663b42b5 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/NoSessionsCreatedException.java +++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/NoSessionsCreatedException.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.crypto.axolotl; +package eu.siacs.conversations.crypto.axolotl; public class NoSessionsCreatedException extends Throwable{ } diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/OnMessageCreatedCallback.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/OnMessageCreatedCallback.java index 082b514b..3d40a408 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/OnMessageCreatedCallback.java +++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/OnMessageCreatedCallback.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.crypto.axolotl; +package eu.siacs.conversations.crypto.axolotl; public interface OnMessageCreatedCallback { void run(XmppAxolotlMessage message); diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/SQLiteAxolotlStore.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java index 35f630bb..c634d877 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/SQLiteAxolotlStore.java +++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.crypto.axolotl; +package eu.siacs.conversations.crypto.axolotl; import android.util.Log; import android.util.LruCache; @@ -19,9 +19,9 @@ import java.security.cert.X509Certificate; import java.util.List; import java.util.Set; -import de.thedevstack.conversationsplus.Config; -import de.thedevstack.conversationsplus.entities.Account; -import de.thedevstack.conversationsplus.services.XmppConnectionService; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.services.XmppConnectionService; public class SQLiteAxolotlStore implements AxolotlStore { diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/XmppAxolotlMessage.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java index 837b601c..cf950d6d 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/XmppAxolotlMessage.java +++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlMessage.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.crypto.axolotl; +package eu.siacs.conversations.crypto.axolotl; import android.util.Base64; import android.util.Log; @@ -21,9 +21,9 @@ import javax.crypto.SecretKey; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import de.thedevstack.conversationsplus.Config; -import de.thedevstack.conversationsplus.xml.Element; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.jid.Jid; public class XmppAxolotlMessage { public static final String CONTAINERTAG = "encrypted"; diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/XmppAxolotlSession.java b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java index 47b2133a..93ed32a2 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/axolotl/XmppAxolotlSession.java +++ b/src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.crypto.axolotl; +package eu.siacs.conversations.crypto.axolotl; import android.support.annotation.NonNull; import android.support.annotation.Nullable; @@ -22,8 +22,8 @@ import org.whispersystems.libaxolotl.protocol.WhisperMessage; import java.util.HashMap; import java.util.Map; -import de.thedevstack.conversationsplus.Config; -import de.thedevstack.conversationsplus.entities.Account; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.entities.Account; public class XmppAxolotlSession { private final SessionCipher cipher; diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/sasl/DigestMd5.java b/src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java index f4c3f28e..8b16215b 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/sasl/DigestMd5.java +++ b/src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.crypto.sasl; +package eu.siacs.conversations.crypto.sasl; import android.util.Base64; @@ -8,9 +8,9 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; -import de.thedevstack.conversationsplus.entities.Account; -import de.thedevstack.conversationsplus.utils.CryptoHelper; -import de.thedevstack.conversationsplus.xml.TagWriter; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.xml.TagWriter; public class DigestMd5 extends SaslMechanism { public DigestMd5(final TagWriter tagWriter, final Account account, final SecureRandom rng) { diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/sasl/External.java b/src/main/java/eu/siacs/conversations/crypto/sasl/External.java index dc50cbbe..8fd91cf4 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/sasl/External.java +++ b/src/main/java/eu/siacs/conversations/crypto/sasl/External.java @@ -1,11 +1,11 @@ -package de.thedevstack.conversationsplus.crypto.sasl; +package eu.siacs.conversations.crypto.sasl; import android.util.Base64; import java.security.SecureRandom; -import de.thedevstack.conversationsplus.entities.Account; -import de.thedevstack.conversationsplus.xml.TagWriter; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.xml.TagWriter; public class External extends SaslMechanism { diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/sasl/Plain.java b/src/main/java/eu/siacs/conversations/crypto/sasl/Plain.java index 179c12de..40a55151 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/sasl/Plain.java +++ b/src/main/java/eu/siacs/conversations/crypto/sasl/Plain.java @@ -1,11 +1,11 @@ -package de.thedevstack.conversationsplus.crypto.sasl; +package eu.siacs.conversations.crypto.sasl; import android.util.Base64; import java.nio.charset.Charset; -import de.thedevstack.conversationsplus.entities.Account; -import de.thedevstack.conversationsplus.xml.TagWriter; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.xml.TagWriter; public class Plain extends SaslMechanism { public Plain(final TagWriter tagWriter, final Account account) { diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/sasl/SaslMechanism.java b/src/main/java/eu/siacs/conversations/crypto/sasl/SaslMechanism.java index 1f6d2bde..5b4b99ef 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/sasl/SaslMechanism.java +++ b/src/main/java/eu/siacs/conversations/crypto/sasl/SaslMechanism.java @@ -1,9 +1,9 @@ -package de.thedevstack.conversationsplus.crypto.sasl; +package eu.siacs.conversations.crypto.sasl; import java.security.SecureRandom; -import de.thedevstack.conversationsplus.entities.Account; -import de.thedevstack.conversationsplus.xml.TagWriter; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.xml.TagWriter; public abstract class SaslMechanism { diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/sasl/ScramSha1.java b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java index 3540d2cf..3a05446c 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/sasl/ScramSha1.java +++ b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.crypto.sasl; +package eu.siacs.conversations.crypto.sasl; import android.util.Base64; import android.util.LruCache; @@ -13,9 +13,9 @@ import java.nio.charset.Charset; import java.security.InvalidKeyException; import java.security.SecureRandom; -import de.thedevstack.conversationsplus.entities.Account; -import de.thedevstack.conversationsplus.utils.CryptoHelper; -import de.thedevstack.conversationsplus.xml.TagWriter; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.xml.TagWriter; public class ScramSha1 extends SaslMechanism { // TODO: When channel binding (SCRAM-SHA1-PLUS) is supported in future, generalize this to indicate support and/or usage. diff --git a/src/main/java/de/thedevstack/conversationsplus/crypto/sasl/Tokenizer.java b/src/main/java/eu/siacs/conversations/crypto/sasl/Tokenizer.java index cc2805de..e37e0fa7 100644 --- a/src/main/java/de/thedevstack/conversationsplus/crypto/sasl/Tokenizer.java +++ b/src/main/java/eu/siacs/conversations/crypto/sasl/Tokenizer.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.crypto.sasl; +package eu.siacs.conversations.crypto.sasl; import java.util.ArrayList; import java.util.Arrays; |