diff options
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/AbstractEntity.java (renamed from src/main/java/eu/siacs/conversations/entities/AbstractEntity.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/Account.java (renamed from src/main/java/eu/siacs/conversations/entities/Account.java) | 16 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/Blockable.java (renamed from src/main/java/eu/siacs/conversations/entities/Blockable.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/Bookmark.java (renamed from src/main/java/eu/siacs/conversations/entities/Bookmark.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/Contact.java (renamed from src/main/java/eu/siacs/conversations/entities/Contact.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java (renamed from src/main/java/eu/siacs/conversations/entities/Conversation.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/Downloadable.java (renamed from src/main/java/eu/siacs/conversations/entities/Downloadable.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java (renamed from src/main/java/eu/siacs/conversations/entities/DownloadableFile.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/DownloadablePlaceholder.java (renamed from src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/ListItem.java (renamed from src/main/java/eu/siacs/conversations/entities/ListItem.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/Message.java (renamed from src/main/java/eu/siacs/conversations/entities/Message.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java (renamed from src/main/java/eu/siacs/conversations/entities/MucOptions.java) | 14 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/Presences.java (renamed from src/main/java/eu/siacs/conversations/entities/Presences.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/thedevstack/conversationsplus/entities/Roster.java (renamed from src/main/java/eu/siacs/conversations/entities/Roster.java) | 4 |
14 files changed, 47 insertions, 47 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java b/src/main/java/de/thedevstack/conversationsplus/entities/AbstractEntity.java index 957b0a14..ebc0a8d5 100644 --- a/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/AbstractEntity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; import android.content.ContentValues; diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/de/thedevstack/conversationsplus/entities/Account.java index 2bc2c954..1b6539da 100644 --- a/src/main/java/eu/siacs/conversations/entities/Account.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Account.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.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 eu.siacs.conversations.Config; -import eu.siacs.conversations.R; -import eu.siacs.conversations.crypto.OtrEngine; -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; +import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.R; +import de.thedevstack.conversationsplus.crypto.OtrEngine; +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; public class Account extends AbstractEntity { diff --git a/src/main/java/eu/siacs/conversations/entities/Blockable.java b/src/main/java/de/thedevstack/conversationsplus/entities/Blockable.java index dbcd55c4..beff901d 100644 --- a/src/main/java/eu/siacs/conversations/entities/Blockable.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Blockable.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public interface Blockable { public boolean isBlocked(); diff --git a/src/main/java/eu/siacs/conversations/entities/Bookmark.java b/src/main/java/de/thedevstack/conversationsplus/entities/Bookmark.java index f81f1a87..ea7df2f2 100644 --- a/src/main/java/eu/siacs/conversations/entities/Bookmark.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Bookmark.java @@ -1,12 +1,12 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; import java.util.ArrayList; import java.util.List; import java.util.Locale; -import eu.siacs.conversations.utils.UIHelper; -import eu.siacs.conversations.xml.Element; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.utils.UIHelper; +import de.thedevstack.conversationsplus.xml.Element; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public class Bookmark extends Element implements ListItem { diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/de/thedevstack/conversationsplus/entities/Contact.java index cef03ebe..07d42d28 100644 --- a/src/main/java/eu/siacs/conversations/entities/Contact.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Contact.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; import android.content.ContentValues; import android.database.Cursor; @@ -11,10 +11,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -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 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; public class Contact implements ListItem, Blockable { public static final String TABLENAME = "contacts"; diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java index bfee5007..37cbff46 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; import android.content.ContentValues; import android.database.Cursor; @@ -18,10 +18,10 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.xmpp.chatstate.ChatState; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.xmpp.chatstate.ChatState; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public class Conversation extends AbstractEntity implements Blockable { public static final String TABLENAME = "conversations"; diff --git a/src/main/java/eu/siacs/conversations/entities/Downloadable.java b/src/main/java/de/thedevstack/conversationsplus/entities/Downloadable.java index d25bf93a..20169dc8 100644 --- a/src/main/java/eu/siacs/conversations/entities/Downloadable.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Downloadable.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; public interface Downloadable { diff --git a/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java b/src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java index 7c8f95d1..7566c199 100644 --- a/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; import java.io.File; import java.io.FileInputStream; @@ -19,7 +19,7 @@ import javax.crypto.NoSuchPaddingException; import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; -import eu.siacs.conversations.Config; +import de.thedevstack.conversationsplus.Config; import android.util.Log; public class DownloadableFile extends File { diff --git a/src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java b/src/main/java/de/thedevstack/conversationsplus/entities/DownloadablePlaceholder.java index 03fceceb..741d2990 100644 --- a/src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/DownloadablePlaceholder.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; public class DownloadablePlaceholder implements Downloadable { diff --git a/src/main/java/eu/siacs/conversations/entities/ListItem.java b/src/main/java/de/thedevstack/conversationsplus/entities/ListItem.java index efc1c2b9..825eb481 100644 --- a/src/main/java/eu/siacs/conversations/entities/ListItem.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/ListItem.java @@ -1,8 +1,8 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; import java.util.List; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public interface ListItem extends Comparable<ListItem> { public String getDisplayName(); diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/de/thedevstack/conversationsplus/entities/Message.java index bcb1ca24..cd7556b3 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Message.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; import android.content.ContentValues; import android.database.Cursor; @@ -7,10 +7,10 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.Arrays; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.utils.GeoHelper; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.Config; +import de.thedevstack.conversationsplus.utils.GeoHelper; +import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public class Message extends AbstractEntity { diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java index addee8db..860643e0 100644 --- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java @@ -1,15 +1,15 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; import java.util.ArrayList; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -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 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 android.annotation.SuppressLint; diff --git a/src/main/java/eu/siacs/conversations/entities/Presences.java b/src/main/java/de/thedevstack/conversationsplus/entities/Presences.java index bccf3117..cb984648 100644 --- a/src/main/java/eu/siacs/conversations/entities/Presences.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Presences.java @@ -1,10 +1,10 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; import java.util.Hashtable; import java.util.Iterator; import java.util.Map.Entry; -import eu.siacs.conversations.xml.Element; +import de.thedevstack.conversationsplus.xml.Element; public class Presences { diff --git a/src/main/java/eu/siacs/conversations/entities/Roster.java b/src/main/java/de/thedevstack/conversationsplus/entities/Roster.java index ce058004..0c719ed9 100644 --- a/src/main/java/eu/siacs/conversations/entities/Roster.java +++ b/src/main/java/de/thedevstack/conversationsplus/entities/Roster.java @@ -1,10 +1,10 @@ -package eu.siacs.conversations.entities; +package de.thedevstack.conversationsplus.entities; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.thedevstack.conversationsplus.xmpp.jid.Jid; public class Roster { final Account account; |