diff options
Diffstat (limited to '')
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/AbstractEntity.java (renamed from src/main/java/de/thedevstack/conversationsplus/entities/AbstractEntity.java) | 2 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Account.java (renamed from src/main/java/de/thedevstack/conversationsplus/entities/Account.java) | 16 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Blockable.java (renamed from src/main/java/de/thedevstack/conversationsplus/entities/Blockable.java) | 4 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Bookmark.java (renamed from src/main/java/de/thedevstack/conversationsplus/entities/Bookmark.java) | 10 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Contact.java (renamed from src/main/java/de/thedevstack/conversationsplus/entities/Contact.java) | 12 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Conversation.java (renamed from src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java) | 10 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/DownloadableFile.java (renamed from src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java) | 7 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/ListItem.java (renamed from src/main/java/de/thedevstack/conversationsplus/entities/ListItem.java) | 4 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Message.java (renamed from src/main/java/de/thedevstack/conversationsplus/entities/Message.java) | 14 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/MucOptions.java (renamed from src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java) | 14 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Presences.java (renamed from src/main/java/de/thedevstack/conversationsplus/entities/Presences.java) | 4 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Roster.java (renamed from src/main/java/de/thedevstack/conversationsplus/entities/Roster.java) | 4 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Transferable.java (renamed from src/main/java/de/thedevstack/conversationsplus/entities/Transferable.java) | 2 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java (renamed from src/main/java/de/thedevstack/conversationsplus/entities/TransferablePlaceholder.java) | 2 |
14 files changed, 52 insertions, 53 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/AbstractEntity.java b/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java index ebc0a8d5..957b0a14 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/AbstractEntity.java +++ b/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.entities; +package eu.siacs.conversations.entities; import android.content.ContentValues; diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java index 8d879fa0..90c10199 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/Account.java +++ b/src/main/java/eu/siacs/conversations/entities/Account.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.entities; +package eu.siacs.conversations.entities; import android.content.ContentValues; import android.database.Cursor; @@ -17,13 +17,13 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArraySet; -import de.thedevstack.conversationsplus.Config; -import de.thedevstack.conversationsplus.R; -import de.thedevstack.conversationsplus.crypto.OtrService; -import de.thedevstack.conversationsplus.services.XmppConnectionService; -import de.thedevstack.conversationsplus.xmpp.XmppConnection; -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.crypto.OtrService; +import eu.siacs.conversations.services.XmppConnectionService; +import eu.siacs.conversations.xmpp.XmppConnection; +import eu.siacs.conversations.xmpp.jid.InvalidJidException; +import eu.siacs.conversations.xmpp.jid.Jid; public class Account extends AbstractEntity { diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Blockable.java b/src/main/java/eu/siacs/conversations/entities/Blockable.java index beff901d..dbcd55c4 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/Blockable.java +++ b/src/main/java/eu/siacs/conversations/entities/Blockable.java @@ -1,6 +1,6 @@ -package de.thedevstack.conversationsplus.entities; +package eu.siacs.conversations.entities; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import eu.siacs.conversations.xmpp.jid.Jid; public interface Blockable { public boolean isBlocked(); diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Bookmark.java b/src/main/java/eu/siacs/conversations/entities/Bookmark.java index 9e67bf2d..06c46c1c 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/Bookmark.java +++ b/src/main/java/eu/siacs/conversations/entities/Bookmark.java @@ -1,6 +1,4 @@ -package de.thedevstack.conversationsplus.entities; - -import android.graphics.Color; +package eu.siacs.conversations.entities; import android.graphics.Color; @@ -8,9 +6,9 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import de.thedevstack.conversationsplus.utils.UIHelper; -import de.thedevstack.conversationsplus.xml.Element; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import eu.siacs.conversations.utils.UIHelper; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.jid.Jid; public class Bookmark extends Element implements ListItem { diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java index ca734403..81f6568b 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/Contact.java +++ b/src/main/java/eu/siacs/conversations/entities/Contact.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.entities; +package eu.siacs.conversations.entities; import android.content.ContentValues; import android.database.Cursor; @@ -12,11 +12,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import de.thedevstack.conversationsplus.utils.UIHelper; -import de.thedevstack.conversationsplus.xml.Element; -import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; -import de.thedevstack.conversationsplus.xmpp.pep.Avatar; +import eu.siacs.conversations.utils.UIHelper; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.jid.InvalidJidException; +import eu.siacs.conversations.xmpp.jid.Jid; +import eu.siacs.conversations.xmpp.pep.Avatar; public class Contact implements ListItem, Blockable { public static final String TABLENAME = "contacts"; diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java index e26f7944..1f3d35e7 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java +++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.entities; +package eu.siacs.conversations.entities; import android.content.ContentValues; import android.database.Cursor; @@ -19,11 +19,11 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; -import de.thedevstack.conversationsplus.Config; +import eu.siacs.conversations.Config; import de.thedevstack.conversationsplus.ConversationsPlusPreferences; -import de.thedevstack.conversationsplus.xmpp.chatstate.ChatState; -import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import eu.siacs.conversations.xmpp.chatstate.ChatState; +import eu.siacs.conversations.xmpp.jid.InvalidJidException; +import eu.siacs.conversations.xmpp.jid.Jid; public class Conversation extends AbstractEntity implements Blockable { public static final String TABLENAME = "conversations"; diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java b/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java index 4031e546..c6a7d3d7 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java +++ b/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.entities; +package eu.siacs.conversations.entities; import java.io.File; import java.io.FileInputStream; @@ -20,8 +20,9 @@ import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; import de.thedevstack.android.logcat.Logging; -import de.thedevstack.conversationsplus.Config; -import de.thedevstack.conversationsplus.utils.MimeUtils; + +import eu.siacs.conversations.Config; +import eu.siacs.conversations.utils.MimeUtils; public class DownloadableFile extends File { diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/ListItem.java b/src/main/java/eu/siacs/conversations/entities/ListItem.java index 9daf90d1..aba2aef2 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/ListItem.java +++ b/src/main/java/eu/siacs/conversations/entities/ListItem.java @@ -1,8 +1,8 @@ -package de.thedevstack.conversationsplus.entities; +package eu.siacs.conversations.entities; import java.util.List; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import eu.siacs.conversations.xmpp.jid.Jid; public interface ListItem extends Comparable<ListItem> { public String getDisplayName(); diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index a5d06f46..d04dff87 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.entities; +package eu.siacs.conversations.entities; import android.content.ContentValues; import android.database.Cursor; @@ -7,12 +7,12 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Arrays; -import de.thedevstack.conversationsplus.Config; -import de.thedevstack.conversationsplus.utils.GeoHelper; -import de.thedevstack.conversationsplus.utils.MimeUtils; -import de.thedevstack.conversationsplus.utils.UIHelper; -import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import eu.siacs.conversations.Config; +import eu.siacs.conversations.utils.GeoHelper; +import eu.siacs.conversations.utils.MimeUtils; +import eu.siacs.conversations.utils.UIHelper; +import eu.siacs.conversations.xmpp.jid.InvalidJidException; +import eu.siacs.conversations.xmpp.jid.Jid; public class Message extends AbstractEntity { diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java index 22155f3e..d867a370 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java +++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java @@ -1,15 +1,15 @@ -package de.thedevstack.conversationsplus.entities; +package eu.siacs.conversations.entities; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import de.thedevstack.conversationsplus.R; -import de.thedevstack.conversationsplus.crypto.PgpEngine; -import de.thedevstack.conversationsplus.xml.Element; -import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; -import de.thedevstack.conversationsplus.xmpp.stanzas.PresencePacket; +import eu.siacs.conversations.R; +import eu.siacs.conversations.crypto.PgpEngine; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.jid.InvalidJidException; +import eu.siacs.conversations.xmpp.jid.Jid; +import eu.siacs.conversations.xmpp.stanzas.PresencePacket; import android.annotation.SuppressLint; diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Presences.java b/src/main/java/eu/siacs/conversations/entities/Presences.java index cb984648..bccf3117 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/Presences.java +++ b/src/main/java/eu/siacs/conversations/entities/Presences.java @@ -1,10 +1,10 @@ -package de.thedevstack.conversationsplus.entities; +package eu.siacs.conversations.entities; import java.util.Hashtable; import java.util.Iterator; import java.util.Map.Entry; -import de.thedevstack.conversationsplus.xml.Element; +import eu.siacs.conversations.xml.Element; public class Presences { diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Roster.java b/src/main/java/eu/siacs/conversations/entities/Roster.java index b1cb78b4..628a31d1 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/Roster.java +++ b/src/main/java/eu/siacs/conversations/entities/Roster.java @@ -1,11 +1,11 @@ -package de.thedevstack.conversationsplus.entities; +package eu.siacs.conversations.entities; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import eu.siacs.conversations.xmpp.jid.Jid; public class Roster { final Account account; diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Transferable.java b/src/main/java/eu/siacs/conversations/entities/Transferable.java index a5bdb5d7..2db6e3c9 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/Transferable.java +++ b/src/main/java/eu/siacs/conversations/entities/Transferable.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.entities; +package eu.siacs.conversations.entities; public interface Transferable { diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/TransferablePlaceholder.java b/src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java index c51320d1..e065953e 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/TransferablePlaceholder.java +++ b/src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.entities; +package eu.siacs.conversations.entities; public class TransferablePlaceholder implements Transferable { |