| 
							
							
								 iNPUTmice | 02a89f4ce2 | Merge branch 'feature/mam' into development Conflicts:
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 2014-12-13 13:55:24 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 2368ba518d | refactored phone contacts merger | 2014-12-13 13:52:57 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | b523518e4b | various mam improvments | 2014-12-13 12:25:52 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | f2510ae9f6 | mark otr messages as no-store for mam | 2014-12-10 14:08:06 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 1dcdc79a71 | changed lastMessageReceived into lastMessageTransmitted to account for sent messages as well. (will trigger on sm ack) | 2014-12-10 14:08:06 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | ccdb0fd971 | save server id from mam messages. check for dups before adding mam | 2014-12-10 14:08:06 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 0ab530932a | added max history age (default 1w). automatically sort newly added mam messages | 2014-12-10 14:08:06 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 4a94389f05 | very basic mam support | 2014-12-10 14:08:06 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 34558cc277 | store last message received date in conversation | 2014-12-10 14:08:06 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 2b958e51df | removed unnecessary otr error response | 2014-12-10 14:07:56 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 05d1f46c15 | recreate activity after theme has changed. fixed #764 | 2014-12-09 20:22:21 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 78370094e9 | cleanup: removed unused emoticon parsing | 2014-12-09 14:21:35 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 9d52f62767 | cleanup: removed stream compression | 2014-12-09 14:14:15 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 5acd471880 | version bump to 0.9.3 | 2014-12-07 21:42:50 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 490f40b196 | possible work around for some weird - possibly sdk - bugs | 2014-12-07 21:14:13 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 9c9e22c020 | fixed digest-md5 | 2014-12-04 12:33:56 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 2274c38726 | close cursors after querying phone db | 2014-12-03 23:29:35 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | e623e28487 | fixed #651 | 2014-12-03 17:05:37 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 46e319b241 | more safety checks for listener counts | 2014-12-03 14:55:09 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | a38005ec89 | fixed #544 | 2014-12-03 12:33:32 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 9e97529b3d | version bump to 0.9.2 | 2014-12-03 11:18:49 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 685f405154 | display proper error in edit account details if jid is invalid | 2014-12-03 10:52:55 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 8f62d95e1f | further npe checks | 2014-12-03 10:45:47 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | aaeba697bd | refactored the message adapter a bit | 2014-12-03 10:35:30 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | be358b77d6 | set nick and autojoin=true for new bookmarks | 2014-12-03 10:34:05 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | c273637156 | made muc parser more compatible with legacy mucs?! (whatever that is exactly) | 2014-12-03 01:46:26 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | feec659b08 | Make sure SASL tokenizer strips strings Fix DIGEST-MD5 auth (make sure we're not splitting on BASE64 `==') | 2014-12-02 19:33:41 -05:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 46b2760069 | worked around concurrent modification exception | 2014-12-03 00:54:07 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 4a80914603 | fixed another npe in hasBookmark | 2014-12-03 00:18:07 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 138345c5bf | Merge pull request #740 from SamWhited/jidrpfix Fix RFC 6122 implementation | 2014-12-03 00:12:36 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | eb0f8c08bd | safety net in joinMuc | 2014-12-03 00:06:57 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 39a3f372dd | clean up getProposedNick | 2014-12-03 00:06:57 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 9152e1ac95 | fixed potential npes in message parser | 2014-12-03 00:06:57 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 241de062da | cleaned up avatar / tile creation | 2014-12-03 00:06:57 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 29a7828c5f | Allow JIDs such as "example.net/@" | 2014-12-02 10:17:50 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 4f9dd82457 | "example.net/@/" should be a valid JID. Retab JID file | 2014-12-02 10:09:31 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 3fc834c067 | Fix RFC 6122 implementation JID resourceparts should be able to contain "@" and "/" characters | 2014-12-02 09:16:09 -05:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 9dd445a507 | fixed #728 | 2014-12-01 12:33:57 +01:00 |  | 
			
				
					| 
							
							
								 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 |  |