summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Young <consult.awy@gmail.com>2015-06-29 09:26:14 (GMT)
committerKevin Smith <kevin.smith@isode.com>2015-07-07 08:58:14 (GMT)
commitd32bc2d8ab89f9f9787f417d71055e2b88a3b92b (patch)
tree9a7dbb85b33805e0428e39efb3da9d1f127528c3 /src/com/isode/stroke/avatars/AvatarStorage.java
parent1f31d8301bbb89a61235d575ac3c5a2061df3a69 (diff)
downloadstroke-d32bc2d8ab89f9f9787f417d71055e2b88a3b92b.zip
stroke-d32bc2d8ab89f9f9787f417d71055e2b88a3b92b.tar.bz2
Update Avatar access model.
Use the String avatar hash as the general handle for an avatar. AvatarManager.getAvatar(JID jid) will return null if no avatar is available. AvatarManager.getAvatarPath() and AvatarStorage.getAvatarPath() are deleted. Make AvatarProvider & AvatarManager abstract classes instead of interfaces so that their onAvatarChanged Signals are not static fields. Implement delete() for AvatarManagerImpl and AvatarProvider & subclasses so that signal connections can be released. Add @Override annotations as appropriate. Change-Id: Ia7c9d7607b642bb42c373f81dc6be9a60f0f2134
Diffstat (limited to 'src/com/isode/stroke/avatars/AvatarStorage.java')
-rwxr-xr-xsrc/com/isode/stroke/avatars/AvatarStorage.java7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/com/isode/stroke/avatars/AvatarStorage.java b/src/com/isode/stroke/avatars/AvatarStorage.java
index 98f7e6f..2803006 100755
--- a/src/com/isode/stroke/avatars/AvatarStorage.java
+++ b/src/com/isode/stroke/avatars/AvatarStorage.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -13,15 +13,12 @@ package com.isode.stroke.avatars;
import com.isode.stroke.base.ByteArray;
import com.isode.stroke.jid.JID;
-import java.nio.file.Path;
public interface AvatarStorage {
public boolean hasAvatar(String hash);
public void addAvatar(String hash, ByteArray avatar);
- public ByteArray getAvatar(String hash);
- public Path getAvatarPath(String hash);
-
+ public String getAvatar(String hash);
public void setAvatarForJID(JID jid, String hash);
public String getAvatarForJID(JID jid);
} \ No newline at end of file