From 6f588444a953a54543661f7603d45a9093b7196a Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Sat, 5 Aug 2017 22:25:23 +0200
Subject: Implements FS#249: Remove code duplication for avatar creation

---
 .../java/de/thedevstack/conversationsplus/entities/Conversation.java   | 3 ++-
 src/main/java/de/thedevstack/conversationsplus/entities/Message.java   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/main/java/de/thedevstack/conversationsplus/entities')

diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java b/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java
index c0ae56fd..2edd1135 100644
--- a/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java
+++ b/src/main/java/de/thedevstack/conversationsplus/entities/Conversation.java
@@ -21,6 +21,7 @@ import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 
+import de.thedevstack.conversationsplus.dto.LoadAvatarFor;
 import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.crypto.axolotl.AxolotlService;
@@ -28,7 +29,7 @@ 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 class Conversation extends AbstractEntity implements Blockable, LoadAvatarFor {
 	public static final String TABLENAME = "conversations";
 
 	public static final int STATUS_AVAILABLE = 0;
diff --git a/src/main/java/de/thedevstack/conversationsplus/entities/Message.java b/src/main/java/de/thedevstack/conversationsplus/entities/Message.java
index 4d7697f2..b8ebfe2b 100644
--- a/src/main/java/de/thedevstack/conversationsplus/entities/Message.java
+++ b/src/main/java/de/thedevstack/conversationsplus/entities/Message.java
@@ -7,6 +7,7 @@ import java.net.MalformedURLException;
 import java.net.URL;
 
 import de.thedevstack.conversationsplus.crypto.axolotl.XmppAxolotlSession;
+import de.thedevstack.conversationsplus.dto.LoadAvatarFor;
 import de.thedevstack.conversationsplus.enums.FileStatus;
 import de.thedevstack.conversationsplus.utils.FileUtils;
 import de.thedevstack.conversationsplus.utils.MessageUtil;
@@ -14,7 +15,7 @@ import de.thedevstack.conversationsplus.utils.MimeUtils;
 import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
 
-public class Message extends AbstractEntity {
+public class Message extends AbstractEntity implements LoadAvatarFor {
 
 	public static final String TABLENAME = "messages";
 
-- 
cgit v1.2.3