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) | 24 | ||||
-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) | 14 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Conversation.java (renamed from src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java) | 13 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/DownloadableFile.java (renamed from src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java) | 4 | ||||
-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/Presence.java (renamed from src/main/java/de/thedevstack/conversationsplus/entities/Presence.java) | 4 | ||||
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Presences.java (renamed from src/main/java/de/thedevstack/conversationsplus/entities/Presences.java) | 5 | ||||
-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/ServiceDiscoveryResult.java (renamed from src/main/java/de/thedevstack/conversationsplus/entities/ServiceDiscoveryResult.java) | 10 | ||||
-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 |
16 files changed, 67 insertions, 63 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 bc956364..4c4a1916 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; @@ -20,17 +20,17 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArraySet; import de.thedevstack.conversationsplus.ConversationsPlusPreferences; -import de.thedevstack.conversationsplus.Config; -import de.thedevstack.conversationsplus.R; -import de.thedevstack.conversationsplus.crypto.OtrService; -import de.thedevstack.conversationsplus.crypto.PgpDecryptionService; -import de.thedevstack.conversationsplus.crypto.axolotl.AxolotlService; -import de.thedevstack.conversationsplus.crypto.axolotl.AxolotlServiceImpl; -import de.thedevstack.conversationsplus.crypto.axolotl.AxolotlServiceStub; -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.crypto.PgpDecryptionService; +import eu.siacs.conversations.crypto.axolotl.AxolotlService; +import eu.siacs.conversations.crypto.axolotl.AxolotlServiceImpl; +import eu.siacs.conversations.crypto.axolotl.AxolotlServiceStub; +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 07a77eae..fa30443d 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/Bookmark.java +++ b/src/main/java/eu/siacs/conversations/entities/Bookmark.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.entities; +package eu.siacs.conversations.entities; import android.graphics.Color; @@ -6,10 +6,10 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import de.thedevstack.conversationsplus.Config; -import de.thedevstack.conversationsplus.utils.UIHelper; -import de.thedevstack.conversationsplus.xml.Element; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import eu.siacs.conversations.Config; +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 8f73be1d..9b4be366 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,12 +12,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -import de.thedevstack.conversationsplus.Config; -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.Config; +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 bfd00b5d..7878cecd 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; @@ -21,12 +21,13 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; +import de.thedevstack.conversationsplus.ConversationsPlusPreferences; import de.thedevstack.conversationsplus.utils.MessageUtil; -import de.thedevstack.conversationsplus.Config; -import de.thedevstack.conversationsplus.crypto.axolotl.AxolotlService; -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.Config; +import eu.siacs.conversations.crypto.axolotl.AxolotlService; +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 101475c3..4e63a66a 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java +++ b/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java @@ -1,8 +1,8 @@ -package de.thedevstack.conversationsplus.entities; +package eu.siacs.conversations.entities; import java.io.File; -import de.thedevstack.conversationsplus.utils.MimeUtils; +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 24dc7e94..56804fbf 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> { 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 b0a5bb3b..6faebc65 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; @@ -6,11 +6,11 @@ import android.database.Cursor; import java.net.MalformedURLException; import java.net.URL; -import de.thedevstack.conversationsplus.crypto.axolotl.XmppAxolotlSession; -import de.thedevstack.conversationsplus.utils.FileUtils; -import de.thedevstack.conversationsplus.utils.MimeUtils; -import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException; -import de.thedevstack.conversationsplus.xmpp.jid.Jid; +import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession; +import eu.siacs.conversations.utils.FileUtils; +import eu.siacs.conversations.utils.MimeUtils; +import eu.siacs.conversations.xmpp.jid.InvalidJidException; +import eu.siacs.conversations.xmpp.jid.Jid; public class Message extends AbstractEntity { @@ -63,7 +63,7 @@ public class Message extends AbstractEntity { protected String conversationUuid; protected Jid counterpart; protected Jid trueCounterpart; - protected String body; + private String body; protected String encryptedBody; protected long timeSent; protected int encryption; diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java index 1af538ec..7681a3d4 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java +++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.entities; +package eu.siacs.conversations.entities; import android.annotation.SuppressLint; @@ -10,12 +10,12 @@ import java.util.List; import java.util.Map; import java.util.Set; -import de.thedevstack.conversationsplus.R; -import de.thedevstack.conversationsplus.xmpp.forms.Data; -import de.thedevstack.conversationsplus.xmpp.forms.Field; -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.R; +import eu.siacs.conversations.xmpp.forms.Data; +import eu.siacs.conversations.xmpp.forms.Field; +import eu.siacs.conversations.xmpp.jid.InvalidJidException; +import eu.siacs.conversations.xmpp.jid.Jid; +import eu.siacs.conversations.xmpp.pep.Avatar; @SuppressLint("DefaultLocale") public class MucOptions { diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Presence.java b/src/main/java/eu/siacs/conversations/entities/Presence.java index d4f2871d..442f1bca 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/Presence.java +++ b/src/main/java/eu/siacs/conversations/entities/Presence.java @@ -1,9 +1,9 @@ -package de.thedevstack.conversationsplus.entities; +package eu.siacs.conversations.entities; import java.lang.Comparable; import java.util.Locale; -import de.thedevstack.conversationsplus.xml.Element; +import eu.siacs.conversations.xml.Element; public class Presence implements Comparable { diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Presences.java b/src/main/java/eu/siacs/conversations/entities/Presences.java index d32e931c..813eda7a 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/Presences.java +++ b/src/main/java/eu/siacs/conversations/entities/Presences.java @@ -1,7 +1,10 @@ -package de.thedevstack.conversationsplus.entities; +package eu.siacs.conversations.entities; import java.util.Collections; import java.util.Hashtable; +import java.util.Iterator; + +import eu.siacs.conversations.xml.Element; public class Presences { private final Hashtable<String, Presence> presences = new Hashtable<>(); diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Roster.java b/src/main/java/eu/siacs/conversations/entities/Roster.java index ec1a9426..d3ad9181 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/ServiceDiscoveryResult.java b/src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java index 562d95b7..a8f60e39 100644 --- a/src/main/java/de/thedevstack/conversationsplus/entities/ServiceDiscoveryResult.java +++ b/src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java @@ -1,4 +1,4 @@ -package de.thedevstack.conversationsplus.entities; +package eu.siacs.conversations.entities; import android.content.ContentValues; import android.database.Cursor; @@ -15,10 +15,10 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import de.thedevstack.conversationsplus.xml.Element; -import de.thedevstack.conversationsplus.xmpp.forms.Data; -import de.thedevstack.conversationsplus.xmpp.forms.Field; -import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket; +import eu.siacs.conversations.xml.Element; +import eu.siacs.conversations.xmpp.forms.Data; +import eu.siacs.conversations.xmpp.forms.Field; +import eu.siacs.conversations.xmpp.stanzas.IqPacket; public class ServiceDiscoveryResult { public static final String TABLENAME = "discovery_results"; diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Transferable.java b/src/main/java/eu/siacs/conversations/entities/Transferable.java index 8e2ca20e..5a47c451 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; import java.util.Arrays; import java.util.List; 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 { |