diff options
Diffstat (limited to '')
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/CryptoHelper.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/CryptoHelper.java) | 4 | ||||
-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) | 18 | ||||
-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/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) | 3 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/SerialSingleThreadExecutor.java) | 4 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/utils/UIHelper.java (renamed from src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java) | 19 | ||||
-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 |
15 files changed, 42 insertions, 40 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/CryptoHelper.java b/src/main/java/eu/siacs/conversations/utils/CryptoHelper.java index 9599aa37..2dec203d 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 java.security.SecureRandom; import java.text.Normalizer; @@ -8,7 +8,7 @@ import java.util.Iterator; import java.util.LinkedHashSet; import java.util.List; -import de.thedevstack.conversationsplus.Config; +import eu.siacs.conversations.Config; 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 8951426f..5a47bb3c 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 de.measite.minidns.Client; import de.measite.minidns.DNSMessage; @@ -10,8 +10,8 @@ import de.measite.minidns.record.A; import de.measite.minidns.record.AAAA; import de.measite.minidns.record.Data; import de.measite.minidns.util.NameUtil; -import de.thedevstack.conversationsplus.Config; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.xmpp.jid.Jid; import java.io.IOException; import java.net.InetAddress; diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHandler.java b/src/main/java/eu/siacs/conversations/utils/ExceptionHandler.java index 256287f1..0ad57fe2 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 java.io.FileNotFoundException; import java.io.IOException; diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java b/src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java index d25e6d35..f04cf97b 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 java.io.BufferedReader; import java.io.FileInputStream; @@ -6,15 +6,15 @@ import java.io.IOException; import java.io.InputStreamReader; import java.util.List; -import de.thedevstack.conversationsplus.Config; import de.thedevstack.conversationsplus.ConversationsPlusPreferences; -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.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.xmpp.jid.InvalidJidException; +import eu.siacs.conversations.xmpp.jid.Jid; import android.app.AlertDialog; import android.content.Context; diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/ExifHelper.java b/src/main/java/eu/siacs/conversations/utils/ExifHelper.java index 13aff60d..ceda7293 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 android.util.Log; 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 c1c40f92..a9e89d1b 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 e701d62b..9a689768 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 java.util.List; diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/PRNGFixes.java b/src/main/java/eu/siacs/conversations/utils/PRNGFixes.java index 78776aeb..8fe67234 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 d1f598c0..e0556af3 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/PhoneHelper.java +++ b/src/main/java/eu/siacs/conversations/utils/PhoneHelper.java @@ -1,5 +1,6 @@ -package de.thedevstack.conversationsplus.utils; +package eu.siacs.conversations.utils; +import java.util.ArrayList; import java.util.List; import java.util.concurrent.RejectedExecutionException; diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/SerialSingleThreadExecutor.java b/src/main/java/eu/siacs/conversations/utils/SerialSingleThreadExecutor.java index 264645c6..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; @@ -31,4 +31,4 @@ public class SerialSingleThreadExecutor implements Executor { executor.execute(active); } } -} +}
\ No newline at end of file diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java b/src/main/java/eu/siacs/conversations/utils/UIHelper.java index 532ff1cb..7562c446 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 java.math.BigDecimal; import java.text.NumberFormat; @@ -8,20 +8,21 @@ import java.net.URLConnection; import java.util.Calendar; import java.util.Date; import java.util.HashMap; +import java.util.List; import java.util.Locale; import java.util.Map; import java.util.Map.Entry; import java.util.regex.Pattern; import java.util.regex.Matcher; -import de.thedevstack.conversationsplus.Config; -import de.thedevstack.conversationsplus.R; -import de.thedevstack.conversationsplus.entities.Contact; -import de.thedevstack.conversationsplus.entities.Conversation; -import de.thedevstack.conversationsplus.entities.Presences; -import de.thedevstack.conversationsplus.entities.Transferable; -import de.thedevstack.conversationsplus.entities.Message; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.R; +import eu.siacs.conversations.entities.Contact; +import eu.siacs.conversations.entities.Conversation; +import eu.siacs.conversations.entities.Presences; +import eu.siacs.conversations.entities.Transferable; +import eu.siacs.conversations.entities.Message; +import eu.siacs.conversations.xmpp.jid.Jid; import android.content.Context; import android.text.format.DateFormat; 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 6e3cc912..868566d9 100644 --- a/src/main/java/de/thedevstack/conversationsplus/utils/Xmlns.java +++ b/src/main/java/eu/siacs/conversations/utils/Xmlns.java @@ -1,9 +1,9 @@ -package de.thedevstack.conversationsplus.utils; +package eu.siacs.conversations.utils; public final class Xmlns { public static final String BLOCKING = "urn:xmpp:blocking"; public static final String ROSTER = "jabber:iq:roster"; public static final String REGISTER = "jabber:iq:register"; public static final String BYTE_STREAMS = "http://jabber.org/protocol/bytestreams"; - public static final String HTTP_UPLOAD = "de:thedevstack:conversationsplus:http:upload"; + public static final String HTTP_UPLOAD = "eu:siacs:conversations:http:upload"; } 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 { |