M. Dietrich
							
						 | 
						
							
							
							
							
							
								
							
							
								2acf510ea9
								
							
						 | 
						
							
							
								
								optimize string operations a bit
							
							
							
							
							
						 | 
						
							2014-09-01 10:40:45 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								1ac5be4855
								
							
						 | 
						
							
							
								
								some code cleanup
							
							
							
							
							
						 | 
						
							2014-08-31 16:28:21 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								c494f4f7ae
								
							
						 | 
						
							
							
								
								Merge branch 'sm' into development
							
							
							
							
							
							
							
							Conflicts:
	src/eu/siacs/conversations/services/XmppConnectionService.java 
							
						 | 
						
							2014-08-30 09:24:58 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								4435b0055e
								
							
						 | 
						
							
							
								
								reset unsend messages to waiting
							
							
							
							
							
						 | 
						
							2014-08-30 09:22:16 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								9075d3854d
								
							
						 | 
						
							
							
								
								properly set stanza count on session resume
							
							
							
							
							
						 | 
						
							2014-08-30 09:22:16 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								4a6a6c8403
								
							
						 | 
						
							
							
								
								basic message acking
							
							
							
							
							
						 | 
						
							2014-08-30 09:22:16 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								9de77b190b
								
							
						 | 
						
							
							
								
								proper namespaces for xep-0352
							
							
							
							
							
						 | 
						
							2014-08-30 09:22:05 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								265bd06250
								
							
						 | 
						
							
							
								
								added basic csi
							
							
							
							
							
						 | 
						
							2014-08-30 09:22:05 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								85b31b8d8b
								
							
						 | 
						
							
							
								
								fixed spelling thanks @betheg
							
							
							
							
							
						 | 
						
							2014-08-28 11:01:24 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								ee9872277d
								
							
						 | 
						
							
							
								
								removed server compat value in favor of a (small xep list)
							
							
							
							
							
						 | 
						
							2014-08-23 15:56:30 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								7808e5b77f
								
							
						 | 
						
							
							
								
								added roster versioning to calculation of server compat
							
							
							
							
							
						 | 
						
							2014-08-21 07:47:40 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								9f4043c679
								
							
						 | 
						
							
							
								
								avoid race condition for otr key in jingle
							
							
							
							
							
						 | 
						
							2014-08-21 07:39:14 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								3b79cc2f23
								
							
						 | 
						
							
							
								
								better error display and additional infos (stats) for the edit account activity
							
							
							
							
							
						 | 
						
							2014-08-19 15:06:50 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								32c3dd4f4a
								
							
						 | 
						
							
							
								
								moved add/edit account from dialog into seperate activity
							
							
							
							
							
						 | 
						
							2014-08-15 17:31:24 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								f7c747ef4b
								
							
						 | 
						
							
							
								
								better handling of null streams
							
							
							
							
							
						 | 
						
							2014-08-15 13:34:55 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								510d8a2ae3
								
							
						 | 
						
							
							
								
								another rare npe fixed
							
							
							
							
							
						 | 
						
							2014-08-14 09:59:41 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								937fc51b50
								
							
						 | 
						
							
							
								
								added warning lable if server doesn't support pubsub. refactored feature identification into seperate class
							
							
							
							
							
						 | 
						
							2014-08-09 10:20:16 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								98a80ffc61
								
							
						 | 
						
							
							
								
								save images to external storage instead of internal. this requires more permissions. fixed #150 fixed #177 fixed #333 - this might need some more polish though
							
							
							
							
							
						 | 
						
							2014-08-08 11:49:23 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								ba63727f50
								
							
						 | 
						
							
							
								
								fetch missing avatars from server
							
							
							
							
							
						 | 
						
							2014-08-05 22:58:46 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								f8b4d5f338
								
							
						 | 
						
							
							
								
								publish avatars
							
							
							
							
							
						 | 
						
							2014-08-05 01:36:17 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								daab16bdef
								
							
						 | 
						
							
							
								
								activity for future avatar publications. not working yet
							
							
							
							
							
						 | 
						
							2014-08-03 20:28:13 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								2e080401b1
								
							
						 | 
						
							
							
								
								migrated some ArrayLists to CopyOnWriteArrayLists
							
							
							
							
							
						 | 
						
							2014-07-27 18:07:04 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								29f089c954
								
							
						 | 
						
							
							
								
								fixed npe with unsuccesfull bind
							
							
							
							
							
						 | 
						
							2014-07-26 15:44:32 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								d108a5f2b6
								
							
						 | 
						
							
							
								
								removed more legacy tls error handling stuff
							
							
							
							
							
						 | 
						
							2014-07-24 01:39:46 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								deab99c997
								
							
						 | 
						
							
							
								
								removed outdated tls error
							
							
							
							
							
						 | 
						
							2014-07-24 01:37:38 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								4607e2c546
								
							
						 | 
						
							
							
								
								switched to mtm
							
							
							
							
							
						 | 
						
							2014-07-22 17:27:44 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								9968ae5260
								
							
						 | 
						
							
							
								
								refactored ui listeners a little bit
							
							
							
							
							
						 | 
						
							2014-07-12 13:42:17 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								99935dd630
								
							
						 | 
						
							
							
								
								moved most of the message/presence generation into seperate classes
							
							
							
							
							
						 | 
						
							2014-07-12 03:44:23 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								690ee4988e
								
							
						 | 
						
							
							
								
								improved iterating over hashmap
							
							
							
							
							
						 | 
						
							2014-07-11 19:48:02 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								beb82310da
								
							
						 | 
						
							
							
								
								made jingle connection array thread safe
							
							
							
							
							
						 | 
						
							2014-07-11 14:26:02 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								363682065d
								
							
						 | 
						
							
							
								
								added timeout to jingle socket
							
							
							
							
							
						 | 
						
							2014-07-03 22:55:20 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								dcb21cb9e6
								
							
						 | 
						
							
							
								
								couple of modifications for disco discovery
							
							
							
							
							
						 | 
						
							2014-06-30 11:43:00 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								d58d428874
								
							
						 | 
						
							
							
								
								more error handling for jingle connections
							
							
							
							
							
						 | 
						
							2014-06-29 13:44:59 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								eb21475658
								
							
						 | 
						
							
							
								
								removed unecessary logging
							
							
							
							
							
						 | 
						
							2014-06-25 17:07:55 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								b0a3c717d2
								
							
						 | 
						
							
							
								
								wrap wakelock release with try catch
							
							
							
							
							
						 | 
						
							2014-06-25 17:06:20 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								996bee8836
								
							
						 | 
						
							
							
								
								enabled otr encryption for ibb filetransfer as well
							
							
							
							
							
						 | 
						
							2014-06-23 16:01:51 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								c25f1283a1
								
							
						 | 
						
							
							
								
								removed warnings
							
							
							
							
							
						 | 
						
							2014-06-22 21:44:17 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								1374fed31b
								
							
						 | 
						
							
							
								
								fixed #220
							
							
							
							
							
						 | 
						
							2014-06-22 18:21:04 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								49b7c7779d
								
							
						 | 
						
							
							
								
								fixes for otr file transfer
							
							
							
							
							
						 | 
						
							2014-06-20 19:28:47 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								1cf055d2fd
								
							
						 | 
						
							
							
								
								not working version of otr file transfer
							
							
							
							
							
						 | 
						
							2014-06-20 17:30:19 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								b9477edb53
								
							
						 | 
						
							
							
								
								cleanup; removed unnecessary imports and log outputs
							
							
							
							
							
						 | 
						
							2014-06-16 12:18:04 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								a92fb88e51
								
							
						 | 
						
							
							
								
								fixed #201
							
							
							
							
							
						 | 
						
							2014-06-13 10:39:44 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								18871230e1
								
							
						 | 
						
							
							
								
								send otr messages when contacts comes online
							
							
							
							
							
						 | 
						
							2014-06-12 10:41:47 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								e353a1c109
								
							
						 | 
						
							
							
								
								made muc join easier if muc server is known. added room to key words
							
							
							
							
							
						 | 
						
							2014-06-12 09:54:19 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								7e4e7426ee
								
							
						 | 
						
							
							
								
								received and displayed messages (xep 333) are now marked properly
							
							
							
							
							
						 | 
						
							2014-06-04 18:44:15 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								cedc1f40b3
								
							
						 | 
						
							
							
								
								answer to xep 184 message receipts. fixes #95
							
							
							
							
							
						 | 
						
							2014-06-03 15:48:51 +02:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								e348afac54
								
							
						 | 
						
							
							
								
								possible fix for #149 and #142
							
							
							
							
							
						 | 
						
							2014-05-28 10:37:49 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								a0dde05ee5
								
							
						 | 
						
							
							
								
								end otr sessions earlier / more often. can lead to unesessary handshakes but can improve reliabilty
							
							
							
							
							
						 | 
						
							2014-05-23 10:54:40 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								8133dcd881
								
							
						 | 
						
							
							
								
								fixed possible npe
							
							
							
							
							
						 | 
						
							2014-05-23 10:15:58 +02:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								1db807ef58
								
							
						 | 
						
							
							
								
								write contacts on system shutdown
							
							
							
							
							
						 | 
						
							2014-05-21 22:22:36 +02:00 |