aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-07-29 19:52:37 +0200
committerChristian Schneppe <christian@pix-art.de>2016-07-29 19:52:37 +0200
commit94933e21cd08c53a23e5ec6c12bc1dc383b1f3ce (patch)
tree4fa096547d0917f603252c9a279e4208ba4ef711 /src/main/java/eu/siacs/conversations/services
parent50889004f3c679387d95ba9c49a53a8f882ba33c (diff)
changed package id inside manifest and project
Diffstat (limited to '')
-rw-r--r--src/main/java/de/pixart/messenger/services/AbstractConnectionManager.java (renamed from src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java)6
-rw-r--r--src/main/java/de/pixart/messenger/services/AvatarService.java (renamed from src/main/java/eu/siacs/conversations/services/AvatarService.java)24
-rw-r--r--src/main/java/de/pixart/messenger/services/CheckAppVersionService.java (renamed from src/main/java/eu/siacs/conversations/services/CheckAppVersionService.java)2
-rw-r--r--src/main/java/de/pixart/messenger/services/ContactChooserTargetService.java (renamed from src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java)6
-rw-r--r--src/main/java/de/pixart/messenger/services/EventReceiver.java (renamed from src/main/java/eu/siacs/conversations/services/EventReceiver.java)4
-rw-r--r--src/main/java/de/pixart/messenger/services/ExportLogsService.java (renamed from src/main/java/eu/siacs/conversations/services/ExportLogsService.java)16
-rw-r--r--src/main/java/de/pixart/messenger/services/MessageArchiveService.java (renamed from src/main/java/eu/siacs/conversations/services/MessageArchiveService.java)22
-rw-r--r--src/main/java/de/pixart/messenger/services/NotificationService.java (renamed from src/main/java/eu/siacs/conversations/services/NotificationService.java)22
-rw-r--r--src/main/java/de/pixart/messenger/services/UpdaterWebService.java (renamed from src/main/java/eu/siacs/conversations/services/UpdaterWebService.java)8
-rw-r--r--src/main/java/de/pixart/messenger/services/XmppConnectionService.java (renamed from src/main/java/eu/siacs/conversations/services/XmppConnectionService.java)132
10 files changed, 121 insertions, 121 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java b/src/main/java/de/pixart/messenger/services/AbstractConnectionManager.java
index 50bb83d30..9228d0055 100644
--- a/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java
+++ b/src/main/java/de/pixart/messenger/services/AbstractConnectionManager.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.services;
+package de.pixart.messenger.services;
import android.Manifest;
import android.content.Context;
@@ -30,8 +30,8 @@ import javax.crypto.NoSuchPaddingException;
import javax.crypto.spec.IvParameterSpec;
import javax.crypto.spec.SecretKeySpec;
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.entities.DownloadableFile;
+import de.pixart.messenger.Config;
+import de.pixart.messenger.entities.DownloadableFile;
public class AbstractConnectionManager {
protected XmppConnectionService mXmppConnectionService;
diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/de/pixart/messenger/services/AvatarService.java
index be7623463..943516271 100644
--- a/src/main/java/eu/siacs/conversations/services/AvatarService.java
+++ b/src/main/java/de/pixart/messenger/services/AvatarService.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.services;
+package de.pixart.messenger.services;
import android.graphics.Bitmap;
import android.graphics.Canvas;
@@ -12,17 +12,17 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.entities.Bookmark;
-import eu.siacs.conversations.entities.Contact;
-import eu.siacs.conversations.entities.Conversation;
-import eu.siacs.conversations.entities.ListItem;
-import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.entities.MucOptions;
-import eu.siacs.conversations.utils.UIHelper;
-import eu.siacs.conversations.xmpp.OnAdvancedStreamFeaturesLoaded;
-import eu.siacs.conversations.xmpp.XmppConnection;
+import de.pixart.messenger.Config;
+import de.pixart.messenger.entities.Account;
+import de.pixart.messenger.entities.Bookmark;
+import de.pixart.messenger.entities.Contact;
+import de.pixart.messenger.entities.Conversation;
+import de.pixart.messenger.entities.ListItem;
+import de.pixart.messenger.entities.Message;
+import de.pixart.messenger.entities.MucOptions;
+import de.pixart.messenger.utils.UIHelper;
+import de.pixart.messenger.xmpp.OnAdvancedStreamFeaturesLoaded;
+import de.pixart.messenger.xmpp.XmppConnection;
public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
diff --git a/src/main/java/eu/siacs/conversations/services/CheckAppVersionService.java b/src/main/java/de/pixart/messenger/services/CheckAppVersionService.java
index 52962a314..72bc3508a 100644
--- a/src/main/java/eu/siacs/conversations/services/CheckAppVersionService.java
+++ b/src/main/java/de/pixart/messenger/services/CheckAppVersionService.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.services;
+package de.pixart.messenger.services;
import com.google.gson.JsonObject;
diff --git a/src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java b/src/main/java/de/pixart/messenger/services/ContactChooserTargetService.java
index edc661b79..8fcedc095 100644
--- a/src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java
+++ b/src/main/java/de/pixart/messenger/services/ContactChooserTargetService.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.services;
+package de.pixart.messenger.services;
import android.annotation.TargetApi;
import android.content.ComponentName;
@@ -16,8 +16,8 @@ import android.service.chooser.ChooserTargetService;
import java.util.ArrayList;
import java.util.List;
-import eu.siacs.conversations.entities.Conversation;
-import eu.siacs.conversations.ui.ShareWithActivity;
+import de.pixart.messenger.entities.Conversation;
+import de.pixart.messenger.ui.ShareWithActivity;
@TargetApi(Build.VERSION_CODES.M)
public class ContactChooserTargetService extends ChooserTargetService implements ServiceConnection {
diff --git a/src/main/java/eu/siacs/conversations/services/EventReceiver.java b/src/main/java/de/pixart/messenger/services/EventReceiver.java
index ceab1592b..3a48e5179 100644
--- a/src/main/java/eu/siacs/conversations/services/EventReceiver.java
+++ b/src/main/java/de/pixart/messenger/services/EventReceiver.java
@@ -1,10 +1,10 @@
-package eu.siacs.conversations.services;
+package de.pixart.messenger.services;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
-import eu.siacs.conversations.persistance.DatabaseBackend;
+import de.pixart.messenger.persistance.DatabaseBackend;
public class EventReceiver extends BroadcastReceiver {
@Override
diff --git a/src/main/java/eu/siacs/conversations/services/ExportLogsService.java b/src/main/java/de/pixart/messenger/services/ExportLogsService.java
index d5732ff2a..331321ffe 100644
--- a/src/main/java/eu/siacs/conversations/services/ExportLogsService.java
+++ b/src/main/java/de/pixart/messenger/services/ExportLogsService.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.services;
+package de.pixart.messenger.services;
import android.app.NotificationManager;
import android.app.Service;
@@ -20,13 +20,13 @@ import java.util.Date;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
-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.persistance.DatabaseBackend;
-import eu.siacs.conversations.persistance.FileBackend;
-import eu.siacs.conversations.xmpp.jid.Jid;
+import de.pixart.messenger.R;
+import de.pixart.messenger.entities.Account;
+import de.pixart.messenger.entities.Conversation;
+import de.pixart.messenger.entities.Message;
+import de.pixart.messenger.persistance.DatabaseBackend;
+import de.pixart.messenger.persistance.FileBackend;
+import de.pixart.messenger.xmpp.jid.Jid;
public class ExportLogsService extends Service {
diff --git a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java b/src/main/java/de/pixart/messenger/services/MessageArchiveService.java
index 06df1b38a..fb8f4d1c4 100644
--- a/src/main/java/eu/siacs/conversations/services/MessageArchiveService.java
+++ b/src/main/java/de/pixart/messenger/services/MessageArchiveService.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.services;
+package de.pixart.messenger.services;
import android.util.Log;
import android.util.Pair;
@@ -9,16 +9,16 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
-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.generator.AbstractGenerator;
-import eu.siacs.conversations.xml.Element;
-import eu.siacs.conversations.xmpp.OnAdvancedStreamFeaturesLoaded;
-import eu.siacs.conversations.xmpp.OnIqPacketReceived;
-import eu.siacs.conversations.xmpp.jid.Jid;
-import eu.siacs.conversations.xmpp.stanzas.IqPacket;
+import de.pixart.messenger.Config;
+import de.pixart.messenger.R;
+import de.pixart.messenger.entities.Account;
+import de.pixart.messenger.entities.Conversation;
+import de.pixart.messenger.generator.AbstractGenerator;
+import de.pixart.messenger.xml.Element;
+import de.pixart.messenger.xmpp.OnAdvancedStreamFeaturesLoaded;
+import de.pixart.messenger.xmpp.OnIqPacketReceived;
+import de.pixart.messenger.xmpp.jid.Jid;
+import de.pixart.messenger.xmpp.stanzas.IqPacket;
public class MessageArchiveService implements OnAdvancedStreamFeaturesLoaded {
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/de/pixart/messenger/services/NotificationService.java
index 3563100c1..f0ba9d51c 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/de/pixart/messenger/services/NotificationService.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.services;
+package de.pixart.messenger.services;
import android.app.Notification;
import android.app.NotificationManager;
@@ -31,16 +31,16 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-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.ui.ConversationActivity;
-import eu.siacs.conversations.ui.ManageAccountActivity;
-import eu.siacs.conversations.ui.TimePreference;
-import eu.siacs.conversations.utils.GeoHelper;
-import eu.siacs.conversations.utils.UIHelper;
+import de.pixart.messenger.Config;
+import de.pixart.messenger.R;
+import de.pixart.messenger.entities.Account;
+import de.pixart.messenger.entities.Conversation;
+import de.pixart.messenger.entities.Message;
+import de.pixart.messenger.ui.ConversationActivity;
+import de.pixart.messenger.ui.ManageAccountActivity;
+import de.pixart.messenger.ui.TimePreference;
+import de.pixart.messenger.utils.GeoHelper;
+import de.pixart.messenger.utils.UIHelper;
public class NotificationService {
diff --git a/src/main/java/eu/siacs/conversations/services/UpdaterWebService.java b/src/main/java/de/pixart/messenger/services/UpdaterWebService.java
index 0a8d0ef69..4e4a599ad 100644
--- a/src/main/java/eu/siacs/conversations/services/UpdaterWebService.java
+++ b/src/main/java/de/pixart/messenger/services/UpdaterWebService.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.services;
+package de.pixart.messenger.services;
import android.app.IntentService;
import android.content.Intent;
@@ -20,9 +20,9 @@ import org.apache.http.params.HttpParams;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.ui.UpdaterActivity.UpdateReceiver;
+import de.pixart.messenger.Config;
+import de.pixart.messenger.R;
+import de.pixart.messenger.ui.UpdaterActivity.UpdateReceiver;
public class UpdaterWebService extends IntentService {
public static final String REQUEST_STRING = "";
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index 4d740c2b2..e5760598b 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -1,4 +1,4 @@
-package eu.siacs.conversations.services;
+package de.pixart.messenger.services;
import android.annotation.SuppressLint;
import android.annotation.TargetApi;
@@ -60,71 +60,71 @@ import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
import de.duenndns.ssl.MemorizingTrustManager;
-import eu.siacs.conversations.Config;
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.crypto.PgpDecryptionService;
-import eu.siacs.conversations.crypto.PgpEngine;
-import eu.siacs.conversations.crypto.axolotl.AxolotlService;
-import eu.siacs.conversations.crypto.axolotl.XmppAxolotlMessage;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.entities.Blockable;
-import eu.siacs.conversations.entities.Bookmark;
-import eu.siacs.conversations.entities.Contact;
-import eu.siacs.conversations.entities.Conversation;
-import eu.siacs.conversations.entities.DownloadableFile;
-import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.entities.MucOptions;
-import eu.siacs.conversations.entities.MucOptions.OnRenameListener;
-import eu.siacs.conversations.entities.Presence;
-import eu.siacs.conversations.entities.PresenceTemplate;
-import eu.siacs.conversations.entities.Roster;
-import eu.siacs.conversations.entities.ServiceDiscoveryResult;
-import eu.siacs.conversations.entities.Transferable;
-import eu.siacs.conversations.entities.TransferablePlaceholder;
-import eu.siacs.conversations.generator.AbstractGenerator;
-import eu.siacs.conversations.generator.IqGenerator;
-import eu.siacs.conversations.generator.MessageGenerator;
-import eu.siacs.conversations.generator.PresenceGenerator;
-import eu.siacs.conversations.http.HttpConnectionManager;
-import eu.siacs.conversations.parser.AbstractParser;
-import eu.siacs.conversations.parser.IqParser;
-import eu.siacs.conversations.parser.MessageParser;
-import eu.siacs.conversations.parser.PresenceParser;
-import eu.siacs.conversations.persistance.DatabaseBackend;
-import eu.siacs.conversations.persistance.FileBackend;
-import eu.siacs.conversations.ui.UiCallback;
-import eu.siacs.conversations.utils.ConversationsFileObserver;
-import eu.siacs.conversations.utils.CryptoHelper;
-import eu.siacs.conversations.utils.ExceptionHelper;
-import eu.siacs.conversations.utils.OnPhoneContactsLoadedListener;
-import eu.siacs.conversations.utils.PRNGFixes;
-import eu.siacs.conversations.utils.PhoneHelper;
-import eu.siacs.conversations.utils.ReplacingSerialSingleThreadExecutor;
-import eu.siacs.conversations.utils.SerialSingleThreadExecutor;
-import eu.siacs.conversations.utils.Xmlns;
-import eu.siacs.conversations.xml.Element;
-import eu.siacs.conversations.xmpp.OnBindListener;
-import eu.siacs.conversations.xmpp.OnContactStatusChanged;
-import eu.siacs.conversations.xmpp.OnIqPacketReceived;
-import eu.siacs.conversations.xmpp.OnKeyStatusUpdated;
-import eu.siacs.conversations.xmpp.OnMessageAcknowledged;
-import eu.siacs.conversations.xmpp.OnMessagePacketReceived;
-import eu.siacs.conversations.xmpp.OnPresencePacketReceived;
-import eu.siacs.conversations.xmpp.OnStatusChanged;
-import eu.siacs.conversations.xmpp.OnUpdateBlocklist;
-import eu.siacs.conversations.xmpp.XmppConnection;
-import eu.siacs.conversations.xmpp.chatstate.ChatState;
-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.jingle.JingleConnectionManager;
-import eu.siacs.conversations.xmpp.jingle.OnJinglePacketReceived;
-import eu.siacs.conversations.xmpp.jingle.stanzas.JinglePacket;
-import eu.siacs.conversations.xmpp.pep.Avatar;
-import eu.siacs.conversations.xmpp.stanzas.IqPacket;
-import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
-import eu.siacs.conversations.xmpp.stanzas.PresencePacket;
+import de.pixart.messenger.Config;
+import de.pixart.messenger.R;
+import de.pixart.messenger.crypto.PgpDecryptionService;
+import de.pixart.messenger.crypto.PgpEngine;
+import de.pixart.messenger.crypto.axolotl.AxolotlService;
+import de.pixart.messenger.crypto.axolotl.XmppAxolotlMessage;
+import de.pixart.messenger.entities.Account;
+import de.pixart.messenger.entities.Blockable;
+import de.pixart.messenger.entities.Bookmark;
+import de.pixart.messenger.entities.Contact;
+import de.pixart.messenger.entities.Conversation;
+import de.pixart.messenger.entities.DownloadableFile;
+import de.pixart.messenger.entities.Message;
+import de.pixart.messenger.entities.MucOptions;
+import de.pixart.messenger.entities.MucOptions.OnRenameListener;
+import de.pixart.messenger.entities.Presence;
+import de.pixart.messenger.entities.PresenceTemplate;
+import de.pixart.messenger.entities.Roster;
+import de.pixart.messenger.entities.ServiceDiscoveryResult;
+import de.pixart.messenger.entities.Transferable;
+import de.pixart.messenger.entities.TransferablePlaceholder;
+import de.pixart.messenger.generator.AbstractGenerator;
+import de.pixart.messenger.generator.IqGenerator;
+import de.pixart.messenger.generator.MessageGenerator;
+import de.pixart.messenger.generator.PresenceGenerator;
+import de.pixart.messenger.http.HttpConnectionManager;
+import de.pixart.messenger.parser.AbstractParser;
+import de.pixart.messenger.parser.IqParser;
+import de.pixart.messenger.parser.MessageParser;
+import de.pixart.messenger.parser.PresenceParser;
+import de.pixart.messenger.persistance.DatabaseBackend;
+import de.pixart.messenger.persistance.FileBackend;
+import de.pixart.messenger.ui.UiCallback;
+import de.pixart.messenger.utils.ConversationsFileObserver;
+import de.pixart.messenger.utils.CryptoHelper;
+import de.pixart.messenger.utils.ExceptionHelper;
+import de.pixart.messenger.utils.OnPhoneContactsLoadedListener;
+import de.pixart.messenger.utils.PRNGFixes;
+import de.pixart.messenger.utils.PhoneHelper;
+import de.pixart.messenger.utils.ReplacingSerialSingleThreadExecutor;
+import de.pixart.messenger.utils.SerialSingleThreadExecutor;
+import de.pixart.messenger.utils.Xmlns;
+import de.pixart.messenger.xml.Element;
+import de.pixart.messenger.xmpp.OnBindListener;
+import de.pixart.messenger.xmpp.OnContactStatusChanged;
+import de.pixart.messenger.xmpp.OnIqPacketReceived;
+import de.pixart.messenger.xmpp.OnKeyStatusUpdated;
+import de.pixart.messenger.xmpp.OnMessageAcknowledged;
+import de.pixart.messenger.xmpp.OnMessagePacketReceived;
+import de.pixart.messenger.xmpp.OnPresencePacketReceived;
+import de.pixart.messenger.xmpp.OnStatusChanged;
+import de.pixart.messenger.xmpp.OnUpdateBlocklist;
+import de.pixart.messenger.xmpp.XmppConnection;
+import de.pixart.messenger.xmpp.chatstate.ChatState;
+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.jingle.JingleConnectionManager;
+import de.pixart.messenger.xmpp.jingle.OnJinglePacketReceived;
+import de.pixart.messenger.xmpp.jingle.stanzas.JinglePacket;
+import de.pixart.messenger.xmpp.pep.Avatar;
+import de.pixart.messenger.xmpp.stanzas.IqPacket;
+import de.pixart.messenger.xmpp.stanzas.MessagePacket;
+import de.pixart.messenger.xmpp.stanzas.PresencePacket;
import me.leolin.shortcutbadger.ShortcutBadger;
public class XmppConnectionService extends Service {