Swiftdiff options
| author | Alan Young <consult.awy@gmail.com> | 2015-06-29 09:26:14 (GMT) |
|---|---|---|
| committer | Kevin Smith <kevin.smith@isode.com> | 2015-07-07 08:58:14 (GMT) |
| commit | d32bc2d8ab89f9f9787f417d71055e2b88a3b92b (patch) | |
| tree | 9a7dbb85b33805e0428e39efb3da9d1f127528c3 /src/com/isode/stroke/avatars/OfflineAvatarManager.java | |
| parent | 1f31d8301bbb89a61235d575ac3c5a2061df3a69 (diff) | |
| download | stroke-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/OfflineAvatarManager.java')
| -rwxr-xr-x | src/com/isode/stroke/avatars/OfflineAvatarManager.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/com/isode/stroke/avatars/OfflineAvatarManager.java b/src/com/isode/stroke/avatars/OfflineAvatarManager.java index fe5de08..b5c909b 100755 --- a/src/com/isode/stroke/avatars/OfflineAvatarManager.java +++ b/src/com/isode/stroke/avatars/OfflineAvatarManager.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. */ @@ -15,7 +15,7 @@ import com.isode.stroke.avatars.AvatarProvider; import com.isode.stroke.avatars.AvatarStorage; import com.isode.stroke.jid.JID; -public class OfflineAvatarManager implements AvatarProvider { +public class OfflineAvatarManager extends AvatarProvider { private AvatarStorage avatarStorage; @@ -23,12 +23,17 @@ public class OfflineAvatarManager implements AvatarProvider { this.avatarStorage = avatarStorage; } + @Override + public void delete() { + } + + @Override public String getAvatarHash(JID jid) { return avatarStorage.getAvatarForJID(jid); } public void setAvatar(JID jid, String hash) { - if (!getAvatarHash(jid).equals(hash)) { + if (!hash.equals(getAvatarHash(jid))) { avatarStorage.setAvatarForJID(jid, hash); onAvatarChanged.emit(jid); } |