new notification service. first draft

src/eu/siacs/conversations/entities/Conversation.java

@@ -247,8 +247,8 @@ public class Conversation extends AbstractEntity {
 		if (this.otrSession != null) {
 			return this.otrSession;
 		} else {
-			SessionID sessionId = new SessionID(
+			SessionID sessionId = new SessionID(this.getContactJid().split("/",
-					this.getContactJid().split("/",2)[0], presence, "xmpp");
+					2)[0], presence, "xmpp");
 			this.otrSession = new SessionImpl(sessionId, getAccount()
 					.getOtrEngine(service));
 			try {

src/eu/siacs/conversations/entities/MucOptions.java

@@ -323,7 +323,8 @@ public class MucOptions {
 	}
 
 	public String getPassword() {
-		this.password = conversation.getAttribute(Conversation.ATTRIBUTE_MUC_PASSWORD);
+		this.password = conversation
+				.getAttribute(Conversation.ATTRIBUTE_MUC_PASSWORD);
 		if (this.password == null && conversation.getBookmark() != null
 				&& conversation.getBookmark().getPassword() != null) {
 			return conversation.getBookmark().getPassword();
@@ -339,7 +340,8 @@ public class MucOptions {
 		} else {
 			this.password = password;
 		}
-		conversation.setAttribute(Conversation.ATTRIBUTE_MUC_PASSWORD, password);
+		conversation
+				.setAttribute(Conversation.ATTRIBUTE_MUC_PASSWORD, password);
 	}
 
 	public boolean isPasswordChanged() {

src/eu/siacs/conversations/parser/MessageParser.java

@@ -298,7 +298,8 @@ public class MessageParser extends AbstractParser implements
 						Element password = x.findChild("password");
 						conversation.getMucOptions().setPassword(
 								password.getContent());
-						mXmppConnectionService.databaseBackend.updateConversation(conversation);
+						mXmppConnectionService.databaseBackend
+								.updateConversation(conversation);
 					}
 					mXmppConnectionService.joinMuc(conversation);
 					mXmppConnectionService.updateConversationUi();
@@ -314,7 +315,8 @@ public class MessageParser extends AbstractParser implements
 				if (!conversation.getMucOptions().online()) {
 					if (password != null) {
 						conversation.getMucOptions().setPassword(password);
-						mXmppConnectionService.databaseBackend.updateConversation(conversation);
+						mXmppConnectionService.databaseBackend
+								.updateConversation(conversation);
 					}
 					mXmppConnectionService.joinMuc(conversation);
 					mXmppConnectionService.updateConversationUi();
@@ -465,7 +467,10 @@ public class MessageParser extends AbstractParser implements
 			}
 		}
 		notify = notify && !conversation.isMuted();
-		mXmppConnectionService.notifyUi(conversation, notify);
+		if (notify) {
+			mXmppConnectionService.pushNotification(message);
+		}
+		mXmppConnectionService.updateConversationUi();
 	}
 
 	private void parseHeadline(MessagePacket packet, Account account) {

src/eu/siacs/conversations/persistance/DatabaseBackend.java

@@ -51,9 +51,9 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 				+ Conversation.ACCOUNT + " TEXT, " + Conversation.CONTACTJID
 				+ " TEXT, " + Conversation.CREATED + " NUMBER, "
 				+ Conversation.STATUS + " NUMBER, " + Conversation.MODE
-				+ " NUMBER, "+Conversation.ATTRIBUTES + " TEXT, FOREIGN KEY(" + Conversation.ACCOUNT
+				+ " NUMBER, " + Conversation.ATTRIBUTES + " TEXT, FOREIGN KEY("
-				+ ") REFERENCES " + Account.TABLENAME + "(" + Account.UUID
+				+ Conversation.ACCOUNT + ") REFERENCES " + Account.TABLENAME
-				+ ") ON DELETE CASCADE);");
+				+ "(" + Account.UUID + ") ON DELETE CASCADE);");
 		db.execSQL("create table " + Message.TABLENAME + "( " + Message.UUID
 				+ " TEXT PRIMARY KEY, " + Message.CONVERSATION + " TEXT, "
 				+ Message.TIME_SENT + " NUMBER, " + Message.COUNTERPART
@@ -228,7 +228,8 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 
 	public boolean hasEnabledAccounts() {
 		SQLiteDatabase db = this.getReadableDatabase();
-		Cursor cursor= db.rawQuery("select count("+Account.UUID+")  from "+Account.TABLENAME+" where not options & (1 <<1)", null);
+		Cursor cursor = db.rawQuery("select count(" + Account.UUID + ")  from "
+				+ Account.TABLENAME + " where not options & (1 <<1)", null);
 		cursor.moveToFirst();
 		int count = cursor.getInt(0);
 		return (count > 0);

src/eu/siacs/conversations/services/EventReceiver.java

@@ -15,7 +15,8 @@ public class EventReceiver extends BroadcastReceiver {
 		} else {
 			mIntentForService.setAction("other");
 		}
-		if (intent.getAction().equals("ui") || DatabaseBackend.getInstance(context).hasEnabledAccounts()) {
+		if (intent.getAction().equals("ui")
+				|| DatabaseBackend.getInstance(context).hasEnabledAccounts()) {
 			context.startService(mIntentForService);
 		}
 	}

src/eu/siacs/conversations/services/NotificationService.java

@@ -0,0 +1,165 @@
+package eu.siacs.conversations.services;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+
+import android.app.Notification;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.support.v4.app.NotificationCompat;
+import android.support.v4.app.TaskStackBuilder;
+import android.text.Html;
+
+import eu.siacs.conversations.R;
+import eu.siacs.conversations.entities.Conversation;
+import eu.siacs.conversations.entities.Message;
+import eu.siacs.conversations.ui.ConversationActivity;
+
+public class NotificationService {
+
+	private XmppConnectionService mXmppConnectionService;
+	private NotificationManager mNotificationManager;
+
+	private LinkedHashMap<String, ArrayList<Message>> notifications = new LinkedHashMap<String, ArrayList<Message>>();
+
+	public int NOTIFICATION_ID = 0x2342;
+
+	public NotificationService(XmppConnectionService service) {
+		this.mXmppConnectionService = service;
+		this.mNotificationManager = (NotificationManager) service
+				.getSystemService(Context.NOTIFICATION_SERVICE);
+	}
+
+	public synchronized void push(Message message) {
+		String conversationUuid = message.getConversationUuid();
+		if (notifications.containsKey(conversationUuid)) {
+			notifications.get(conversationUuid).add(message);
+		} else {
+			ArrayList<Message> mList = new ArrayList<Message>();
+			mList.add(message);
+			notifications.put(conversationUuid, mList);
+		}
+		updateNotification(true);
+	}
+
+	public void clear() {
+		notifications.clear();
+		updateNotification(false);
+	}
+
+	public void clear(Conversation conversation) {
+		notifications.remove(conversation.getUuid());
+		updateNotification(false);
+	}
+
+	private void updateNotification(boolean notify) {
+		SharedPreferences preferences = mXmppConnectionService.getPreferences();
+
+		String ringtone = preferences.getString("notification_ringtone", null);
+		boolean vibrate = preferences.getBoolean("vibrate_on_notification",
+				true);
+
+		if (notifications.size() == 0) {
+			mNotificationManager.cancel(NOTIFICATION_ID);
+		} else {
+			NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(
+					mXmppConnectionService);
+			mBuilder.setSmallIcon(R.drawable.ic_notification);
+			if (notifications.size() == 1) {
+				ArrayList<Message> messages = notifications.values().iterator()
+						.next();
+				if (messages.size() >= 1) {
+					Conversation conversation = messages.get(0)
+							.getConversation();
+					mBuilder.setLargeIcon(conversation.getImage(
+							mXmppConnectionService, 64));
+					mBuilder.setContentTitle(conversation.getName());
+					StringBuilder text = new StringBuilder();
+					for (int i = 0; i < messages.size(); ++i) {
+						text.append(messages.get(i).getReadableBody(
+								mXmppConnectionService));
+						if (i != messages.size() - 1) {
+							text.append("\n");
+						}
+					}
+					mBuilder.setStyle(new NotificationCompat.BigTextStyle()
+							.bigText(text.toString()));
+					mBuilder.setContentText(messages.get(0).getReadableBody(
+							mXmppConnectionService));
+					mBuilder.setTicker(messages.get(messages.size() - 1)
+							.getReadableBody(mXmppConnectionService));
+					mBuilder.setContentIntent(createContentIntent(conversation
+							.getUuid()));
+				} else {
+					mNotificationManager.cancel(NOTIFICATION_ID);
+					return;
+				}
+			} else {
+				NotificationCompat.InboxStyle style = new NotificationCompat.InboxStyle();
+				style.setBigContentTitle(notifications.size()
+						+ " "
+						+ mXmppConnectionService
+								.getString(R.string.unread_conversations));
+				StringBuilder names = new StringBuilder();
+				for (ArrayList<Message> messages : notifications.values()) {
+					if (messages.size() > 0) {
+						String name = messages.get(0).getConversation()
+								.getName();
+						style.addLine(Html.fromHtml("<b>"
+								+ name
+								+ "</b> "
+								+ messages.get(0).getReadableBody(
+										mXmppConnectionService)));
+						names.append(name);
+						names.append(", ");
+					}
+				}
+				if (names.length() >= 2) {
+					names.delete(names.length() - 2, names.length());
+				}
+				mBuilder.setContentTitle(notifications.size()
+						+ " "
+						+ mXmppConnectionService
+								.getString(R.string.unread_conversations));
+				mBuilder.setContentText(names.toString());
+				mBuilder.setStyle(style);
+			}
+			if (notify) {
+				if (vibrate) {
+					int dat = 70;
+					long[] pattern = { 0, 3 * dat, dat, dat };
+					mBuilder.setVibrate(pattern);
+				}
+				mBuilder.setLights(0xffffffff, 2000, 4000);
+				if (ringtone != null) {
+					mBuilder.setSound(Uri.parse(ringtone));
+				}
+			}
+			Notification notification = mBuilder.build();
+			mNotificationManager.notify(NOTIFICATION_ID, notification);
+		}
+	}
+
+	private PendingIntent createContentIntent(String conversationUuid) {
+		TaskStackBuilder stackBuilder = TaskStackBuilder
+				.create(mXmppConnectionService);
+		stackBuilder.addParentStack(ConversationActivity.class);
+
+		Intent viewConversationIntent = new Intent(mXmppConnectionService,
+				ConversationActivity.class);
+		viewConversationIntent.setAction(Intent.ACTION_VIEW);
+		viewConversationIntent.putExtra(ConversationActivity.CONVERSATION,
+				conversationUuid);
+		viewConversationIntent.setType(ConversationActivity.VIEW_CONVERSATION);
+
+		stackBuilder.addNextIntent(viewConversationIntent);
+
+		PendingIntent resultPendingIntent = stackBuilder.getPendingIntent(0,
+				PendingIntent.FLAG_UPDATE_CURRENT);
+		return resultPendingIntent;
+	}
+}

src/eu/siacs/conversations/services/XmppConnectionService.java

@@ -93,6 +93,8 @@ public class XmppConnectionService extends Service {
 
 	private MemorizingTrustManager mMemorizingTrustManager;
 
+	private NotificationService mNotificationService;
+
 	private MessageParser mMessageParser = new MessageParser(this);
 	private PresenceParser mPresenceParser = new PresenceParser(this);
 	private IqParser mIqParser = new IqParser(this);
@@ -401,6 +403,7 @@ public class XmppConnectionService extends Service {
 		this.mRandom = new SecureRandom();
 		this.mMemorizingTrustManager = new MemorizingTrustManager(
 				getApplicationContext());
+		this.mNotificationService = new NotificationService(this);
 		this.databaseBackend = DatabaseBackend
 				.getInstance(getApplicationContext());
 		this.fileBackend = new FileBackend(getApplicationContext());
@@ -1268,7 +1271,7 @@ public class XmppConnectionService extends Service {
 				}
 			}
 		}
-		notifyUi(conversation, false);
+		updateConversationUi();
 	}
 
 	public boolean renewSymmetricKey(Conversation conversation) {
@@ -1577,15 +1580,6 @@ public class XmppConnectionService extends Service {
 		return getPreferences().getBoolean("indicate_received", false);
 	}
 
-	public void notifyUi(Conversation conversation, boolean notify) {
-		if (mOnConversationUpdate != null) {
-			mOnConversationUpdate.onConversationUpdate();
-		} else {
-			UIHelper.updateNotification(getApplicationContext(),
-					getConversations(), conversation, notify);
-		}
-	}
-
 	public void updateConversationUi() {
 		if (mOnConversationUpdate != null) {
 			mOnConversationUpdate.onConversationUpdate();
@@ -1624,6 +1618,7 @@ public class XmppConnectionService extends Service {
 
 	public void markRead(Conversation conversation) {
 		conversation.markRead();
+		mNotificationService.clear(conversation);
 		String id = conversation.popLatestMarkableMessageId();
 		if (confirmMessages() && id != null) {
 			Account account = conversation.getAccount();
@@ -1758,4 +1753,8 @@ public class XmppConnectionService extends Service {
 		}
 		return contacts;
 	}
+
+	public void pushNotification(Message message) {
+		this.mNotificationService.push(message);
+	}
 }

src/eu/siacs/conversations/ui/ConversationActivity.java

@@ -167,8 +167,6 @@ public class ConversationActivity extends XmppActivity implements
 					if (!getSelectedConversation().isRead()) {
 						xmppConnectionService
 								.markRead(getSelectedConversation());
-						UIHelper.updateNotification(getApplicationContext(),
-								getConversationList(), null, false);
 						listView.invalidateViews();
 					}
 				}
@@ -297,7 +295,8 @@ public class ConversationActivity extends XmppActivity implements
 											int which) {
 										conversation
 												.setNextEncryption(Message.ENCRYPTION_NONE);
-										xmppConnectionService.databaseBackend.updateConversation(conversation);
+										xmppConnectionService.databaseBackend
+												.updateConversation(conversation);
 										selectPresenceToAttachFile(attachmentChoice);
 									}
 								});
@@ -473,7 +472,8 @@ public class ConversationActivity extends XmppActivity implements
 						conversation.setNextEncryption(Message.ENCRYPTION_NONE);
 						break;
 					}
-					xmppConnectionService.databaseBackend.updateConversation(conversation);
+					xmppConnectionService.databaseBackend
+							.updateConversation(conversation);
 					fragment.updateChatMsgHint();
 					return true;
 				}

src/eu/siacs/conversations/ui/ConversationFragment.java

@@ -381,10 +381,12 @@ public class ConversationFragment extends Fragment {
 				activity.getSlidingPaneLayout().closePane();
 				activity.getActionBar().setDisplayHomeAsUpEnabled(true);
 				activity.getActionBar().setHomeButtonEnabled(true);
-				if (conversation.getMode() == Conversation.MODE_SINGLE || activity.useSubjectToIdentifyConference()) {
+				if (conversation.getMode() == Conversation.MODE_SINGLE
+						|| activity.useSubjectToIdentifyConference()) {
 					activity.getActionBar().setTitle(conversation.getName());
 				} else {
-					activity.getActionBar().setTitle(conversation.getContactJid().split("/")[0]);
+					activity.getActionBar().setTitle(
+							conversation.getContactJid().split("/")[0]);
 				}
 				activity.invalidateOptionsMenu();
 			}
@@ -502,8 +504,6 @@ public class ConversationFragment extends Fragment {
 			updateChatMsgHint();
 			if (!activity.shouldPaneBeOpen()) {
 				activity.xmppConnectionService.markRead(conversation);
-				UIHelper.updateNotification(getActivity(),
-						activity.getConversationList(), null, false);
 				activity.updateConversationList();
 			}
 			this.updateSendButton();
@@ -668,7 +668,8 @@ public class ConversationFragment extends Fragment {
 										int which) {
 									conversation
 											.setNextEncryption(Message.ENCRYPTION_NONE);
-									xmppService.databaseBackend.updateConversation(conversation);
+									xmppService.databaseBackend
+											.updateConversation(conversation);
 									message.setEncryption(Message.ENCRYPTION_NONE);
 									xmppService.sendMessage(message);
 									messageSent();
@@ -697,7 +698,8 @@ public class ConversationFragment extends Fragment {
 									conversation
 											.setNextEncryption(Message.ENCRYPTION_NONE);
 									message.setEncryption(Message.ENCRYPTION_NONE);
-									xmppService.databaseBackend.updateConversation(conversation);
+									xmppService.databaseBackend
+											.updateConversation(conversation);
 									xmppService.sendMessage(message);
 									messageSent();
 								}

src/eu/siacs/conversations/ui/SettingsActivity.java

@@ -34,12 +34,16 @@ public class SettingsActivity extends XmppActivity implements
 		super.onStart();
 		PreferenceManager.getDefaultSharedPreferences(this)
 				.registerOnSharedPreferenceChangeListener(this);
-		ListPreference resources = (ListPreference) mSettingsFragment.findPreference("resource");
+		ListPreference resources = (ListPreference) mSettingsFragment
+				.findPreference("resource");
 		if (resources != null) {
-			ArrayList<CharSequence> entries = new ArrayList<CharSequence>(Arrays.asList(resources.getEntries()));
+			ArrayList<CharSequence> entries = new ArrayList<CharSequence>(
+					Arrays.asList(resources.getEntries()));
 			entries.add(0, Build.MODEL);
-			resources.setEntries(entries.toArray(new CharSequence[entries.size()]));
+			resources.setEntries(entries.toArray(new CharSequence[entries
-			resources.setEntryValues(entries.toArray(new CharSequence[entries.size()]));
+					.size()]));
+			resources.setEntryValues(entries.toArray(new CharSequence[entries
+					.size()]));
 		}
 	}
 

src/eu/siacs/conversations/ui/StartConversationActivity.java

@@ -536,7 +536,8 @@ public class StartConversationActivity extends XmppActivity {
 				setIntent(null);
 				return false;
 			}
-		} else if (getIntent() != null && Intent.ACTION_VIEW.equals(getIntent().getAction())) {
+		} else if (getIntent() != null
+				&& Intent.ACTION_VIEW.equals(getIntent().getAction())) {
 			Uri uri = getIntent().getData();
 			String jid = uri.getSchemeSpecificPart().split("\\?")[0];
 			return handleJid(jid);
@@ -545,8 +546,7 @@ public class StartConversationActivity extends XmppActivity {
 	}
 
 	private boolean handleJid(String jid) {
-		List<Contact> contacts = xmppConnectionService
+		List<Contact> contacts = xmppConnectionService.findContacts(jid);
-				.findContacts(jid);
 		if (contacts.size() == 0) {
 			showCreateContactDialog(jid);
 			return false;

src/eu/siacs/conversations/ui/XmppActivity.java

@@ -294,7 +294,8 @@ public abstract class XmppActivity extends Activity {
 						if (conversation != null) {
 							conversation
 									.setNextEncryption(Message.ENCRYPTION_PGP);
-							xmppConnectionService.databaseBackend.updateConversation(conversation);
+							xmppConnectionService.databaseBackend
+									.updateConversation(conversation);
 						}
 					}
 

src/eu/siacs/conversations/ui/adapter/ConversationAdapter.java

@@ -52,7 +52,8 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
 		}
 		TextView convName = (TextView) view
 				.findViewById(R.id.conversation_name);
-		if (conv.getMode() == Conversation.MODE_SINGLE || activity.useSubjectToIdentifyConference()) {
+		if (conv.getMode() == Conversation.MODE_SINGLE
+				|| activity.useSubjectToIdentifyConference()) {
 			convName.setText(conv.getName());
 		} else {
 			convName.setText(conv.getContactJid().split("/")[0]);

src/eu/siacs/conversations/utils/UIHelper.java

@@ -341,7 +341,7 @@ public class UIHelper {
 				Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 	}
 
-	public static void updateNotification(Context context,
+	private static void updateNotification(Context context,
 			List<Conversation> conversations, Conversation currentCon,
 			boolean notify) {
 		NotificationManager mNotificationManager = (NotificationManager) context

src/eu/siacs/conversations/xmpp/jingle/JingleConnection.java

@@ -88,8 +88,8 @@ public class JingleConnection implements Downloadable {
 				sendSuccess();
 				if (acceptedAutomatically) {
 					message.markUnread();
-					JingleConnection.this.mXmppConnectionService.notifyUi(
+					JingleConnection.this.mXmppConnectionService
-							message.getConversation(), true);
+							.pushNotification(message);
 				}
 				BitmapFactory.Options options = new BitmapFactory.Options();
 				options.inJustDecodeBounds = true;
@@ -319,8 +319,7 @@ public class JingleConnection implements Downloadable {
 										+ " allowed size:"
 										+ this.mJingleConnectionManager
 												.getAutoAcceptFileSize());
-						this.mXmppConnectionService
+						this.mXmppConnectionService.pushNotification(message);
-								.notifyUi(conversation, true);
 					}
 					this.file = this.mXmppConnectionService.getFileBackend()
 							.getJingleFile(message, false);