| 
							
							
								 Michael | bdfdc5fb10 | MUC: do not add yourself to the muc user list. | 2014-11-23 15:19:07 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 28fefad834 | work around to not confuse irc transport with real conference servers | 2014-11-21 20:34:19 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 36f8a31d7d | Merge pull request #706 from betheg/unused_imports remove unused imports. | 2014-11-21 20:03:46 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 81a1a48b8d | update action bar with conversations updates as well | 2014-11-21 20:02:13 +01:00 |  | 
			
				
					| 
							
							
								 Michael | febbefefa5 | MUC: set from when join muc. | 2014-11-21 19:37:50 +01:00 |  | 
			
				
					| 
							
							
								 Michael | dc0dba3faf | remove unused imports. | 2014-11-21 19:17:27 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 424de3ea3a | move task to back and not finish when hitting back button | 2014-11-21 18:57:27 +01:00 |  | 
			
				
					| 
							
							
								 Michael | 44faec7051 | STATUS_CODE_SELF_PRESENCE is not set in all case. | 2014-11-21 16:14:56 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 888475d4fe | additional null pointer saftey checks | 2014-11-21 15:25:57 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | de0b36fc78 | verify contacts key only on initiating side of smp | 2014-11-21 13:42:25 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 92ad4cb736 | changed listener timing and cache clearing after muc presences | 2014-11-20 22:44:31 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 66abdfccd4 | create file and dirs before creating file | 2014-11-20 22:02:32 +01:00 |  | 
			
				
					| 
							
							
								 Michael | 3e3767cb06 | change status codes string 'number' to a better readable constant. | 2014-11-20 21:37:56 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | a207240881 | fixed potential NPEs | 2014-11-20 18:42:47 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | a142dcc263 | import fixes | 2014-11-20 18:33:04 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 8b10ea676c | Merge branch 'development' of https://github.com/siacs/Conversations into development | 2014-11-20 18:20:45 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 0ad6d0616f | brought ad hoc conferences back. fixed #688 fixed #367 | 2014-11-20 18:20:42 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 73d184352e | Remove broken / unused imports | 2014-11-19 14:57:23 -05:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | e9948f6b84 | sent read marker to full jid | 2014-11-19 17:40:42 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | cbf42ee12c | some saftey checks before registering listeners in XmppActivity | 2014-11-19 17:31:28 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 66087cb360 | put error notification into notification service | 2014-11-18 15:26:28 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 1122e084a0 | simplified message merge condition | 2014-11-18 14:49:49 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 10bf2b77a8 | synchronized message list in conversation fragment | 2014-11-18 14:43:15 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | dcebc120ac | show dynamic tags in contacts activity as well | 2014-11-18 14:24:06 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | ab832bcff7 | properly remove conversations context menu | 2014-11-18 13:51:04 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | d29c861d03 | disabled broken conversations context menu | 2014-11-18 03:12:51 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 018a0c7978 | better usage of synchronized in some places | 2014-11-18 03:10:59 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 090e6ecf09 | better exception handling in XmppConnection.connect. (never return without throwing exception. use finally to release wake lock. use status.server_not_found instead of status.offline when necessary | 2014-11-18 01:48:16 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 240d2d68c8 | context menu for conversations. fixed #630 | 2014-11-18 00:07:27 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 86241a260a | clear avatar cache with new roster push from server | 2014-11-17 21:28:16 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | abbadcb58b | avoided some null pointers | 2014-11-17 20:45:00 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | f41c3eee04 | context menu for muc participants + refactor trueCounterpart to use Jid class | 2014-11-17 20:02:46 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 283d5058e5 | synchronized around cache clear in avatar service | 2014-11-17 20:01:56 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | b6d8977237 | Use `Locale.US' for string comparisons in search | 2014-11-17 12:19:45 -05:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 8865cc406c | trim search before searching | 2014-11-17 17:31:26 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 1a5af45afb | Merge branch 'development' of https://github.com/siacs/Conversations into development | 2014-11-17 17:24:56 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 252c7e68d6 | split search keywords by whitespaces and imply AND operatior | 2014-11-17 17:24:33 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 55957a77b3 | Fix linter suppression | 2014-11-17 09:19:11 -05:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 967cd922e1 | highlight muc members by touching their name in muc details. fixed #503 | 2014-11-17 01:54:01 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 2036c58cd7 | made tags searchable | 2014-11-16 23:58:30 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 8c4236b01b | fixed regression of xmpp uris not working | 2014-11-16 22:23:42 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 155b607f4d | Merge pull request #673 from SamWhited/development Fix fetching accounts by JIDs | 2014-11-16 17:35:59 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | cf00f3fade | happy hanukkah | 2014-11-16 17:21:21 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 5765a91db6 | Fix fetching accounts by JIDs Fixes a crash when publishing an avatar | 2014-11-16 10:04:45 -05:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 84b2ce10b7 | Merge branch 'development' of https://github.com/siacs/Conversations into development | 2014-11-16 12:28:21 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | ac8c2b7e62 | show full time stamp in connection established field | 2014-11-16 12:11:14 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | f18f3086af | better error checking in ssl switch over | 2014-11-16 12:00:53 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | cfdda5f8fd | Don't escape passwords in SASL Fixes #671 | 2014-11-15 21:11:14 -05:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 2067b9bd8d | made scan and show qr code more accessible in VerifyOtrActivity | 2014-11-16 02:10:29 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 2b21bc13fc | Merge branch 'master' into development | 2014-11-16 00:34:44 +01:00 |  |