otr messages are now ignored if conversations isnt 100% sure the message is ours

res/layout/server_info.xml

@@ -81,8 +81,24 @@
         android:textSize="18sp"/>
     
     <TextView
-        android:id="@+id/features_header"
+        android:id="@+id/textView10"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_below="@+id/textView4"
+        android:text="Connected accounts"
+        android:textSize="18sp"/>
+    <TextView
+        android:id="@+id/number_presences"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBaseline="@+id/textView10"
+        android:layout_alignBottom="@+id/textView10"
+        android:layout_alignParentRight="true"
+        android:textSize="18sp"/>
+    
+    <TextView
+        android:id="@+id/features_header"
+        android:layout_below="@+id/textView10"
         style="@style/sectionHeader"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

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

@@ -60,6 +60,7 @@ public class Account  extends AbstractEntity{
 	
 	transient OtrEngine otrEngine = null;
 	transient XmppConnection xmppConnection = null;
+	transient protected Presences presences = new Presences();
 
 	private String otrFingerprint;
 	
@@ -249,4 +250,20 @@ public class Account  extends AbstractEntity{
 		this.getOtrEngine(applicationContext);
 		return this.getOtrFingerprint();
 	}
+	
+	public void updatePresence(String resource, int status) {
+		this.presences.updatePresence(resource, status);
+	}
+
+	public void removePresence(String resource) {
+		this.presences.removePresence(resource);
+	}
+	
+	public void clearPresences() {
+		this.presences = new Presences();
+	}
+
+	public int countPresences() {
+		return this.presences.size();
+	}
 }

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

@@ -8,6 +8,8 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
+import eu.siacs.conversations.xml.Element;
+
 public class Presences {
 
 	public static final int CHAT = -1;
@@ -73,4 +75,24 @@ public class Presences {
 		}
 		return presences;
 	}
+
+	public static int parseShow(Element show) {
+		if (show == null) {
+			return Presences.ONLINE;
+		} else if (show.getContent().equals("away")) {
+			return Presences.AWAY;
+		} else if (show.getContent().equals("xa")) {
+			return Presences.XA;
+		} else if (show.getContent().equals("chat")) {
+			return Presences.CHAT;
+		} else if (show.getContent().equals("dnd")) {
+			return 	Presences.DND;
+		} else {
+			return Presences.OFFLINE;
+		}
+	}
+	
+	public int size() {
+		return presences.size();
+	}
 }

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

@@ -2,6 +2,8 @@ package eu.siacs.conversations.services;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.Hashtable;
 import java.util.List;
@@ -152,18 +154,20 @@ public class XmppConnectionService extends Service {
 				if (packet.hasChild("x")) {
 					Element x = packet.findChild("x");
 					if (x.hasChild("invite")) {
-						findOrCreateConversation(account, packet.getFrom(), true);
+						findOrCreateConversation(account, packet.getFrom(),
+								true);
 						if (convChangedListener != null) {
 							convChangedListener.onConversationListChanged();
 						}
-						Log.d(LOGTAG,"invitation received to "+packet.getFrom());
+						Log.d(LOGTAG,
+								"invitation received to " + packet.getFrom());
 					}
 
 				} else {
-					//Log.d(LOGTAG, "unparsed message " + packet.toString());
+					// Log.d(LOGTAG, "unparsed message " + packet.toString());
 				}
 			}
-			if ((message == null)||(message.getBody() == null)) {
+			if ((message == null) || (message.getBody() == null)) {
 				return;
 			}
 			if (packet.hasChild("delay")) {
@@ -221,8 +225,8 @@ public class XmppConnectionService extends Service {
 			if (packet.hasChild("x")
 					&& (packet.findChild("x").getAttribute("xmlns")
 							.startsWith("http://jabber.org/protocol/muc"))) {
-				Conversation muc = findMuc(packet.getAttribute("from").split(
+				Conversation muc = findMuc(
-						"/")[0],account);
+						packet.getAttribute("from").split("/")[0], account);
 				if (muc != null) {
 					int error = muc.getMucOptions().getError();
 					muc.getMucOptions().processPacket(packet);
@@ -234,26 +238,25 @@ public class XmppConnectionService extends Service {
 				}
 			} else {
 				String[] fromParts = packet.getAttribute("from").split("/");
+				String type = packet.getAttribute("type");
+				if (fromParts[0].equals(account.getJid())) {
+					if (fromParts.length==2) {
+						if (type == null) {
+							account.updatePresence(fromParts[1],Presences.parseShow(packet.findChild("show")));
+						} else if (type.equals("unavailable")) {
+							account.removePresence(fromParts[1]);
+						}
+					}
+						
+				} else {
 					Contact contact = findContact(account, fromParts[0]);
 					if (contact == null) {
-					// most likely self or roster not synced
+						// most likely roster not synced
 						return;
 					}
-				String type = packet.getAttribute("type");
 					if (type == null) {
 						if (fromParts.length == 2) {
-						Element show = packet.findChild("show");
+							contact.updatePresence(fromParts[1], Presences.parseShow(packet.findChild("show")));
-						if (show == null) {
-							contact.updatePresence(fromParts[1], Presences.ONLINE);
-						} else if (show.getContent().equals("away")) {
-							contact.updatePresence(fromParts[1], Presences.AWAY);
-						} else if (show.getContent().equals("xa")) {
-							contact.updatePresence(fromParts[1], Presences.XA);
-						} else if (show.getContent().equals("chat")) {
-							contact.updatePresence(fromParts[1], Presences.CHAT);
-						} else if (show.getContent().equals("dnd")) {
-							contact.updatePresence(fromParts[1], Presences.DND);
-						}
 							PgpEngine pgp = getPgpEngine();
 							if (pgp != null) {
 								Element x = packet.findChild("x");
@@ -261,8 +264,9 @@ public class XmppConnectionService extends Service {
 										&& (x.getAttribute("xmlns")
 												.equals("jabber:x:signed"))) {
 									try {
-									contact.setPgpKeyId(pgp.fetchKeyId(packet
+										contact.setPgpKeyId(pgp.fetchKeyId(
-											.findChild("status").getContent(), x
+												packet.findChild("status")
+														.getContent(), x
 														.getContent()));
 									} catch (OpenPgpException e) {
 										Log.d(LOGTAG, "faulty pgp. just ignore");
@@ -271,7 +275,7 @@ public class XmppConnectionService extends Service {
 							}
 							databaseBackend.updateContact(contact);
 						} else {
-						//Log.d(LOGTAG,"presence without resource "+packet.toString());
+							// Log.d(LOGTAG,"presence without resource "+packet.toString());
 						}
 					} else if (type.equals("unavailable")) {
 						if (fromParts.length != 2) {
@@ -286,7 +290,8 @@ public class XmppConnectionService extends Service {
 							sendPresenceUpdatesTo(contact);
 							contact.setSubscriptionOption(Contact.Subscription.FROM);
 							contact.resetSubscriptionOption(Contact.Subscription.PREEMPTIVE_GRANT);
-						replaceContactInConversation(contact.getJid(), contact);
+							replaceContactInConversation(contact.getJid(),
+									contact);
 							databaseBackend.updateContact(contact);
 							if ((contact
 									.getSubscriptionOption(Contact.Subscription.ASKING))
@@ -298,11 +303,12 @@ public class XmppConnectionService extends Service {
 							// TODO: ask user to handle it maybe
 						}
 					} else {
-					//Log.d(LOGTAG, packet.toString());
+						// Log.d(LOGTAG, packet.toString());
 					}
 					replaceContactInConversation(contact.getJid(), contact);
 				}
 			}
+		}
 	};
 
 	private OnIqPacketReceived unknownIqListener = new OnIqPacketReceived() {
@@ -341,7 +347,8 @@ public class XmppConnectionService extends Service {
 
 	protected Conversation findMuc(String name, Account account) {
 		for (Conversation conversation : this.conversations) {
-			if (conversation.getContactJid().split("/")[0].equals(name)&&(conversation.getAccount() == account)) {
+			if (conversation.getContactJid().split("/")[0].equals(name)
+					&& (conversation.getAccount() == account)) {
 				return conversation;
 			}
 		}
@@ -401,7 +408,7 @@ public class XmppConnectionService extends Service {
 
 	@Override
 	public int onStartCommand(Intent intent, int flags, int startId) {
-		//Log.d(LOGTAG,"calling start service. caller was:"+intent.getAction());
+		// Log.d(LOGTAG,"calling start service. caller was:"+intent.getAction());
 		ConnectivityManager cm = (ConnectivityManager) getApplicationContext()
 				.getSystemService(Context.CONNECTIVITY_SERVICE);
 		NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
@@ -412,13 +419,13 @@ public class XmppConnectionService extends Service {
 			if (!account.isOptionSet(Account.OPTION_DISABLED)) {
 				if (!isConnected) {
 					account.setStatus(Account.STATUS_NO_INTERNET);
-					if (statusListener!=null) {
+					if (statusListener != null) {
 						statusListener.onStatusChanged(account);
 					}
 				} else {
 					if (account.getStatus() == Account.STATUS_NO_INTERNET) {
 						account.setStatus(Account.STATUS_OFFLINE);
-						if (statusListener!=null) {
+						if (statusListener != null) {
 							statusListener.onStatusChanged(account);
 						}
 					}
@@ -429,10 +436,11 @@ public class XmppConnectionService extends Service {
 						long lastSent = account.getXmppConnection().lastPingSent;
 						if (lastSent - lastReceived >= PING_TIMEOUT * 1000) {
 							Log.d(LOGTAG, account.getJid() + ": ping timeout");
-							this.reconnectAccount(account,true);
+							this.reconnectAccount(account, true);
 						} else if (SystemClock.elapsedRealtime() - lastReceived >= PING_MIN_INTERVAL * 1000) {
 							account.getXmppConnection().sendPing();
-							account.getXmppConnection().lastPingSent = SystemClock.elapsedRealtime();
+							account.getXmppConnection().lastPingSent = SystemClock
+									.elapsedRealtime();
 							this.scheduleWakeupCall(2, false);
 						}
 					} else if (account.getStatus() == Account.STATUS_OFFLINE) {
@@ -440,17 +448,27 @@ public class XmppConnectionService extends Service {
 							account.setXmppConnection(this
 									.createConnection(account));
 						}
-						account.getXmppConnection().lastPingSent = SystemClock.elapsedRealtime();
+						account.getXmppConnection().lastPingSent = SystemClock
+								.elapsedRealtime();
 						new Thread(account.getXmppConnection()).start();
-					} else if ((account.getStatus() == Account.STATUS_CONNECTING)&&((SystemClock.elapsedRealtime() - account.getXmppConnection().lastConnect) / 1000 >= CONNECT_TIMEOUT)) {
+					} else if ((account.getStatus() == Account.STATUS_CONNECTING)
-						Log.d(LOGTAG,account.getJid()+": time out during connect reconnecting");
+							&& ((SystemClock.elapsedRealtime() - account
-						reconnectAccount(account,true);
+									.getXmppConnection().lastConnect) / 1000 >= CONNECT_TIMEOUT)) {
+						Log.d(LOGTAG, account.getJid()
+								+ ": time out during connect reconnecting");
+						reconnectAccount(account, true);
 					} else {
-						Log.d(LOGTAG,"seconds since last connect:"+((SystemClock.elapsedRealtime() - account.getXmppConnection().lastConnect) / 1000));
+						Log.d(LOGTAG,
-						Log.d(LOGTAG,account.getJid()+": status="+account.getStatus());
+								"seconds since last connect:"
-						// TODO notify user of ssl cert problem or auth problem or what ever
+										+ ((SystemClock.elapsedRealtime() - account
+												.getXmppConnection().lastConnect) / 1000));
+						Log.d(LOGTAG,
+								account.getJid() + ": status="
+										+ account.getStatus());
+						// TODO notify user of ssl cert problem or auth problem
+						// or what ever
 					}
-					//in any case. reschedule wakup call
+					// in any case. reschedule wakup call
 					this.scheduleWakeupCall(PING_MAX_INTERVAL, true);
 				}
 				if (accountChangedListener != null) {
@@ -491,26 +509,27 @@ public class XmppConnectionService extends Service {
 		AlarmManager alarmManager = (AlarmManager) context
 				.getSystemService(Context.ALARM_SERVICE);
 
-		
-		
 		if (ping) {
-			if (this.pingIntent==null) {
+			if (this.pingIntent == null) {
 				this.pingIntent = new Intent(context, EventReceiver.class);
 				this.pingIntent.setAction("ping");
 				this.pingIntent.putExtra("time", timeToWake);
 				this.pendingPingIntent = PendingIntent.getBroadcast(context, 0,
 						this.pingIntent, 0);
-				alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP,timeToWake, pendingPingIntent);
+				alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP,
-				//Log.d(LOGTAG,"schedule ping in "+seconds+" seconds");
+						timeToWake, pendingPingIntent);
+				// Log.d(LOGTAG,"schedule ping in "+seconds+" seconds");
 			} else {
 				long scheduledTime = this.pingIntent.getLongExtra("time", 0);
-				if (scheduledTime<SystemClock.elapsedRealtime() || (scheduledTime > timeToWake)) {
+				if (scheduledTime < SystemClock.elapsedRealtime()
+						|| (scheduledTime > timeToWake)) {
 					this.pingIntent.putExtra("time", timeToWake);
 					alarmManager.cancel(this.pendingPingIntent);
-					this.pendingPingIntent = PendingIntent.getBroadcast(context, 0,
+					this.pendingPingIntent = PendingIntent.getBroadcast(
-							this.pingIntent, 0);
+							context, 0, this.pingIntent, 0);
-					alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP,timeToWake, pendingPingIntent);
+					alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP,
-					//Log.d(LOGTAG,"reschedule old ping to ping in "+seconds+" seconds");
+							timeToWake, pendingPingIntent);
+					// Log.d(LOGTAG,"reschedule old ping to ping in "+seconds+" seconds");
 				}
 			}
 		} else {
@@ -518,7 +537,8 @@ public class XmppConnectionService extends Service {
 			intent.setAction("ping_check");
 			PendingIntent alarmIntent = PendingIntent.getBroadcast(context, 0,
 					intent, 0);
-			alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP,timeToWake, alarmIntent);
+			alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, timeToWake,
+					alarmIntent);
 		}
 
 	}
@@ -549,6 +569,7 @@ public class XmppConnectionService extends Service {
 			@Override
 			public void onBind(Account account) {
 				databaseBackend.clearPresences(account);
+				account.clearPresences(); // self presences
 				if (account.getXmppConnection().hasFeatureRosterManagment()) {
 					updateRoster(account, null);
 				}
@@ -834,6 +855,13 @@ public class XmppConnectionService extends Service {
 				conv.setMessages(databaseBackend.getMessages(conv, 50));
 			}
 		}
+		Collections.sort(this.conversations, new Comparator<Conversation>() {
+			@Override
+			public int compare(Conversation lhs, Conversation rhs) {
+				return (int) (rhs.getLatestMessage().getTimeSent() - lhs
+						.getLatestMessage().getTimeSent());
+			}
+		});
 		return this.conversations;
 	}
 
@@ -870,7 +898,8 @@ public class XmppConnectionService extends Service {
 			} else {
 				conversation.setMode(Conversation.MODE_SINGLE);
 			}
-			conversation.setMessages(databaseBackend.getMessages(conversation, 50));
+			conversation.setMessages(databaseBackend.getMessages(conversation,
+					50));
 			this.databaseBackend.updateConversation(conversation);
 			conversation.setContact(findContact(account,
 					conversation.getContactJid()));
@@ -943,7 +972,7 @@ public class XmppConnectionService extends Service {
 
 	public void updateAccount(Account account) {
 		databaseBackend.updateAccount(account);
-		reconnectAccount(account,false);
+		reconnectAccount(account, false);
 		if (accountChangedListener != null)
 			accountChangedListener.onAccountListChangedListener();
 	}
@@ -1065,7 +1094,8 @@ public class XmppConnectionService extends Service {
 	}
 
 	public void disconnect(Account account, boolean force) {
-		if ((account.getStatus() == Account.STATUS_ONLINE)||(account.getStatus() == Account.STATUS_DISABLED)) {
+		if ((account.getStatus() == Account.STATUS_ONLINE)
+				|| (account.getStatus() == Account.STATUS_DISABLED)) {
 			if (!force) {
 				List<Conversation> conversations = getConversations();
 				for (int i = 0; i < conversations.size(); i++) {
@@ -1203,8 +1233,8 @@ public class XmppConnectionService extends Service {
 		this.tlsException = null;
 	}
 
-	//TODO dont let thread sleep but schedule wake up
+	// TODO dont let thread sleep but schedule wake up
-	public void reconnectAccount(final Account account,final boolean force) {
+	public void reconnectAccount(final Account account, final boolean force) {
 		new Thread(new Runnable() {
 
 			@Override
@@ -1218,14 +1248,14 @@ public class XmppConnectionService extends Service {
 					}
 					Thread thread = new Thread(account.getXmppConnection());
 					thread.start();
-					scheduleWakeupCall((int) (CONNECT_TIMEOUT * 1.2),false);
+					scheduleWakeupCall((int) (CONNECT_TIMEOUT * 1.2), false);
 				}
 			}
 		}).start();
 	}
 
 	public void updateConversationInGui() {
-		if (convChangedListener!=null) {
+		if (convChangedListener != null) {
 			convChangedListener.onConversationListChanged();
 		}
 	}
@@ -1247,7 +1277,7 @@ public class XmppConnectionService extends Service {
 
 	public void inviteToConference(Conversation conversation,
 			List<Contact> contacts) {
-		for(Contact contact : contacts) {
+		for (Contact contact : contacts) {
 			MessagePacket packet = new MessagePacket();
 			packet.setTo(conversation.getContactJid().split("/")[0]);
 			packet.setFrom(conversation.getAccount().getFullJid());
@@ -1257,8 +1287,9 @@ public class XmppConnectionService extends Service {
 			invite.setAttribute("to", contact.getJid());
 			x.addChild(invite);
 			packet.addChild(x);
-			Log.d(LOGTAG,packet.toString());
+			Log.d(LOGTAG, packet.toString());
-			conversation.getAccount().getXmppConnection().sendMessagePacket(packet);
+			conversation.getAccount().getXmppConnection()
+					.sendMessagePacket(packet);
 		}
 
 	}

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

@@ -1,8 +1,6 @@
 package eu.siacs.conversations.ui;
 
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 import eu.siacs.conversations.R;
@@ -62,9 +60,6 @@ public class ConversationActivity extends XmppActivity {
 		
 		@Override
 		public void onConversationListChanged() {
-			conversationList.clear();
-			conversationList.addAll(xmppConnectionService
-					.getConversations());
 			runOnUiThread(new Runnable() {
 				
 				@Override
@@ -120,18 +115,6 @@ public class ConversationActivity extends XmppActivity {
 		return paneShouldBeOpen;
 	}
 	
-	public void updateConversationList() {
-		if (conversationList.size() >= 1) {
-			Collections.sort(this.conversationList, new Comparator<Conversation>() {
-				@Override
-				public int compare(Conversation lhs, Conversation rhs) {
-					return (int) (rhs.getLatestMessage().getTimeSent() - lhs.getLatestMessage().getTimeSent());
-				}
-			});
-		}
-		this.listView.invalidateViews();
-	}
-	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 
@@ -229,7 +212,7 @@ public class ConversationActivity extends XmppActivity {
 					if (!getSelectedConversation().isRead()) {
 						getSelectedConversation().markRead();
 						UIHelper.updateNotification(getApplicationContext(), getConversationList(), null, false);
-						updateConversationList();
+						listView.invalidateViews();
 					}
 				}
 			}
@@ -434,10 +417,7 @@ public class ConversationActivity extends XmppActivity {
 		
 		this.registerListener();
 		if (conversationList.size()==0) {
-			conversationList.addAll(xmppConnectionService
+			updateConversationList();
-					.getConversations());
-			
-			this.updateConversationList();
 		}
 
 		if ((getIntent().getAction()!=null)&&(getIntent().getAction().equals(Intent.ACTION_VIEW) && (!handledViewIntent))) {
@@ -495,4 +475,11 @@ public class ConversationActivity extends XmppActivity {
 			}
 		 }
 	 }
+
+	public void updateConversationList() {
+		conversationList.clear();
+		conversationList.addAll(xmppConnectionService
+				.getConversations());
+		listView.invalidateViews();
+	}
 }

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

@@ -316,6 +316,8 @@ public class ManageAccountActivity extends XmppActivity {
 									TextView carbon = (TextView) view.findViewById(R.id.carbon);
 									TextView stream = (TextView) view.findViewById(R.id.stream);
 									TextView roster = (TextView) view.findViewById(R.id.roster);
+									TextView presences = (TextView) view.findViewById(R.id.number_presences);
+									presences.setText(selectedAccountForActionMode.countPresences()+"");
 									pcks_received.setText(""+xmpp.getReceivedStanzas());
 									pcks_sent.setText(""+xmpp.getSentStanzas());
 									if (connectionAgeHours >= 2) {

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

@@ -31,18 +31,26 @@ public class MessageParser {
 	}
 	
 	public static Message parseOtrChat(MessagePacket packet, Account account, XmppConnectionService service) {
+		boolean properlyAddressed = (packet.getTo().split("/").length == 2) || (account.countPresences() == 1);
 		String[] fromParts = packet.getFrom().split("/");
 		Conversation conversation = service.findOrCreateConversation(account, fromParts[0],false);
 		String body = packet.getBody();
 		if (!conversation.hasValidOtrSession()) {
+			if (properlyAddressed) {
 				conversation.startOtrSession(service.getApplicationContext(), fromParts[1]);
+			} else {
+				Log.d("xmppService",account.getJid()+": ignoring otr session with "+fromParts[0]);
+				return null;
+			}
 		} else {
 			String foreignPresence = conversation.getOtrSession().getSessionID().getUserID();
 			if (!foreignPresence.equals(fromParts[1])) {
-				Log.d(LOGTAG,"new otr during existing otr session requested. ending old one");
 				conversation.resetOtrSession();
-				Log.d("xmppService","starting new one with "+fromParts[1]);
+				if (properlyAddressed) {
 					conversation.startOtrSession(service.getApplicationContext(), fromParts[1]);
+				} else {
+					return null;
+				}
 			}
 		}
 		try {

src/eu/siacs/conversations/xmpp/XmppConnection.java

@@ -554,7 +554,7 @@ public class XmppConnection implements Runnable {
 				if (bindListener !=null) {
 					bindListener.onBind(account);
 				}
-				account.setStatus(Account.STATUS_ONLINE);
+				changeStatus(Account.STATUS_ONLINE);
 			}
 		});
 	}