Refactoring: Avatar class moved from package xmpp.pep to dto

20 files changed, 20 insertions, 21 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/pep/Avatar.java b/src/main/java/de/thedevstack/conversationsplus/dto/Avatar.java
index acf2a730..b49dc5a7 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/pep/Avatar.java
+++ b/src/main/java/de/thedevstack/conversationsplus/dto/Avatar.java
@@ -1,4 +1,4 @@
-package de.thedevstack.conversationsplus.xmpp.pep;
+package de.thedevstack.conversationsplus.dto;
 
 import android.util.Base64;
 
diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Contact.java b/src/main/java/de/thedevstack/conversationsplus/entities/Contact.java
index 8f73be1d..3dc7c10a 100644
--- a/src/main/java/de/thedevstack/conversationsplus/entities/Contact.java
+++ b/src/main/java/de/thedevstack/conversationsplus/entities/Contact.java
@@ -2,7 +2,6 @@ package de.thedevstack.conversationsplus.entities;
 
 import android.content.ContentValues;
 import android.database.Cursor;
-import android.graphics.Color;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -17,7 +16,7 @@ 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 de.thedevstack.conversationsplus.dto.Avatar;
 
 public class Contact implements ListItem, Blockable {
 	public static final String TABLENAME = "contacts";
diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java b/src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java
index 1af538ec..32cdb1a9 100644
--- a/src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java
+++ b/src/main/java/de/thedevstack/conversationsplus/entities/MucOptions.java
@@ -15,7 +15,7 @@ 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 de.thedevstack.conversationsplus.dto.Avatar;
 
 @SuppressLint("DefaultLocale")
 public class MucOptions {
diff --git a/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java b/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
index a8fa0128..f282ae01 100644
--- a/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
+++ b/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
@@ -41,7 +41,7 @@ import de.thedevstack.conversationsplus.xml.Element;
 import de.thedevstack.conversationsplus.xmpp.OnMessagePacketReceived;
 import de.thedevstack.conversationsplus.xmpp.chatstate.ChatState;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
-import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
+import de.thedevstack.conversationsplus.dto.Avatar;
 import de.thedevstack.conversationsplus.xmpp.stanzas.MessagePacket;
 
 public class MessageParser extends AbstractParser implements
diff --git a/src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java b/src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java
index 74e29393..5270eefe 100644
--- a/src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java
+++ b/src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java
@@ -27,7 +27,7 @@ import de.thedevstack.conversationsplus.xml.Element;
 import de.thedevstack.conversationsplus.xmpp.OnPresencePacketReceived;
 import de.thedevstack.conversationsplus.xmpp.avatar.AvatarVcardParser;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
-import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
+import de.thedevstack.conversationsplus.dto.Avatar;
 import de.thedevstack.conversationsplus.xmpp.stanzas.PresencePacket;
 
 public class PresenceParser extends AbstractParser implements
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/avatar/AvatarService.java b/src/main/java/de/thedevstack/conversationsplus/services/avatar/AvatarService.java
index 47443488..ea424243 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/avatar/AvatarService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/avatar/AvatarService.java
@@ -34,7 +34,7 @@ import de.thedevstack.conversationsplus.utils.UIHelper;
 import de.thedevstack.conversationsplus.xmpp.OnAdvancedStreamFeaturesLoaded;
 import de.thedevstack.conversationsplus.xmpp.XmppConnection;
 import de.thedevstack.conversationsplus.xmpp.avatar.AvatarVcardPacketGenerator;
-import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
+import de.thedevstack.conversationsplus.dto.Avatar;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
 
 public class AvatarService implements OnAdvancedStreamFeaturesLoaded {
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/AbstractAvatarIqPacketReceived.java b/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/AbstractAvatarIqPacketReceived.java
index 69dcdcc4..fae4b160 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/AbstractAvatarIqPacketReceived.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/AbstractAvatarIqPacketReceived.java
@@ -2,7 +2,7 @@ package de.thedevstack.conversationsplus.services.avatar.listener;
 
 import de.thedevstack.conversationsplus.ui.UiCallback;
 import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived;
-import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
+import de.thedevstack.conversationsplus.dto.Avatar;
 
 /**
  *
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/AvatarMetadataReceived.java b/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/AvatarMetadataReceived.java
index b993ff18..14eff98a 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/AvatarMetadataReceived.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/AvatarMetadataReceived.java
@@ -8,7 +8,7 @@ import de.thedevstack.conversationsplus.services.avatar.AvatarService;
 import de.thedevstack.conversationsplus.ui.UiCallback;
 import de.thedevstack.conversationsplus.utils.AvatarUtil;
 import de.thedevstack.conversationsplus.xmpp.avatar.AvatarPacketParser;
-import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
+import de.thedevstack.conversationsplus.dto.Avatar;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
 
 /**
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/AvatarPepReceived.java b/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/AvatarPepReceived.java
index c248d7c8..e0d426b3 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/AvatarPepReceived.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/AvatarPepReceived.java
@@ -13,7 +13,7 @@ import de.thedevstack.conversationsplus.utils.AvatarUtil;
 import de.thedevstack.conversationsplus.utils.UiUpdateHelper;
 import de.thedevstack.conversationsplus.xml.Element;
 import de.thedevstack.conversationsplus.xmpp.avatar.AvatarPacketParser;
-import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
+import de.thedevstack.conversationsplus.dto.Avatar;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
 
 /**
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/AvatarVcardReceived.java b/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/AvatarVcardReceived.java
index 00036109..9e242862 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/AvatarVcardReceived.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/AvatarVcardReceived.java
@@ -10,7 +10,7 @@ import de.thedevstack.conversationsplus.ui.UiCallback;
 import de.thedevstack.conversationsplus.utils.AvatarUtil;
 import de.thedevstack.conversationsplus.utils.UiUpdateHelper;
 import de.thedevstack.conversationsplus.xml.Element;
-import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
+import de.thedevstack.conversationsplus.dto.Avatar;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
 
 /**
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/PublishAvatarMetadataResponseReceived.java b/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/PublishAvatarMetadataResponseReceived.java
index 79380dbf..0d318bbd 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/PublishAvatarMetadataResponseReceived.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/PublishAvatarMetadataResponseReceived.java
@@ -6,7 +6,7 @@ import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.persistance.DatabaseBackend;
 import de.thedevstack.conversationsplus.services.avatar.AvatarCache;
 import de.thedevstack.conversationsplus.ui.UiCallback;
-import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
+import de.thedevstack.conversationsplus.dto.Avatar;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
 
 /**
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/PublishAvatarResponseReceived.java b/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/PublishAvatarResponseReceived.java
index e062fce6..c1d5f05c 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/PublishAvatarResponseReceived.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/PublishAvatarResponseReceived.java
@@ -5,7 +5,7 @@ import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.ui.UiCallback;
 import de.thedevstack.conversationsplus.utils.XmppSendUtil;
 import de.thedevstack.conversationsplus.xmpp.avatar.AvatarPacketGenerator;
-import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
+import de.thedevstack.conversationsplus.dto.Avatar;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
 
 /**
diff --git a/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/RepublishAvatarAfterMetadataReceived.java b/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/RepublishAvatarAfterMetadataReceived.java
index 16f4bf81..d7035f47 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/RepublishAvatarAfterMetadataReceived.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/avatar/listener/RepublishAvatarAfterMetadataReceived.java
@@ -8,7 +8,7 @@ import de.thedevstack.conversationsplus.utils.AvatarUtil;
 import de.thedevstack.conversationsplus.xml.Element;
 import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived;
 import de.thedevstack.conversationsplus.xmpp.avatar.AvatarPacketParser;
-import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
+import de.thedevstack.conversationsplus.dto.Avatar;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
 
 /**
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java
index 1e81603f..6856bc25 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/EditAccountActivity.java
@@ -60,7 +60,7 @@ import de.thedevstack.conversationsplus.xmpp.XmppConnection.Features;
 import de.thedevstack.conversationsplus.xmpp.forms.Data;
 import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
-import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
+import de.thedevstack.conversationsplus.dto.Avatar;
 
 public class EditAccountActivity extends XmppActivity implements OnAccountUpdate,
 		OnKeyStatusUpdated, OnCaptchaRequested, KeyChainAliasCallback, XmppConnectionService.OnShowErrorToast, XmppConnectionService.OnMamPreferencesFetched {
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java
index b41511de..818d4b0f 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/PublishProfilePictureActivity.java
@@ -30,7 +30,7 @@ import de.thedevstack.conversationsplus.services.avatar.AvatarService;
 import de.thedevstack.conversationsplus.utils.FileUtils;
 import de.thedevstack.conversationsplus.utils.PhoneHelper;
 import de.thedevstack.conversationsplus.utils.ui.TextViewUtil;
-import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
+import de.thedevstack.conversationsplus.dto.Avatar;
 
 public class PublishProfilePictureActivity extends XmppActivity {
 
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java b/src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java
index 9f6071bb..32883c3b 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/AvatarUtil.java
@@ -20,7 +20,7 @@ import java.security.NoSuchAlgorithmException;
 import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.Config;
-import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
+import de.thedevstack.conversationsplus.dto.Avatar;
 
 /**
  * This util provides access to saved avatars, creating avatars.
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/avatar/AvatarPacketGenerator.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/avatar/AvatarPacketGenerator.java
index 1574604e..4534e870 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/avatar/AvatarPacketGenerator.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/avatar/AvatarPacketGenerator.java
@@ -3,7 +3,7 @@ package de.thedevstack.conversationsplus.xmpp.avatar;
 import de.thedevstack.conversationsplus.xmpp.pubsub.PubSubPacketGenerator;
 import de.thedevstack.conversationsplus.xml.Element;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
-import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
+import de.thedevstack.conversationsplus.dto.Avatar;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
 
 /**
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/avatar/AvatarPacketParser.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/avatar/AvatarPacketParser.java
index 78ab9288..175f54bd 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/avatar/AvatarPacketParser.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/avatar/AvatarPacketParser.java
@@ -1,6 +1,6 @@
 package de.thedevstack.conversationsplus.xmpp.avatar;
 
-import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
+import de.thedevstack.conversationsplus.dto.Avatar;
 import de.thedevstack.conversationsplus.xmpp.pubsub.PubSubPacketParser;
 import de.thedevstack.conversationsplus.xml.Element;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/avatar/AvatarVcardPacketGenerator.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/avatar/AvatarVcardPacketGenerator.java
index 375702df..e3b578e8 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/avatar/AvatarVcardPacketGenerator.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/avatar/AvatarVcardPacketGenerator.java
@@ -1,6 +1,6 @@
 package de.thedevstack.conversationsplus.xmpp.avatar;
 
-import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
+import de.thedevstack.conversationsplus.dto.Avatar;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
 
 /**
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/avatar/AvatarVcardParser.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/avatar/AvatarVcardParser.java
index 32ad6f26..4cf94474 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/avatar/AvatarVcardParser.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/avatar/AvatarVcardParser.java
@@ -1,7 +1,7 @@
 package de.thedevstack.conversationsplus.xmpp.avatar;
 
 import de.thedevstack.conversationsplus.xml.Element;
-import de.thedevstack.conversationsplus.xmpp.pep.Avatar;
+import de.thedevstack.conversationsplus.dto.Avatar;
 import de.thedevstack.conversationsplus.xmpp.stanzas.PresencePacket;
 
 /**