Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

3 files changed, 191 insertions, 190 deletions

diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java
index cf5339a9..1467f31e 100644
--- a/src/main/java/eu/siacs/conversations/services/AvatarService.java
+++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java
@@ -8,19 +8,33 @@ import android.graphics.Typeface;
 import android.net.Uri;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 
+import de.thedevstack.android.logcat.Logging;
+import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.utils.AvatarUtil;
 import de.thedevstack.conversationsplus.utils.ImageUtil;
+import de.thedevstack.conversationsplus.utils.UiUpdateHelper;
+import de.thedevstack.conversationsplus.utils.XmppSendUtil;
 
+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.MucOptions;
+import eu.siacs.conversations.generator.IqGenerator;
+import eu.siacs.conversations.parser.IqParser;
+import eu.siacs.conversations.persistance.DatabaseBackend;
+import eu.siacs.conversations.ui.UiCallback;
 import eu.siacs.conversations.utils.UIHelper;
+import eu.siacs.conversations.xml.Element;
+import eu.siacs.conversations.xmpp.OnIqPacketReceived;
+import eu.siacs.conversations.xmpp.pep.Avatar;
+import eu.siacs.conversations.xmpp.stanzas.IqPacket;
 
 public class AvatarService {
 
@@ -32,14 +46,14 @@ public class AvatarService {
 	private static final String PREFIX_CONVERSATION = "conversation";
 	private static final String PREFIX_ACCOUNT = "account";
 	private static final String PREFIX_GENERIC = "generic";
+    private static final AvatarService INSTANCE = new AvatarService();
 
-	final private ArrayList<Integer> sizes = new ArrayList<>();
-
-	protected XmppConnectionService mXmppConnectionService = null;
-
-	public AvatarService(XmppConnectionService service) {
-		this.mXmppConnectionService = service;
-	}
+    final private ArrayList<Integer> sizes = new ArrayList<>();
+	private final List<String> mInProgressAvatarFetches = new ArrayList<>();
+    
+    public static AvatarService getInstance() {
+        return INSTANCE;
+    }
 
 	private Bitmap get(final Contact contact, final int size, boolean cachedOnly) {
 		final String KEY = key(contact, size);
@@ -256,7 +270,7 @@ public class AvatarService {
 		textPaint.getTextBounds(letter, 0, 1, rect);
 		float width = textPaint.measureText(letter);
 		canvas.drawText(letter, (right + left) / 2 - width / 2, (top + bottom)
-				/ 2 + rect.height() / 2, textPaint);
+                / 2 + rect.height() / 2, textPaint);
 	}
 
 	private void drawTile(Canvas canvas, MucOptions.User user, int left,
@@ -289,4 +303,163 @@ public class AvatarService {
 		canvas.drawBitmap(bm, null, dst, null);
 	}
 
+    private static String generateFetchKey(Account account, final Avatar avatar) {
+        return account.getJid().toBareJid()+"_"+avatar.owner+"_"+avatar.sha1sum;
+    }
+
+	public void fetchAvatar(Account account, final Avatar avatar, final UiCallback<Avatar> callback) {
+		final String KEY = generateFetchKey(account, avatar);
+		synchronized(this.mInProgressAvatarFetches) {
+			if (this.mInProgressAvatarFetches.contains(KEY)) {
+				return;
+			} else {
+				switch (avatar.origin) {
+					case PEP:
+						this.mInProgressAvatarFetches.add(KEY);
+						fetchAvatarPep(account, avatar, callback);
+						break;
+					case VCARD:
+						this.mInProgressAvatarFetches.add(KEY);
+						fetchAvatarVcard(account, avatar, callback);
+						break;
+				}
+			}
+		}
+	}
+
+	private void fetchAvatarPep(final Account account, final Avatar avatar, final UiCallback<Avatar> callback) {
+		IqPacket packet = IqGenerator.retrievePepAvatar(avatar);
+        XmppSendUtil.sendIqPacket(account, packet, new OnIqPacketReceived() {
+
+            @Override
+            public void onIqPacketReceived(Account account, IqPacket result) {
+                synchronized (mInProgressAvatarFetches) {
+                    mInProgressAvatarFetches.remove(generateFetchKey(account, avatar));
+                }
+                final String ERROR = account.getJid().toBareJid()
+                        + ": fetching avatar for " + avatar.owner + " failed ";
+                if (result.getType() == IqPacket.TYPE.RESULT) {
+                    avatar.image = IqParser.avatarData(result);
+                    if (avatar.image != null) {
+                        if (AvatarUtil.save(avatar)) {
+                            if (account.getJid().toBareJid().equals(avatar.owner)) {
+                                if (account.setAvatar(avatar.getFilename())) {
+                                    DatabaseBackend.getInstance(ConversationsPlusApplication.getAppContext()).updateAccount(account);
+                                }
+                                AvatarService.this.clear(account);
+                                UiUpdateHelper.updateConversationUi();
+								UiUpdateHelper.updateAccountUi();
+                            } else {
+                                Contact contact = account.getRoster()
+                                        .getContact(avatar.owner);
+                                contact.setAvatar(avatar);
+                                AvatarService.this.clear(contact);
+								UiUpdateHelper.updateConversationUi();
+								UiUpdateHelper.updateRosterUi();
+                            }
+                            if (callback != null) {
+                                callback.success(avatar);
+                            }
+                            Logging.d(Config.LOGTAG, account.getJid().toBareJid()
+                                    + ": succesfuly fetched pep avatar for " + avatar.owner);
+                            return;
+                        }
+                    } else {
+
+                        Logging.d(Config.LOGTAG, ERROR + "(parsing error)");
+                    }
+                } else {
+                    Element error = result.findChild("error");
+                    if (error == null) {
+                        Logging.d(Config.LOGTAG, ERROR + "(server error)");
+                    } else {
+                        Logging.d(Config.LOGTAG, ERROR + error.toString());
+                    }
+                }
+                if (callback != null) {
+                    callback.error(0, null);
+                }
+
+            }
+        });
+	}
+
+	private void fetchAvatarVcard(final Account account, final Avatar avatar, final UiCallback<Avatar> callback) {
+		IqPacket packet = IqGenerator.retrieveVcardAvatar(avatar);
+        XmppSendUtil.sendIqPacket(account, packet, new OnIqPacketReceived() {
+            @Override
+            public void onIqPacketReceived(Account account, IqPacket packet) {
+                synchronized (mInProgressAvatarFetches) {
+                    mInProgressAvatarFetches.remove(generateFetchKey(account, avatar));
+                }
+                if (packet.getType() == IqPacket.TYPE.RESULT) {
+                    Element vCard = packet.findChild("vCard", "vcard-temp");
+                    Element photo = vCard != null ? vCard.findChild("PHOTO") : null;
+                    String image = photo != null ? photo.findChildContent("BINVAL") : null;
+                    if (image != null) {
+                        avatar.image = image;
+                        if (AvatarUtil.save(avatar)) {
+                            Logging.d(Config.LOGTAG, account.getJid().toBareJid()
+                                    + ": successfully fetched vCard avatar for " + avatar.owner);
+                            Contact contact = account.getRoster()
+                                    .getContact(avatar.owner);
+                            contact.setAvatar(avatar);
+                            AvatarService.this.clear(contact);
+							UiUpdateHelper.updateConversationUi();
+							UiUpdateHelper.updateRosterUi();
+                        }
+                    }
+                }
+            }
+        });
+	}
+
+	public void checkForAvatar(Account account, final UiCallback<Avatar> callback) {
+		IqPacket packet = IqGenerator.retrieveAvatarMetaData(null);
+		XmppSendUtil.sendIqPacket(account, packet, new OnIqPacketReceived() {
+
+            @Override
+            public void onIqPacketReceived(Account account, IqPacket packet) {
+                if (packet.getType() == IqPacket.TYPE.RESULT) {
+                    Element pubsub = packet.findChild("pubsub",
+                            "http://jabber.org/protocol/pubsub");
+                    if (pubsub != null) {
+                        Element items = pubsub.findChild("items");
+                        if (items != null) {
+                            Avatar avatar = Avatar.parseMetadata(items);
+                            if (avatar != null) {
+                                avatar.owner = account.getJid().toBareJid();
+                                if (AvatarUtil.isAvatarCached(avatar)) {
+                                    if (account.setAvatar(avatar.getFilename())) {
+                                        DatabaseBackend.getInstance(ConversationsPlusApplication.getAppContext()).updateAccount(account);
+                                    }
+                                    AvatarService.this.clear(account);
+                                    callback.success(avatar);
+                                } else {
+                                    fetchAvatarPep(account, avatar, callback);
+                                }
+                                return;
+                            }
+                        }
+                    }
+                }
+                callback.error(0, null);
+            }
+        });
+	}
+
+	public void fetchAvatar(Account account, Avatar avatar) {
+		fetchAvatar(account, avatar, null);
+	}
+
+	public void clearFetchInProgress(Account account) {
+		synchronized (this.mInProgressAvatarFetches) {
+			for(Iterator<String> iterator = this.mInProgressAvatarFetches.iterator(); iterator.hasNext();) {
+				final String KEY = iterator.next();
+				if (KEY.startsWith(account.getJid().toBareJid()+"_")) {
+					iterator.remove();
+				}
+			}
+		}
+	}
 }
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index 2bc0ca16..c025d580 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -256,8 +256,7 @@ public class NotificationService {
 		final ArrayList<Message> messages = notifications.values().iterator().next();
 		if (messages.size() >= 1) {
 			final Conversation conversation = messages.get(0).getConversation();
-			mBuilder.setLargeIcon(mXmppConnectionService.getAvatarService()
-					.get(conversation, getPixel(64)));
+			mBuilder.setLargeIcon(AvatarService.getInstance().get(conversation, getPixel(64)));
 			mBuilder.setContentTitle(conversation.getName());
 			Message message;
 			if ((message = getImage(messages)) != null) {
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 1ac792c7..89bba35e 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -8,7 +8,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.database.ContentObserver;
 import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.net.Uri;
@@ -31,9 +30,6 @@ import net.java.otr4j.session.SessionStatus;
 import org.openintents.openpgp.util.OpenPgpApi;
 import org.openintents.openpgp.util.OpenPgpServiceConnection;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
 import java.math.BigInteger;
 import java.security.SecureRandom;
 import java.util.ArrayList;
@@ -42,7 +38,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -54,11 +49,12 @@ import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.ConversationsPlusApplication;
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.exceptions.FileCopyException;
-import de.thedevstack.conversationsplus.exceptions.UiException;
 import de.thedevstack.conversationsplus.utils.AvatarUtil;
 import de.thedevstack.conversationsplus.utils.FileHelper;
 import de.thedevstack.conversationsplus.utils.ImageUtil;
 import de.thedevstack.conversationsplus.utils.MessageUtil;
+import de.thedevstack.conversationsplus.utils.UiUpdateHelper;
+import de.thedevstack.conversationsplus.utils.XmppSendUtil;
 import de.tzur.conversations.Settings;
 
 import eu.siacs.conversations.Config;
@@ -236,8 +232,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			this);
 	private HttpConnectionManager mHttpConnectionManager = new HttpConnectionManager(
 			this);
-	private AvatarService mAvatarService = new AvatarService(this);
-	private final List<String> mInProgressAvatarFetches = new ArrayList<>();
 	private MessageArchiveService mMessageArchiveService = new MessageArchiveService(this);
 	private OnConversationUpdate mOnConversationUpdate = null;
 	private int convChangedListenerCount = 0;
@@ -338,10 +332,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 
 	}
 
-	public AvatarService getAvatarService() {
-		return this.mAvatarService;
-	}
-
 	public void attachLocationToConversation(final Conversation conversation,
 											 final Uri uri,
 											 final UiCallback<Message> callback) {
@@ -590,6 +580,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		this.wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK,"XmppConnectionService");
 		toggleForegroundService();
 		updateUnreadCountBadge();
+        UiUpdateHelper.initXmppConnectionService(this);
 	}
 
 	public void toggleForegroundService() {
@@ -889,7 +880,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 							+ phoneContact.getString("lookup");
 						contact.setSystemAccount(systemAccount);
 						if (contact.setPhotoUri(phoneContact.getString("photouri"))) {
-							getAvatarService().clear(contact);
+                            AvatarService.getInstance().clear(contact);
 						}
 						contact.setSystemName(phoneContact.getString("displayname"));
 						withSystemAccounts.remove(contact);
@@ -898,7 +889,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 						contact.setSystemAccount(null);
 						contact.setSystemName(null);
 						if (contact.setPhotoUri(null)) {
-							getAvatarService().clear(contact);
+                            AvatarService.getInstance().clear(contact);
 						}
 					}
 				}
@@ -1889,7 +1880,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 														   IqPacket result) {
 								if (result.getType() == IqPacket.TYPE.RESULT) {
 									if (account.setAvatar(avatar.getFilename())) {
-										getAvatarService().clear(account);
+                                        AvatarService.getInstance().clear(account);
 										databaseBackend.updateAccount(account);
 									}
 									callback.success(avatar);
@@ -1912,155 +1903,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		}
 	}
 
-	public void fetchAvatar(Account account, Avatar avatar) {
-		fetchAvatar(account, avatar, null);
-	}
-
-	private static String generateFetchKey(Account account, final Avatar avatar) {
-		return account.getJid().toBareJid()+"_"+avatar.owner+"_"+avatar.sha1sum;
-	}
-
-	public void fetchAvatar(Account account, final Avatar avatar, final UiCallback<Avatar> callback) {
-		final String KEY = generateFetchKey(account, avatar);
-		synchronized(this.mInProgressAvatarFetches) {
-			if (this.mInProgressAvatarFetches.contains(KEY)) {
-				return;
-			} else {
-				switch (avatar.origin) {
-					case PEP:
-						this.mInProgressAvatarFetches.add(KEY);
-						fetchAvatarPep(account, avatar, callback);
-						break;
-					case VCARD:
-						this.mInProgressAvatarFetches.add(KEY);
-						fetchAvatarVcard(account, avatar, callback);
-						break;
-				}
-			}
-		}
-	}
-
-	private void fetchAvatarPep(Account account, final Avatar avatar, final UiCallback<Avatar> callback) {
-		IqPacket packet = this.mIqGenerator.retrievePepAvatar(avatar);
-		sendIqPacket(account, packet, new OnIqPacketReceived() {
-
-			@Override
-			public void onIqPacketReceived(Account account, IqPacket result) {
-				synchronized (mInProgressAvatarFetches) {
-					mInProgressAvatarFetches.remove(generateFetchKey(account, avatar));
-				}
-				final String ERROR = account.getJid().toBareJid()
-						+ ": fetching avatar for " + avatar.owner + " failed ";
-				if (result.getType() == IqPacket.TYPE.RESULT) {
-					avatar.image = mIqParser.avatarData(result);
-					if (avatar.image != null) {
-						if (AvatarUtil.save(avatar)) {
-							if (account.getJid().toBareJid().equals(avatar.owner)) {
-								if (account.setAvatar(avatar.getFilename())) {
-									databaseBackend.updateAccount(account);
-								}
-								getAvatarService().clear(account);
-								updateConversationUi();
-								updateAccountUi();
-							} else {
-								Contact contact = account.getRoster()
-										.getContact(avatar.owner);
-								contact.setAvatar(avatar);
-								getAvatarService().clear(contact);
-								updateConversationUi();
-								updateRosterUi();
-							}
-							if (callback != null) {
-								callback.success(avatar);
-							}
-							Logging.d(Config.LOGTAG, account.getJid().toBareJid()
-									+ ": succesfuly fetched pep avatar for " + avatar.owner);
-							return;
-						}
-					} else {
-
-						Logging.d(Config.LOGTAG, ERROR + "(parsing error)");
-					}
-				} else {
-					Element error = result.findChild("error");
-					if (error == null) {
-						Logging.d(Config.LOGTAG, ERROR + "(server error)");
-					} else {
-						Logging.d(Config.LOGTAG, ERROR + error.toString());
-					}
-				}
-				if (callback != null) {
-					callback.error(0, null);
-				}
-
-			}
-		});
-	}
-
-	private void fetchAvatarVcard(final Account account, final Avatar avatar, final UiCallback<Avatar> callback) {
-		IqPacket packet = this.mIqGenerator.retrieveVcardAvatar(avatar);
-		this.sendIqPacket(account, packet, new OnIqPacketReceived() {
-			@Override
-			public void onIqPacketReceived(Account account, IqPacket packet) {
-				synchronized (mInProgressAvatarFetches) {
-					mInProgressAvatarFetches.remove(generateFetchKey(account, avatar));
-				}
-				if (packet.getType() == IqPacket.TYPE.RESULT) {
-					Element vCard = packet.findChild("vCard", "vcard-temp");
-					Element photo = vCard != null ? vCard.findChild("PHOTO") : null;
-					String image = photo != null ? photo.findChildContent("BINVAL") : null;
-					if (image != null) {
-						avatar.image = image;
-						if (AvatarUtil.save(avatar)) {
-							Logging.d(Config.LOGTAG, account.getJid().toBareJid()
-									+ ": successfully fetched vCard avatar for " + avatar.owner);
-							Contact contact = account.getRoster()
-									.getContact(avatar.owner);
-							contact.setAvatar(avatar);
-							getAvatarService().clear(contact);
-							updateConversationUi();
-							updateRosterUi();
-						}
-					}
-				}
-			}
-		});
-	}
-
-	public void checkForAvatar(Account account, final UiCallback<Avatar> callback) {
-		IqPacket packet = this.mIqGenerator.retrieveAvatarMetaData(null);
-		this.sendIqPacket(account, packet, new OnIqPacketReceived() {
-
-			@Override
-			public void onIqPacketReceived(Account account, IqPacket packet) {
-				if (packet.getType() == IqPacket.TYPE.RESULT) {
-					Element pubsub = packet.findChild("pubsub",
-							"http://jabber.org/protocol/pubsub");
-					if (pubsub != null) {
-						Element items = pubsub.findChild("items");
-						if (items != null) {
-							Avatar avatar = Avatar.parseMetadata(items);
-							if (avatar != null) {
-								avatar.owner = account.getJid().toBareJid();
-								if (AvatarUtil.isAvatarCached(avatar)) {
-									if (account.setAvatar(avatar.getFilename())) {
-										databaseBackend.updateAccount(account);
-									}
-									getAvatarService().clear(account);
-									callback.success(avatar);
-								} else {
-									fetchAvatarPep(account, avatar, callback);
-								}
-								return;
-							}
-						}
-					}
-				}
-				callback.error(0, null);
-			}
-		});
-	}
-
 	public void deleteContactOnServer(Contact contact) {
 		contact.resetOption(Contact.Options.PREEMPTIVE_GRANT);
 		contact.resetOption(Contact.Options.DIRTY_PUSH);
@@ -2086,14 +1928,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			}
 			if (!account.isOptionSet(Account.OPTION_DISABLED)) {
 
-				synchronized (this.mInProgressAvatarFetches) {
-					for(Iterator<String> iterator = this.mInProgressAvatarFetches.iterator(); iterator.hasNext();) {
-						final String KEY = iterator.next();
-						if (KEY.startsWith(account.getJid().toBareJid()+"_")) {
-							iterator.remove();
-						}
-					}
-				}
+                AvatarService.getInstance().clearFetchInProgress(account);
 
 				if (account.getXmppConnection() == null) {
 					account.setXmppConnection(createConnection(account));
@@ -2355,17 +2190,11 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public void sendPresencePacket(Account account, PresencePacket packet) {
-		XmppConnection connection = account.getXmppConnection();
-		if (connection != null) {
-			connection.sendPresencePacket(packet);
-		}
+		XmppSendUtil.sendPresencePacket(account, packet);
 	}
 
 	public void sendIqPacket(final Account account, final IqPacket packet, final OnIqPacketReceived callback) {
-		final XmppConnection connection = account.getXmppConnection();
-		if (connection != null) {
-			connection.sendIqPacket(packet, callback);
-		}
+		XmppSendUtil.sendIqPacket(account, packet, callback);
 	}
 
 	public void sendPresence(final Account account) {