diff options
author | Christian Schneppe <christian@pix-art.de> | 2016-07-29 19:52:37 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2016-07-29 19:52:37 +0200 |
commit | 94933e21cd08c53a23e5ec6c12bc1dc383b1f3ce (patch) | |
tree | 4fa096547d0917f603252c9a279e4208ba4ef711 /src/main/java/de/pixart/messenger/entities | |
parent | 50889004f3c679387d95ba9c49a53a8f882ba33c (diff) |
changed package id inside manifest and project
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/AbstractEntity.java (renamed from src/main/java/eu/siacs/conversations/entities/AbstractEntity.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Account.java (renamed from src/main/java/eu/siacs/conversations/entities/Account.java) | 18 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Blockable.java (renamed from src/main/java/eu/siacs/conversations/entities/Blockable.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Bookmark.java (renamed from src/main/java/eu/siacs/conversations/entities/Bookmark.java) | 8 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Contact.java (renamed from src/main/java/eu/siacs/conversations/entities/Contact.java) | 14 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Conversation.java (renamed from src/main/java/eu/siacs/conversations/entities/Conversation.java) | 14 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/DownloadableFile.java (renamed from src/main/java/eu/siacs/conversations/entities/DownloadableFile.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/ListItem.java (renamed from src/main/java/eu/siacs/conversations/entities/ListItem.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Message.java (renamed from src/main/java/eu/siacs/conversations/entities/Message.java) | 16 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/MucOptions.java (renamed from src/main/java/eu/siacs/conversations/entities/MucOptions.java) | 14 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Presence.java (renamed from src/main/java/eu/siacs/conversations/entities/Presence.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/PresenceTemplate.java (renamed from src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Presences.java (renamed from src/main/java/eu/siacs/conversations/entities/Presences.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Roster.java (renamed from src/main/java/eu/siacs/conversations/entities/Roster.java) | 4 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/ServiceDiscoveryResult.java (renamed from src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java) | 10 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Transferable.java (renamed from src/main/java/eu/siacs/conversations/entities/Transferable.java) | 2 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/TransferablePlaceholder.java (renamed from src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java) | 2 |
17 files changed, 62 insertions, 62 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java b/src/main/java/de/pixart/messenger/entities/AbstractEntity.java index 957b0a146..1194cb819 100644 --- a/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java +++ b/src/main/java/de/pixart/messenger/entities/AbstractEntity.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import android.content.ContentValues; diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/de/pixart/messenger/entities/Account.java index c7359829c..8c9ed51f2 100644 --- a/src/main/java/eu/siacs/conversations/entities/Account.java +++ b/src/main/java/de/pixart/messenger/entities/Account.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import android.content.ContentValues; import android.database.Cursor; @@ -19,14 +19,14 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArraySet; -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.services.XmppConnectionService; -import eu.siacs.conversations.xmpp.XmppConnection; -import eu.siacs.conversations.xmpp.jid.InvalidJidException; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.R; +import de.pixart.messenger.crypto.OtrService; +import de.pixart.messenger.crypto.PgpDecryptionService; +import de.pixart.messenger.crypto.axolotl.AxolotlService; +import de.pixart.messenger.services.XmppConnectionService; +import de.pixart.messenger.xmpp.XmppConnection; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.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/pixart/messenger/entities/Blockable.java index dbcd55c43..07860bcfe 100644 --- a/src/main/java/eu/siacs/conversations/entities/Blockable.java +++ b/src/main/java/de/pixart/messenger/entities/Blockable.java @@ -1,6 +1,6 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.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/pixart/messenger/entities/Bookmark.java index e6aeadf4a..9c99a2baf 100644 --- a/src/main/java/eu/siacs/conversations/entities/Bookmark.java +++ b/src/main/java/de/pixart/messenger/entities/Bookmark.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import android.content.Context; @@ -6,9 +6,9 @@ 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.pixart.messenger.utils.UIHelper; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.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/pixart/messenger/entities/Contact.java index f48a052f8..b4908d08c 100644 --- a/src/main/java/eu/siacs/conversations/entities/Contact.java +++ b/src/main/java/de/pixart/messenger/entities/Contact.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import android.content.ContentValues; import android.content.Context; @@ -12,12 +12,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Locale; -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; +import de.pixart.messenger.Config; +import de.pixart.messenger.utils.UIHelper; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.pep.Avatar; 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/pixart/messenger/entities/Conversation.java index ee47f87a0..11eff3f6e 100644 --- a/src/main/java/eu/siacs/conversations/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import android.content.ContentValues; import android.database.Cursor; @@ -21,12 +21,12 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.crypto.PgpDecryptionService; -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; +import de.pixart.messenger.Config; +import de.pixart.messenger.crypto.PgpDecryptionService; +import de.pixart.messenger.crypto.axolotl.AxolotlService; +import de.pixart.messenger.xmpp.chatstate.ChatState; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; public class Conversation extends AbstractEntity implements Blockable, Comparable<Conversation> { diff --git a/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java b/src/main/java/de/pixart/messenger/entities/DownloadableFile.java index 4e63a66ab..1a6e88881 100644 --- a/src/main/java/eu/siacs/conversations/entities/DownloadableFile.java +++ b/src/main/java/de/pixart/messenger/entities/DownloadableFile.java @@ -1,8 +1,8 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import java.io.File; -import eu.siacs.conversations.utils.MimeUtils; +import de.pixart.messenger.utils.MimeUtils; public class DownloadableFile extends File { diff --git a/src/main/java/eu/siacs/conversations/entities/ListItem.java b/src/main/java/de/pixart/messenger/entities/ListItem.java index 178df2d16..cb0644499 100644 --- a/src/main/java/eu/siacs/conversations/entities/ListItem.java +++ b/src/main/java/de/pixart/messenger/entities/ListItem.java @@ -1,10 +1,10 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import android.content.Context; import java.util.List; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.jid.Jid; public interface ListItem extends Comparable<ListItem> { String getDisplayName(); diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/de/pixart/messenger/entities/Message.java index 357af7643..3145cdccf 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/de/pixart/messenger/entities/Message.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import android.content.ContentValues; import android.database.Cursor; @@ -6,13 +6,13 @@ import android.database.Cursor; import java.net.MalformedURLException; import java.net.URL; -import eu.siacs.conversations.Config; -import eu.siacs.conversations.crypto.axolotl.XmppAxolotlSession; -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; +import de.pixart.messenger.Config; +import de.pixart.messenger.crypto.axolotl.XmppAxolotlSession; +import de.pixart.messenger.utils.GeoHelper; +import de.pixart.messenger.utils.MimeUtils; +import de.pixart.messenger.utils.UIHelper; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.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/pixart/messenger/entities/MucOptions.java index bccf3d009..da2045d26 100644 --- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java +++ b/src/main/java/de/pixart/messenger/entities/MucOptions.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import android.annotation.SuppressLint; @@ -7,12 +7,12 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -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; +import de.pixart.messenger.R; +import de.pixart.messenger.xmpp.forms.Data; +import de.pixart.messenger.xmpp.forms.Field; +import de.pixart.messenger.xmpp.jid.InvalidJidException; +import de.pixart.messenger.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.pep.Avatar; @SuppressLint("DefaultLocale") public class MucOptions { diff --git a/src/main/java/eu/siacs/conversations/entities/Presence.java b/src/main/java/de/pixart/messenger/entities/Presence.java index eefe73fc0..fe7bac6ee 100644 --- a/src/main/java/eu/siacs/conversations/entities/Presence.java +++ b/src/main/java/de/pixart/messenger/entities/Presence.java @@ -1,8 +1,8 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import java.util.Locale; -import eu.siacs.conversations.xml.Element; +import de.pixart.messenger.xml.Element; public class Presence implements Comparable { diff --git a/src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java b/src/main/java/de/pixart/messenger/entities/PresenceTemplate.java index c268b24c2..b8bd167db 100644 --- a/src/main/java/eu/siacs/conversations/entities/PresenceTemplate.java +++ b/src/main/java/de/pixart/messenger/entities/PresenceTemplate.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import android.content.ContentValues; import android.database.Cursor; diff --git a/src/main/java/eu/siacs/conversations/entities/Presences.java b/src/main/java/de/pixart/messenger/entities/Presences.java index 773e44e72..ecd826d41 100644 --- a/src/main/java/eu/siacs/conversations/entities/Presences.java +++ b/src/main/java/de/pixart/messenger/entities/Presences.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import java.util.ArrayList; import java.util.Hashtable; diff --git a/src/main/java/eu/siacs/conversations/entities/Roster.java b/src/main/java/de/pixart/messenger/entities/Roster.java index d3ad91816..e267142bc 100644 --- a/src/main/java/eu/siacs/conversations/entities/Roster.java +++ b/src/main/java/de/pixart/messenger/entities/Roster.java @@ -1,11 +1,11 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; -import eu.siacs.conversations.xmpp.jid.Jid; +import de.pixart.messenger.xmpp.jid.Jid; public class Roster { final Account account; diff --git a/src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java b/src/main/java/de/pixart/messenger/entities/ServiceDiscoveryResult.java index 4de7c7e7a..cac20ba90 100644 --- a/src/main/java/eu/siacs/conversations/entities/ServiceDiscoveryResult.java +++ b/src/main/java/de/pixart/messenger/entities/ServiceDiscoveryResult.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import android.content.ContentValues; import android.database.Cursor; @@ -16,10 +16,10 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -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; +import de.pixart.messenger.xml.Element; +import de.pixart.messenger.xmpp.forms.Data; +import de.pixart.messenger.xmpp.forms.Field; +import de.pixart.messenger.xmpp.stanzas.IqPacket; public class ServiceDiscoveryResult { public static final String TABLENAME = "discovery_results"; diff --git a/src/main/java/eu/siacs/conversations/entities/Transferable.java b/src/main/java/de/pixart/messenger/entities/Transferable.java index 1ce4d8ccf..14132ac38 100644 --- a/src/main/java/eu/siacs/conversations/entities/Transferable.java +++ b/src/main/java/de/pixart/messenger/entities/Transferable.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java b/src/main/java/de/pixart/messenger/entities/TransferablePlaceholder.java index e065953ef..59f1dc846 100644 --- a/src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java +++ b/src/main/java/de/pixart/messenger/entities/TransferablePlaceholder.java @@ -1,4 +1,4 @@ -package eu.siacs.conversations.entities; +package de.pixart.messenger.entities; public class TransferablePlaceholder implements Transferable { |