| 
							
							
								 iNPUTmice | 6a429d9939 | bumped cap version as well | 2014-12-01 11:25:47 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 8d306ac64f | clear encrypted messages on reinit | 2014-12-01 11:18:55 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 96bbd16ca5 | worked around rare npe | 2014-12-01 10:58:06 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 5992d4ac00 | fixed npe if roster jid couldnt be parsed | 2014-12-01 10:25:36 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | a4b4c13c66 | do not query service info from main server again | 2014-12-01 09:48:30 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 57fd763066 | don't request fragment before updating | 2014-11-30 22:27:11 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 52a43db6d6 | Merge pull request #721 from SamWhited/warning_fixes Warning "fixes" | 2014-11-29 19:14:13 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | d98486d1ca | fixed npe for broken bookmarks | 2014-11-29 19:09:28 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | afc673bb15 | Misc. "fixes" to correct warnings. | 2014-11-29 07:50:59 -05:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 1ff9293ee1 | fix for concurrency issue | 2014-11-29 13:09:56 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 7ba41c6a8e | fixed npe. fixed #717 | 2014-11-27 10:30:06 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 2f02d8d398 | create conversation with bare jid | 2014-11-27 10:26:53 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 0b8032dbd6 | use getAttributeAsJid method | 2014-11-27 10:26:34 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 7a75a8bc5a | Merge pull request #713 from betheg/muc MUC: do not add yourself to the muc user list. | 2014-11-24 11:53:28 +01:00 |  | 
			
				
					| 
							
							
								 Michael | 31b539daf7 | MUC: option to set/delete bookmark in conference details. | 2014-11-23 21:37:45 +01:00 |  | 
			
				
					| 
							
							
								 Michael | dbe8280662 | add an listener for the muc roster update. this is for the ConferenceDetailsActivity to show
precence updates immediately. | 2014-11-23 15:19:44 +01:00 |  | 
			
				
					| 
							
							
								 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 |  |