diff options
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java | 5 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/ImageUtil.java | 9 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java | 6 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/UiUpdateHelper.java | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/utils/XmppSendUtil.java | 12 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/CryptoHelper.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/CryptoHelper.java) | 12 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/DNSHelper.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/DNSHelper.java) | 6 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHandler.java) | 2 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java) | 20 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/ExifHelper.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/ExifHelper.java) | 2 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/FileUtils.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/FileUtils.java) | 2 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/GeoHelper.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/GeoHelper.java) | 6 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/MimeUtils.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/MimeUtils.java) | 2 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/OnPhoneContactsLoadedListener.java) | 2 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/PRNGFixes.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/PRNGFixes.java) | 2 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/PhoneHelper.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/PhoneHelper.java) | 2 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/SSLSocketHelper.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/SSLSocketHelper.java) | 2 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/SerialSingleThreadExecutor.java) | 2 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/SocksSocketFactory.java) | 5 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/UIHelper.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java) | 17 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/XmlHelper.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/XmlHelper.java) | 2 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/Xmlns.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/Xmlns.java) | 4 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/XmppUri.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/XmppUri.java) | 6 |
23 files changed, 67 insertions, 63 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java index 206ee668..63dc320e 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java @@ -17,8 +17,9 @@ import java.security.NoSuchAlgorithmException; import de.thedevstack.android.logcat.Logging; import de.thedevstack.conversationsplus.ConversationsPlusApplication; -import de.thedevstack.conversationsplus.Config; -import de.thedevstack.conversationsplus.xmpp.pep.Avatar; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.utils.CryptoHelper; +import eu.siacs.conversations.xmpp.pep.Avatar; /** * This util provides access to saved avatars, creating avatars. diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/ImageUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/ImageUtil.java index bf79d7e0..b28e6f1c 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/ImageUtil.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/ImageUtil.java @@ -16,10 +16,11 @@ import java.io.InputStream; import de.thedevstack.android.logcat.Logging; import de.thedevstack.conversationsplus.exceptions.ImageResizeException; -import de.thedevstack.conversationsplus.Config; -import de.thedevstack.conversationsplus.R; -import de.thedevstack.conversationsplus.entities.Message; -import de.thedevstack.conversationsplus.persistance.FileBackend; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.persistance.FileBackend; +import eu.siacs.conversations.utils.ExifHelper; /** * This util provides diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java index 6a668938..f8310206 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java @@ -6,9 +6,9 @@ import java.net.URL; import java.util.regex.Matcher; import java.util.regex.Pattern; -import de.thedevstack.conversationsplus.entities.DownloadableFile; -import de.thedevstack.conversationsplus.entities.Message; -import de.thedevstack.conversationsplus.persistance.FileBackend; +import eu.siacs.conversations.entities.DownloadableFile; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.persistance.FileBackend; /** * Utility class to work with messages. diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/UiUpdateHelper.java b/src/main/java/de/thedevstack/conversationsplus/utils/UiUpdateHelper.java index 7638caad..84ce200a 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/UiUpdateHelper.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/UiUpdateHelper.java @@ -1,7 +1,7 @@ package de.thedevstack.conversationsplus.utils; import de.thedevstack.android.logcat.Logging; -import de.thedevstack.conversationsplus.services.XmppConnectionService; +import eu.siacs.conversations.services.XmppConnectionService; /** * Helper class to avoid passing the xmppConnectionService to everywhere just to update the UI. diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/XmppSendUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/XmppSendUtil.java index 11d05832..d4a555f2 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/XmppSendUtil.java +++ b/src/main/java/de/thedevstack/conversationsplus/utils/XmppSendUtil.java @@ -1,11 +1,11 @@ package de.thedevstack.conversationsplus.utils; -import de.thedevstack.conversationsplus.entities.Account; -import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived; -import de.thedevstack.conversationsplus.xmpp.XmppConnection; -import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket; -import de.thedevstack.conversationsplus.xmpp.stanzas.MessagePacket; -import de.thedevstack.conversationsplus.xmpp.stanzas.PresencePacket; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.xmpp.OnIqPacketReceived; +import eu.siacs.conversations.xmpp.XmppConnection; +import eu.siacs.conversations.xmpp.stanzas.IqPacket; +import eu.siacs.conversations.xmpp.stanzas.MessagePacket; +import eu.siacs.conversations.xmpp.stanzas.PresencePacket; /** * Created by tzur on 09.01.2016. diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/CryptoHelper.java b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java index 7e4a4fc5..1ef5fb3f 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/CryptoHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.utils; +package eu.siacs.conversations.utils; import android.os.Bundle; import android.util.Pair; @@ -21,11 +21,11 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Locale; -import de.thedevstack.conversationsplus.Config; -import de.thedevstack.conversationsplus.R; -import de.thedevstack.conversationsplus.entities.Message; -import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.xmpp.jid.InvalidJidException; +import eu.siacs.conversations.xmpp.jid.Jid; public final class CryptoHelper { public static final String FILETRANSFER = "?FILETRANSFERv1:"; diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/DNSHelper.java b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java index 90618292..1568eb8c 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/DNSHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/DNSHelper.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.utils; +package eu.siacs.conversations.utils; import android.annotation.TargetApi; import android.content.Context; @@ -27,8 +27,8 @@ import de.measite.minidns.util.NameUtil; import de.thedevstack.android.logcat.Logging; import de.thedevstack.conversationsplus.ConversationsPlusApplication; import de.thedevstack.conversationsplus.dto.SrvRecord; -import de.thedevstack.conversationsplus.Config; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.xmpp.jid.Jid; public class DNSHelper { private static final String CLIENT_SRV_PREFIX = "_xmpp-client._tcp."; diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHandler.java b/src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java index a810b089..4e3ec236 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHandler.java +++ b/src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.utils; +package eu.siacs.conversations.utils; import android.content.Context; diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java b/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java index 913f2ab5..9c8db210 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.utils; +package eu.siacs.conversations.utils; import android.app.AlertDialog; import android.content.Context; @@ -17,15 +17,15 @@ import java.util.List; import de.thedevstack.android.logcat.Logging; import de.thedevstack.conversationsplus.ConversationsPlusPreferences; -import de.thedevstack.conversationsplus.Config; -import de.thedevstack.conversationsplus.R; -import de.thedevstack.conversationsplus.entities.Account; -import de.thedevstack.conversationsplus.entities.Conversation; -import de.thedevstack.conversationsplus.entities.Message; -import de.thedevstack.conversationsplus.services.XmppConnectionService; -import de.thedevstack.conversationsplus.ui.ConversationActivity; -import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Account; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.ui.ConversationActivity; +import eu.siacs.conversations.xmpp.jid.InvalidJidException; +import eu.siacs.conversations.xmpp.jid.Jid; public class ExceptionHelper { public static void init(Context context) { diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/ExifHelper.java b/src/main/java/eu/siacs/conversations/utils/ExifHelper.java index 031bdfa5..5e465e94 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/ExifHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/ExifHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package de.thedevstack.conversationsplus.utils; +package eu.siacs.conversations.utils; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/FileUtils.java b/src/main/java/eu/siacs/conversations/utils/FileUtils.java index a8375dc0..c5d0c3b0 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/FileUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/FileUtils.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.utils; +package eu.siacs.conversations.utils; import android.annotation.SuppressLint; import android.content.ContentResolver; diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/GeoHelper.java b/src/main/java/eu/siacs/conversations/utils/GeoHelper.java index 662f797a..74f91a98 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/GeoHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/GeoHelper.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.utils; +package eu.siacs.conversations.utils; import android.content.Intent; import android.net.Uri; @@ -9,8 +9,8 @@ import java.util.ArrayList; import java.util.regex.Matcher; import java.util.regex.Pattern; -import de.thedevstack.conversationsplus.entities.Conversation; -import de.thedevstack.conversationsplus.entities.Message; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Message; public class GeoHelper { private static Pattern GEO_URI = Pattern.compile("geo:([\\-0-9.]+),([\\-0-9.]+)(?:,([\\-0-9.]+))?(?:\\?(.*))?", Pattern.CASE_INSENSITIVE); diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/MimeUtils.java b/src/main/java/eu/siacs/conversations/utils/MimeUtils.java index fdf55d2d..d4544424 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/MimeUtils.java +++ b/src/main/java/eu/siacs/conversations/utils/MimeUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.thedevstack.conversationsplus.utils; +package eu.siacs.conversations.utils; import java.io.File; import java.io.FileInputStream; import java.io.IOException; diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/OnPhoneContactsLoadedListener.java b/src/main/java/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java index eecee159..f18a4ed8 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/OnPhoneContactsLoadedListener.java +++ b/src/main/java/eu/siacs/conversations/utils/OnPhoneContactsLoadedListener.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.utils; +package eu.siacs.conversations.utils; import android.os.Bundle; diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/PRNGFixes.java b/src/main/java/eu/siacs/conversations/utils/PRNGFixes.java index 0751809c..5faa1fa7 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/PRNGFixes.java +++ b/src/main/java/eu/siacs/conversations/utils/PRNGFixes.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.utils; +package eu.siacs.conversations.utils; import android.os.Build; import android.os.Process; diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/PhoneHelper.java b/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java index 86a67661..6c1b4bef 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/PhoneHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.utils; +package eu.siacs.conversations.utils; import android.Manifest; import android.content.Context; diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/SSLSocketHelper.java b/src/main/java/eu/siacs/conversations/utils/SSLSocketHelper.java index 1842e897..3a8c1c0a 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/SSLSocketHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/SSLSocketHelper.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.utils; +package eu.siacs.conversations.utils; import android.os.Build; diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/SerialSingleThreadExecutor.java b/src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java index 4871af43..bfb4668d 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/SerialSingleThreadExecutor.java +++ b/src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.utils; +package eu.siacs.conversations.utils; import java.util.ArrayDeque; import java.util.Queue; diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/SocksSocketFactory.java b/src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java index 940399c3..04cfa2eb 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/SocksSocketFactory.java +++ b/src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java @@ -1,13 +1,14 @@ -package de.thedevstack.conversationsplus.utils; +package eu.siacs.conversations.utils; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; +import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.Socket; import java.nio.ByteBuffer; -import de.thedevstack.conversationsplus.Config; +import eu.siacs.conversations.Config; public class SocksSocketFactory { diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java index 44dc4774..3d091e39 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/UIHelper.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.utils; +package eu.siacs.conversations.utils; import android.content.Context; import android.text.format.DateFormat; @@ -12,13 +12,14 @@ import java.util.Calendar; import java.util.Date; import java.util.Locale; -import de.thedevstack.conversationsplus.R; -import de.thedevstack.conversationsplus.entities.Contact; -import de.thedevstack.conversationsplus.entities.Conversation; -import de.thedevstack.conversationsplus.entities.Message; -import de.thedevstack.conversationsplus.entities.Presence; -import de.thedevstack.conversationsplus.entities.Transferable; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.entities.Presence; +import eu.siacs.conversations.entities.Presences; +import eu.siacs.conversations.entities.Transferable; +import eu.siacs.conversations.xmpp.jid.Jid; public class UIHelper { diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/XmlHelper.java b/src/main/java/eu/siacs/conversations/utils/XmlHelper.java index 1287f73f..4dee07cf 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/XmlHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/XmlHelper.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.utils; +package eu.siacs.conversations.utils; public class XmlHelper { public static String encodeEntities(String content) { diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/Xmlns.java b/src/main/java/eu/siacs/conversations/utils/Xmlns.java index f937e35f..a19ec791 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/Xmlns.java +++ b/src/main/java/eu/siacs/conversations/utils/Xmlns.java @@ -1,6 +1,6 @@ -package de.thedevstack.conversationsplus.utils; +package eu.siacs.conversations.utils; -import de.thedevstack.conversationsplus.Config; +import eu.siacs.conversations.Config; public final class Xmlns { public static final String BLOCKING = "urn:xmpp:blocking"; diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/XmppUri.java b/src/main/java/eu/siacs/conversations/utils/XmppUri.java index 5d3a2694..92c0241e 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/XmppUri.java +++ b/src/main/java/eu/siacs/conversations/utils/XmppUri.java @@ -1,12 +1,12 @@ -package de.thedevstack.conversationsplus.utils; +package eu.siacs.conversations.utils; import android.net.Uri; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; -import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import eu.siacs.conversations.xmpp.jid.InvalidJidException; +import eu.siacs.conversations.xmpp.jid.Jid; public class XmppUri { |