|  Daniel Gultsch | b1f1a99190 | version bump to 1.6.2 and changelog | 2015-08-23 17:59:10 +02:00 | 
				
					
						|  Daniel Gultsch | 7bd0f31244 | Merge branch 'master' into development | 2015-08-23 17:57:53 +02:00 | 
				
					
						|  Daniel Gultsch | 0dfb9bd1a0 | introduce special iq type for internal timeouts. always use != result to check for error in callbacks | 2015-08-23 17:53:23 +02:00 | 
				
					
						|  Daniel Gultsch | 777dd4b51e | Merge branch 'master' into development | 2015-08-23 17:29:46 +02:00 | 
				
					
						|  Daniel Gultsch | bbfd98b726 | reformating | 2015-08-23 17:29:31 +02:00 | 
				
					
						|  Daniel Gultsch | d51c4b9655 | deal with another set of stream:features after bind | 2015-08-23 17:26:50 +02:00 | 
				
					
						|  Daniel Gultsch | b0710cdf04 | Merge branch 'master' into development | 2015-08-23 13:57:14 +02:00 | 
				
					
						|  Daniel Gultsch | bea7b2bcc1 | Merge pull request #1348 from betheg/zxing update zxing to v3.2.1 | 2015-08-23 13:36:08 +02:00 | 
				
					
						|  Daniel Gultsch | 560e63564d | added changelog for 1.6.1 | 2015-08-23 13:29:55 +02:00 | 
				
					
						|  Michael | 10a9bd3864 | update zxing to v3.2.1 | 2015-08-23 13:27:06 +02:00 | 
				
					
						|  Daniel Gultsch | 96c6c793b3 | version bump to 1.6.1 | 2015-08-23 13:25:04 +02:00 | 
				
					
						|  Andreas Straub | e1dc7f990d | Add error handling to OMEMO PEP code Log received errors and abort processing | 2015-08-23 13:23:51 +02:00 | 
				
					
						|  Michael | c0502c2165 | remove the READ_PHONE_STATE permission. | 2015-08-23 13:07:27 +02:00 | 
				
					
						|  Daniel Gultsch | 3d6fb9b21d | remove callbacks directly from iterator | 2015-08-23 10:20:29 +02:00 | 
				
					
						|  Daniel Gultsch | 1688b65965 | don't make subsequent iq request when original stanza returned an error | 2015-08-23 08:27:05 +02:00 | 
				
					
						|  Daniel Gultsch | 496f531e2e | modified clearIqCallbacks into 2-step process | 2015-08-23 08:01:47 +02:00 | 
				
					
						|  Daniel Gultsch | 06fffc13cd | Merge branch 'master' into development | 2015-08-19 13:16:59 +02:00 | 
				
					
						|  Daniel Gultsch | 7c822c9b75 | pulled translations from transifex | 2015-08-19 13:03:14 +02:00 | 
				
					
						|  Daniel Gultsch | 9e26375d2f | simulate old behaviour with messages being set to waiting while offline | 2015-08-19 13:00:52 +02:00 | 
				
					
						|  Daniel Gultsch | c9b2638778 | Merge branch 'master' into development | 2015-08-19 12:49:24 +02:00 | 
				
					
						|  Daniel Gultsch | 52f0622dd3 | fixed nasty 'stuck at sending' bug that got introduced in 32826ec29d | 2015-08-19 12:47:50 +02:00 | 
				
					
						|  Daniel Gultsch | dafcee6a5b | Merge branch 'master' into development | 2015-08-19 12:29:23 +02:00 | 
				
					
						|  Daniel Gultsch | 6e1870b00a | check if inputstream is null before cropping avatar images | 2015-08-19 12:25:17 +02:00 | 
				
					
						|  Daniel Gultsch | 9ebd6d503c | catch package manager has died exception | 2015-08-19 12:24:42 +02:00 | 
				
					
						|  Daniel Gultsch | 9edcca1045 | Merge branch 'master' into development | 2015-08-16 15:01:06 +02:00 | 
				
					
						|  Daniel Gultsch | 569bc435d3 | increased version code | 2015-08-16 15:00:27 +02:00 | 
				
					
						|  Daniel Gultsch | 5b1dda9148 | deal with broken frameworks | 2015-08-16 14:55:40 +02:00 | 
				
					
						|  Daniel Gultsch | d7b3060fc8 | catch broken base64 in avatars | 2015-08-16 14:55:24 +02:00 | 
				
					
						|  Daniel Gultsch | 51a2645349 | synchronize packetCallbacks | 2015-08-16 12:12:22 +02:00 | 
				
					
						|  Daniel Gultsch | c082066118 | catch null pointer in ScramSHA1 sasl | 2015-08-16 11:50:33 +02:00 | 
				
					
						|  Daniel Gultsch | e8e0eccd82 | version bump to 1.7.0-alpha to start new development cycle | 2015-08-15 19:26:52 +02:00 | 
				
					
						|  Daniel Gultsch | 5501502e89 | Merge branch 'depend_on_sm' into development | 2015-08-15 19:18:38 +02:00 | 
				
					
						|  Daniel Gultsch | 11fbc3d79e | version bump to 1.6.0 | 2015-08-15 19:14:09 +02:00 | 
				
					
						|  Daniel Gultsch | ecac1e5943 | Merge branch 'development' | 2015-08-15 19:12:51 +02:00 | 
				
					
						|  Andreas Straub | 6aec49f06d | Update license string with libraries | 2015-08-15 19:07:55 +02:00 | 
				
					
						|  Andreas Straub | 45d68c200e | Display error message if all contact keys purged | 2015-08-15 18:52:47 +02:00 | 
				
					
						|  Daniel Gultsch | 83e1e6468e | fully depend on sm | 2015-08-15 16:57:07 +02:00 | 
				
					
						|  Daniel Gultsch | 1f34fb742c | Merge branch 'development' | 2015-08-15 14:26:37 +02:00 | 
				
					
						|  Daniel Gultsch | 32826ec29d | provide extra interface to close sockets. fixes #1330 | 2015-08-15 14:14:33 +02:00 | 
				
					
						|  Daniel Gultsch | 75bafd573e | Merge pull request #1329 from hlad/server_info_http_upload show HTTP upload availability on Edit account screen (server info) | 2015-08-15 13:58:48 +02:00 | 
				
					
						|  hlad | 4539643f27 | show HTTP upload availability on Edit account screen | 2015-08-14 22:24:05 +02:00 | 
				
					
						|  Daniel Gultsch | 81b7e27a46 | version bump to 1.6.0-beta.2 | 2015-08-11 20:38:12 +02:00 | 
				
					
						|  Daniel Gultsch | dad90762b4 | do not touch pictures that are already in the right format fixed #522 | 2015-08-11 16:50:00 +02:00 | 
				
					
						|  Daniel Gultsch | 3677c6ec98 | use same code that is used to open files for images fixes #1323 | 2015-08-11 15:24:06 +02:00 | 
				
					
						|  Daniel Gultsch | c0dcf4a55a | changed color of 'whispered' prefix fixes #1326 | 2015-08-11 15:13:17 +02:00 | 
				
					
						|  Daniel Gultsch | fd81491b05 | put wake locks on out of band file transfers | 2015-08-10 19:48:36 +02:00 | 
				
					
						|  Daniel Gultsch | d30515a85a | report wrong file size in otr encrypted jingle file transfers to be compatible with conversations > 1.6 | 2015-08-10 12:55:37 +02:00 | 
				
					
						|  Daniel Gultsch | b5e90850d8 | provide more detailed error toasts for http file download | 2015-08-10 12:15:14 +02:00 | 
				
					
						|  Daniel Gultsch | d2ded8ad50 | Merge pull request #1324 from fiaxh/omemo_logo OMEMO logo | 2015-08-09 23:16:50 +02:00 | 
				
					
						|  fiaxh | e8bcd39166 | OMEMO logo | 2015-08-09 22:50:35 +02:00 |