610df2eddc 
								
							 
						 
						
							
							
								
								added join conference dialog  
							
							
							
						 
						
							2014-07-11 19:48:41 +02:00  
				
					
						
							
							
								 
						
							
								690ee4988e 
								
							 
						 
						
							
							
								
								improved iterating over hashmap  
							
							
							
						 
						
							2014-07-11 19:48:02 +02:00  
				
					
						
							
							
								 
						
							
								2b14ad51ec 
								
							 
						 
						
							
							
								
								fishing invites and delivery reports out of carbon copied messages  
							
							
							
						 
						
							2014-07-11 14:49:06 +02:00  
				
					
						
							
							
								 
						
							
								beb82310da 
								
							 
						 
						
							
							
								
								made jingle connection array thread safe  
							
							
							
						 
						
							2014-07-11 14:26:02 +02:00  
				
					
						
							
							
								 
						
							
								0193e0291c 
								
							 
						 
						
							
							
								
								cleanup. removed old contacts activity. WARNING: this will temporarly disable muc invites  
							
							
							
						 
						
							2014-07-11 14:07:52 +02:00  
				
					
						
							
							
								 
						
							
								f6649ef838 
								
							 
						 
						
							
							
								
								changed 'show time threshold' to 6h  
							
							
							
						 
						
							2014-07-11 13:55:29 +02:00  
				
					
						
							
							
								 
						
							
								e7a0040ec5 
								
							 
						 
						
							
							
								
								fixed   #255  and made some other improvements to the subscription mgmt  
							
							
							
						 
						
							2014-07-11 13:52:27 +02:00  
				
					
						
							
							
								 
						
							
								8ebd14cef4 
								
							 
						 
						
							
							
								
								Merge pull request  #262  from kruks23/development  
							
							... 
							
							
							
							Show time in messages previous days 
							
						 
						
							2014-07-11 13:12:25 +02:00  
				
					
						
							
							
								 
						
							
								355a6d1723 
								
							 
						 
						
							
							
								
								dirty push / delete flags are not set/reset correctly  
							
							
							
						 
						
							2014-07-10 23:49:34 +02:00  
				
					
						
							
							
								 
						
							
								a523127a80 
								
							 
						 
						
							
							
								
								fixed   #38  
							
							
							
						 
						
							2014-07-10 19:42:37 +02:00  
				
					
						
							
							
								 
						
							
								bb6e732ca1 
								
							 
						 
						
							
							
								
								Show time in messages previous days  
							
							
							
						 
						
							2014-07-10 18:04:24 +02:00  
				
					
						
							
							
								 
						
							
								8379f69516 
								
							 
						 
						
							
							
								
								Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
							
							
							
						 
						
							2014-07-10 15:13:31 +02:00  
				
					
						
							
							
								 
						
							
								e97b524455 
								
							 
						 
						
							
							
								
								added create contact dialog  
							
							
							
						 
						
							2014-07-10 13:19:42 +02:00  
				
					
						
							
							
								 
						
							
								f8763015eb 
								
							 
						 
						
							
							
								
								added contextual menu for contacts  
							
							
							
						 
						
							2014-07-10 01:55:19 +02:00  
				
					
						
							
							
								 
						
							
								2684ecda1e 
								
							 
						 
						
							
							
								
								small changes  
							
							
							
						 
						
							2014-07-10 00:53:44 +02:00  
				
					
						
							
							
								 
						
							
								203c85e114 
								
							 
						 
						
							
							
								
								made searchview text color white  
							
							
							
						 
						
							2014-07-10 00:53:44 +02:00  
				
					
						
							
							
								 
						
							
								3bdf84b6a0 
								
							 
						 
						
							
							
								
								filter contacts and starting confercenes  
							
							
							
						 
						
							2014-07-10 00:53:44 +02:00  
				
					
						
							
							
								 
						
							
								7c3f3b2a3e 
								
							 
						 
						
							
							
								
								added group add button  
							
							
							
						 
						
							2014-07-10 00:53:43 +02:00  
				
					
						
							
							
								 
						
							
								c1ee9e682a 
								
							 
						 
						
							
							
								
								added action bar menu to start conversation  
							
							
							
						 
						
							2014-07-10 00:53:43 +02:00  
				
					
						
							
							
								 
						
							
								502a1bdb9c 
								
							 
						 
						
							
							
								
								changed support lib to v13. added tabs and fragments to start conversation activity  
							
							
							
						 
						
							2014-07-10 00:53:43 +02:00  
				
					
						
							
							
								 
						
							
								9260ed4047 
								
							 
						 
						
							
							
								
								inital activity  
							
							
							
						 
						
							2014-07-10 00:53:43 +02:00  
				
					
						
							
							
								 
						
							
								c7088489bd 
								
							 
						 
						
							
							
								
								Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
							
							
							
						 
						
							2014-07-09 22:05:48 +02:00  
				
					
						
							
							
								 
						
							
								6e3e1d310a 
								
							 
						 
						
							
							
								
								unified warnings/error msgs  
							
							
							
						 
						
							2014-07-09 21:45:03 +02:00  
				
					
						
							
							
								 
						
							
								71324261e5 
								
							 
						 
						
							
							
								
								Show time in messages previous days  
							
							
							
						 
						
							2014-07-08 21:13:53 +02:00  
				
					
						
							
							
								 
						
							
								da0b426125 
								
							 
						 
						
							
							
								
								contact tiles follow material colors as well  
							
							
							
						 
						
							2014-07-08 11:42:08 +02:00  
				
					
						
							
							
								 
						
							
								d4ce42ac84 
								
							 
						 
						
							
							
								
								made account jid lowercase  
							
							
							
						 
						
							2014-07-04 16:25:02 +02:00  
				
					
						
							
							
								 
						
							
								c68777c67c 
								
							 
						 
						
							
							
								
								made contact jids lower case  
							
							
							
						 
						
							2014-07-04 16:22:19 +02:00  
				
					
						
							
							
								 
						
							
								363682065d 
								
							 
						 
						
							
							
								
								added timeout to jingle socket  
							
							
							
						 
						
							2014-07-03 22:55:20 +02:00  
				
					
						
							
							
								 
						
							
								f33d2497f8 
								
							 
						 
						
							
							
								
								more xmlpullparser fixes  
							
							
							
						 
						
							2014-07-03 22:53:18 +02:00  
				
					
						
							
							
								 
						
							
								32648ec859 
								
							 
						 
						
							
							
								
								Merge branch 'development'  
							
							
							
						 
						
							2014-07-03 11:43:06 +02:00  
				
					
						
							
							
								 
						
							
								e02ae4cde2 
								
							 
						 
						
							
							
								
								fixed array out of bounds in isMuc  
							
							
							
						 
						
							2014-07-03 11:32:54 +02:00  
				
					
						
							
							
								 
						
							
								c2af2ef812 
								
							 
						 
						
							
							
								
								enabled anti alising for tiles  
							
							
							
						 
						
							2014-07-02 10:43:36 +02:00  
				
					
						
							
							
								 
						
							
								655ce10843 
								
							 
						 
						
							
							
								
								allow state loss on fragment change  
							
							
							
						 
						
							2014-07-01 14:56:53 +02:00  
				
					
						
							
							
								 
						
							
								6028bf4ee2 
								
							 
						 
						
							
							
								
								fixed npe on rare occasion of show element in presence being null  
							
							
							
						 
						
							2014-07-01 14:53:39 +02:00  
				
					
						
							
							
								 
						
							
								2738d834b4 
								
							 
						 
						
							
							
								
								fixed   #216  
							
							
							
						 
						
							2014-07-01 13:31:14 +02:00  
				
					
						
							
							
								 
						
							
								4070c33605 
								
							 
						 
						
							
							
								
								fixed image sharing with contacts that have multiple presences  
							
							
							
						 
						
							2014-07-01 12:57:28 +02:00  
				
					
						
							
							
								 
						
							
								fcc5b3674c 
								
							 
						 
						
							
							
								
								removed old notification icon  
							
							
							
						 
						
							2014-06-30 21:07:24 +02:00  
				
					
						
							
							
								 
						
							
								c86f96e856 
								
							 
						 
						
							
							
								
								fixed rare npe in verify otr fingerprint dialog  
							
							
							
						 
						
							2014-06-30 20:29:06 +02:00  
				
					
						
							
							
								 
						
							
								121fb58d5e 
								
							 
						 
						
							
							
								
								possible fix for  #232  
							
							
							
						 
						
							2014-06-30 12:01:43 +02:00  
				
					
						
							
							
								 
						
							
								dcb21cb9e6 
								
							 
						 
						
							
							
								
								couple of modifications for disco discovery  
							
							
							
						 
						
							2014-06-30 11:43:00 +02:00  
				
					
						
							
							
								 
						
							
								9a239f6589 
								
							 
						 
						
							
							
								
								fixed   #235  
							
							
							
						 
						
							2014-06-30 10:51:46 +02:00  
				
					
						
							
							
								 
						
							
								42ad901356 
								
							 
						 
						
							
							
								
								fixed   #228  
							
							
							
						 
						
							2014-06-30 10:46:46 +02:00  
				
					
						
							
							
								 
						
							
								53533ca74e 
								
							 
						 
						
							
							
								
								added error message for  #240  
							
							
							
						 
						
							2014-06-30 10:36:21 +02:00  
				
					
						
							
							
								 
						
							
								d58d428874 
								
							 
						 
						
							
							
								
								more error handling for jingle connections  
							
							
							
						 
						
							2014-06-29 13:44:59 +02:00  
				
					
						
							
							
								 
						
							
								8eedc1a57f 
								
							 
						 
						
							
							
								
								raised ping time out  
							
							
							
						 
						
							2014-06-27 11:42:31 +02:00  
				
					
						
							
							
								 
						
							
								3a57f6df89 
								
							 
						 
						
							
							
								
								faulty otr messages now generate an error  
							
							
							
						 
						
							2014-06-26 16:42:24 +02:00  
				
					
						
							
							
								 
						
							
								3bb585c020 
								
							 
						 
						
							
							
								
								fixed rare bug with attach image menu  
							
							
							
						 
						
							2014-06-26 12:09:12 +02:00  
				
					
						
							
							
								 
						
							
								513b3959dc 
								
							 
						 
						
							
							
								
								moved some try catchs around  
							
							
							
						 
						
							2014-06-25 19:16:10 +02:00  
				
					
						
							
							
								 
						
							
								66bb5c9b51 
								
							 
						 
						
							
							
								
								more npe fixes  
							
							
							
						 
						
							2014-06-25 17:54:00 +02:00  
				
					
						
							
							
								 
						
							
								5db04a37bd 
								
							 
						 
						
							
							
								
								fixed two rare npe  
							
							
							
						 
						
							2014-06-25 17:32:58 +02:00  
				
					
						
							
							
								 
						
							
								31657974bf 
								
							 
						 
						
							
							
								
								more kxml fuck ups fixed  
							
							
							
						 
						
							2014-06-25 17:24:03 +02:00  
				
					
						
							
							
								 
						
							
								d63a9eb306 
								
							 
						 
						
							
							
								
								fixed odd occurrences of a cursor returned by the system being NULL. wtf ukas  
							
							
							
						 
						
							2014-06-25 17:21:51 +02:00  
				
					
						
							
							
								 
						
							
								16c63c91e2 
								
							 
						 
						
							
							
								
								wraped stanza writer in try catch  
							
							
							
						 
						
							2014-06-25 17:15:40 +02:00  
				
					
						
							
							
								 
						
							
								eb21475658 
								
							 
						 
						
							
							
								
								removed unecessary logging  
							
							
							
						 
						
							2014-06-25 17:07:55 +02:00  
				
					
						
							
							
								 
						
							
								b0a3c717d2 
								
							 
						 
						
							
							
								
								wrap wakelock release with try catch  
							
							
							
						 
						
							2014-06-25 17:06:20 +02:00  
				
					
						
							
							
								 
						
							
								dfbc42ecd7 
								
							 
						 
						
							
							
								
								some fixes for otr with multiple parties  
							
							
							
						 
						
							2014-06-25 16:55:47 +02:00  
				
					
						
							
							
								 
						
							
								ea261c1032 
								
							 
						 
						
							
							
								
								more otr fixes  
							
							
							
						 
						
							2014-06-24 16:14:18 +02:00  
				
					
						
							
							
								 
						
							
								6ef9421d35 
								
							 
						 
						
							
							
								
								fixes for offline otr  
							
							
							
						 
						
							2014-06-24 15:07:59 +02:00  
				
					
						
							
							
								 
						
							
								18d0e57f52 
								
							 
						 
						
							
							
								
								fixed regression with chat markers not working  
							
							
							
						 
						
							2014-06-23 23:29:26 +02:00  
				
					
						
							
							
								 
						
							
								d7656dd420 
								
							 
						 
						
							
							
								
								fix for not being able to send otr encrypted images to offline contacts. unconfirmed  
							
							
							
						 
						
							2014-06-23 21:48:48 +02:00  
				
					
						
							
							
								 
						
							
								43e276e325 
								
							 
						 
						
							
							
								
								possible better distribution of contact picture colors  
							
							
							
						 
						
							2014-06-23 21:13:58 +02:00  
				
					
						
							
							
								 
						
							
								996bee8836 
								
							 
						 
						
							
							
								
								enabled otr encryption for ibb filetransfer as well  
							
							
							
						 
						
							2014-06-23 16:01:51 +02:00  
				
					
						
							
							
								 
						
							
								c25f1283a1 
								
							 
						 
						
							
							
								
								removed warnings  
							
							
							
						 
						
							2014-06-22 21:44:17 +02:00  
				
					
						
							
							
								 
						
							
								1374fed31b 
								
							 
						 
						
							
							
								
								fixed   #220  
							
							
							
						 
						
							2014-06-22 18:21:04 +02:00  
				
					
						
							
							
								 
						
							
								fafc5306d7 
								
							 
						 
						
							
							
								
								moved message packet creation into sperate class  
							
							
							
						 
						
							2014-06-22 17:24:47 +02:00  
				
					
						
							
							
								 
						
							
								f559bd14dd 
								
							 
						 
						
							
							
								
								establish otr connection before sending image  
							
							
							
						 
						
							2014-06-22 13:57:57 +02:00  
				
					
						
							
							
								 
						
							
								49b7c7779d 
								
							 
						 
						
							
							
								
								fixes for otr file transfer  
							
							
							
						 
						
							2014-06-20 19:28:47 +02:00  
				
					
						
							
							
								 
						
							
								1cf055d2fd 
								
							 
						 
						
							
							
								
								not working version of otr file transfer  
							
							
							
						 
						
							2014-06-20 17:30:19 +02:00  
				
					
						
							
							
								 
						
							
								beafb06b6a 
								
							 
						 
						
							
							
								
								clear input field after conference pgp message  
							
							
							
						 
						
							2014-06-16 23:43:45 +02:00  
				
					
						
							
							
								 
						
							
								7e8c68b698 
								
							 
						 
						
							
							
								
								streamlined onpresenceselected listener  
							
							
							
						 
						
							2014-06-16 14:21:22 +02:00  
				
					
						
							
							
								 
						
							
								30a0be2998 
								
							 
						 
						
							
							
								
								fixed bug in intent filter. cleaned share with activity  
							
							
							
						 
						
							2014-06-16 14:06:50 +02:00  
				
					
						
							
							
								 
						
							
								0102032fc5 
								
							 
						 
						
							
							
								
								added share image intent to android manifest for testing purposes  
							
							
							
						 
						
							2014-06-16 14:06:50 +02:00  
				
					
						
							
							
								 
						
							
								41834b5e24 
								
							 
						 
						
							
							
								
								code cleanup / unification  
							
							
							
						 
						
							2014-06-16 14:06:34 +02:00  
				
					
						
							
							
								 
						
							
								b9477edb53 
								
							 
						 
						
							
							
								
								cleanup; removed unnecessary imports and log outputs  
							
							
							
						 
						
							2014-06-16 12:18:04 +02:00  
				
					
						
							
							
								 
						
							
								febf23de1f 
								
							 
						 
						
							
							
								
								Rounded minutes ago and last seen + Update Spanish Translations  
							
							
							
						 
						
							2014-06-15 18:27:20 +02:00  
				
					
						
							
							
								 
						
							
								473cef32fa 
								
							 
						 
						
							
							
								
								Send from our full jid ( fixes   #60 )  
							
							... 
							
							
							
							The problem wasn't with sending to bare jids, but rather sending
*from* bare jids, which we did unless we were OTR encrypted for
some reason. Google Talk supports the former, but (probably correctly)
rejects the latter. 
							
						 
						
							2014-06-15 05:38:15 -07:00  
				
					
						
							
							
								 
						
							
								7f1a4a6fb8 
								
							 
						 
						
							
							
								
								infite scrolling  
							
							
							
						 
						
							2014-06-14 16:59:07 +02:00  
				
					
						
							
							
								 
						
							
								7bdee8c19b 
								
							 
						 
						
							
							
								
								fixed   #197  
							
							
							
						 
						
							2014-06-14 14:27:03 +02:00  
				
					
						
							
							
								 
						
							
								471ed7838a 
								
							 
						 
						
							
							
								
								fixed   #204  
							
							
							
						 
						
							2014-06-14 10:29:26 +02:00  
				
					
						
							
							
								 
						
							
								d067448808 
								
							 
						 
						
							
							
								
								offline sending of images  
							
							
							
						 
						
							2014-06-13 18:16:14 +02:00  
				
					
						
							
							
								 
						
							
								76f3894107 
								
							 
						 
						
							
							
								
								status waiting for images sent offline  
							
							
							
						 
						
							2014-06-13 15:05:35 +02:00  
				
					
						
							
							
								 
						
							
								eb7ed78605 
								
							 
						 
						
							
							
								
								moved last seen to contact details  
							
							
							
						 
						
							2014-06-13 11:50:47 +02:00  
				
					
						
							
							
								 
						
							
								899da61555 
								
							 
						 
						
							
							
								
								further bullet proofing  
							
							
							
						 
						
							2014-06-13 11:16:52 +02:00  
				
					
						
							
							
								 
						
							
								a92fb88e51 
								
							 
						 
						
							
							
								
								fixed   #201  
							
							
							
						 
						
							2014-06-13 10:39:44 +02:00  
				
					
						
							
							
								 
						
							
								592aded106 
								
							 
						 
						
							
							
								
								finished offline otr  
							
							
							
						 
						
							2014-06-12 23:04:28 +02:00  
				
					
						
							
							
								 
						
							
								b1482212b8 
								
							 
						 
						
							
							
								
								fire onContactStatusChanged only on online/offline changes. not on status changes  
							
							
							
						 
						
							2014-06-12 18:27:50 +02:00  
				
					
						
							
							
								 
						
							
								18871230e1 
								
							 
						 
						
							
							
								
								send otr messages when contacts comes online  
							
							
							
						 
						
							2014-06-12 10:41:47 +02:00  
				
					
						
							
							
								 
						
							
								e353a1c109 
								
							 
						 
						
							
							
								
								made muc join easier if muc server is known. added room to key words  
							
							
							
						 
						
							2014-06-12 09:54:19 +02:00  
				
					
						
							
							
								 
						
							
								bb90452673 
								
							 
						 
						
							
							
								
								groundwork for offline otr messages  
							
							
							
						 
						
							2014-06-11 21:53:25 +02:00  
				
					
						
							
							
								 
						
							
								95f1a3d57d 
								
							 
						 
						
							
							
								
								select presence dialog now suggests last used presence  
							
							
							
						 
						
							2014-06-10 17:34:18 +02:00  
				
					
						
							
							
								 
						
							
								285ffa86e7 
								
							 
						 
						
							
							
								
								fixed scrolling issues  
							
							
							
						 
						
							2014-06-10 17:01:19 +02:00  
				
					
						
							
							
								 
						
							
								2eb2bac3e6 
								
							 
						 
						
							
							
								
								cleanup  
							
							
							
						 
						
							2014-06-10 14:12:11 +02:00  
				
					
						
							
							
								 
						
							
								c6ffb85d5f 
								
							 
						 
						
							
							
								
								Muc Icon tile color fix  
							
							
							
						 
						
							2014-06-10 13:19:17 +02:00  
				
					
						
							
							
								 
						
							
								28b7a6c92a 
								
							 
						 
						
							
							
								
								don't display 'enter password' message if OpenKeychain is not installed. made status messages in chat not selectable  
							
							
							
						 
						
							2014-06-09 21:25:01 +02:00  
				
					
						
							
							
								 
						
							
								794b13fcfa 
								
							 
						 
						
							
							
								
								fixing  #184  
							
							
							
						 
						
							2014-06-07 19:00:08 +02:00  
				
					
						
							
							
								 
						
							
								60d0881852 
								
							 
						 
						
							
							
								
								removed unnecessary variable in message class  
							
							
							
						 
						
							2014-06-07 14:42:17 +02:00  
				
					
						
							
							
								 
						
							
								71886ed2ab 
								
							 
						 
						
							
							
								
								localized date. rounded minutes, hours and dates in last seen  
							
							
							
						 
						
							2014-06-07 13:57:03 +02:00  
				
					
						
							
							
								 
						
							
								ea8f3a2675 
								
							 
						 
						
							
							
								
								possible fix to be able to images and encrypted messages at a faster rate  
							
							
							
						 
						
							2014-06-07 13:25:27 +02:00  
				
					
						
							
							
								 
						
							
								df7f7c5c4e 
								
							 
						 
						
							
							
								
								do not just simply resend images  
							
							
							
						 
						
							2014-06-06 20:06:06 +02:00  
				
					
						
							
							
								 
						
							
								3fd371cd53 
								
							 
						 
						
							
							
								
								fixed last_seen_now  
							
							
							
						 
						
							2014-06-06 19:39:55 +02:00