Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f02f510c18 
							
						 
					 
					
						
						
							
							fixed bug in new ping strategy  
						
						 
						
						
						
					 
					
						2015-01-06 19:46:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							353f4e38bb 
							
						 
					 
					
						
						
							
							mark sent images as sent_received instead of sent  
						
						 
						
						... 
						
						
						
						fixed  #842  
						
					 
					
						2015-01-06 18:44:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8a3ccfd456 
							
						 
					 
					
						
						
							
							Merge pull request  #841  from BenoitBouvarel/patch-2  
						
						 
						
						... 
						
						
						
						Update strings.xml 
						
					 
					
						2015-01-06 18:33:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							562699c745 
							
						 
					 
					
						
						
							
							run invalidateOptionsMenu on uiThread  
						
						 
						
						
						
					 
					
						2015-01-06 18:26:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4b0043ba91 
							
						 
					 
					
						
						
							
							fixed potential NPEs in ShareWithActivity  
						
						 
						
						
						
					 
					
						2015-01-06 18:25:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Benoit Bouvarel 
							
						 
					 
					
						
						
						
						
							
						
						
							352af145f8 
							
						 
					 
					
						
						
							
							Update strings.xml  
						
						 
						
						... 
						
						
						
						char ">" was missing at line 285 
						
					 
					
						2015-01-06 01:23:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Benoit Bouvarel 
							
						 
					 
					
						
						
						
						
							
						
						
							f8758b7bd5 
							
						 
					 
					
						
						
							
							Update strings.xml  
						
						 
						
						... 
						
						
						
						French translation updated 
						
					 
					
						2015-01-05 23:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							777e060100 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2015-01-05 18:47:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fdcbdfdc05 
							
						 
					 
					
						
						
							
							added debug info + possible platform bug work arounds to message adapter  
						
						 
						
						
						
					 
					
						2015-01-05 18:46:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0c51245ff5 
							
						 
					 
					
						
						
							
							reworked ping scheduling strategy. very experimental  
						
						 
						
						
						
					 
					
						2015-01-05 18:45:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							85f24c9106 
							
						 
					 
					
						
						
							
							avoid requesting blocklist after stream resumption  
						
						 
						
						
						
					 
					
						2015-01-05 16:17:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Schneppe 
							
						 
					 
					
						
						
						
						
							
						
						
							47a8a39595 
							
						 
					 
					
						
						
							
							corrected German spellings  
						
						 
						
						... 
						
						
						
						and shorten some strings 
						
					 
					
						2015-01-05 15:59:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2679824770 
							
						 
					 
					
						
						
							
							prevent QR code parser from crashing  fixed   #839  
						
						 
						
						
						
					 
					
						2015-01-05 15:08:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bdb335e6b0 
							
						 
					 
					
						
						
							
							Show affiliation instead of role in MucDetails and offer 'advanced mode' to display role  
						
						 
						
						
						
					 
					
						2015-01-05 15:06:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8264474a0c 
							
						 
					 
					
						
						
							
							Merge pull request  #838  from shtrom/pebble-notifications-squash  
						
						 
						
						... 
						
						
						
						Send notification to Pebble on new message 
						
					 
					
						2015-01-05 13:14:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Olivier Mehani 
							
						 
					 
					
						
						
						
						
							
						
						
							f1ebece866 
							
						 
					 
					
						
						
							
							Send notification to Pebble on new message  
						
						 
						
						... 
						
						
						
						This implements basic notifications to the Pebble through the app (using
an intent).  This simply hooks into NotificationService.notify().
This is pretty basic, but it works (I haven't tested to see how the
intent is received when the Pebble app is not around, though). More
fancy stuff could probably be added to avoid getting flooded, but the
Pebble app already does a good job a filtering notification (e.g.,
screen on or quiet times).
Signed-off-by: Olivier Mehani <shtrom@ssji.net> 
						
					 
					
						2015-01-05 23:06:46 +11:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Christian Schneppe 
							
						 
					 
					
						
						
						
						
							
						
						
							ddee804a01 
							
						 
					 
					
						
						
							
							Updated languages for higher auto accept file sizes and changed labeling to MiB and KiB  
						
						 
						
						
						
					 
					
						2015-01-05 12:46:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2723c9ccb9 
							
						 
					 
					
						
						
							
							made checks for valid image extensions case insensitive  
						
						 
						
						
						
					 
					
						2015-01-04 23:04:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3522243835 
							
						 
					 
					
						
						
							
							do not run mam queries in findOrCreateConversation() when isn't available  
						
						 
						
						
						
					 
					
						2015-01-04 18:16:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e6cd92a663 
							
						 
					 
					
						
						
							
							added higher auto accept file sizes  
						
						 
						
						... 
						
						
						
						also changed labeling to MiB and KiB 
						
					 
					
						2015-01-04 17:53:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0d6d09b7e9 
							
						 
					 
					
						
						
							
							code cleanup + logging of spoofed iq packets  
						
						 
						
						
						
					 
					
						2015-01-04 15:40:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							88704ce5cd 
							
						 
					 
					
						
						
							
							Verify IQ responses  
						
						 
						
						... 
						
						
						
						Fixes  #20 
Move fromServer/toServer to AbstractStanza 
						
					 
					
						2015-01-04 08:28:13 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							eb7e683403 
							
						 
					 
					
						
						
							
							Make IqPacket type an enum  
						
						 
						
						
						
					 
					
						2015-01-04 08:20:30 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							00fdac42a9 
							
						 
					 
					
						
						
							
							Merge pull request  #832  from svetlemodry/development  
						
						 
						
						... 
						
						
						
						Czech translation update 
						
					 
					
						2015-01-04 12:45:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							3a4fbcd4cc 
							
						 
					 
					
						
						
							
							Czech translation update  
						
						 
						
						
						
					 
					
						2015-01-04 12:43:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5c190487bc 
							
						 
					 
					
						
						
							
							deal with prosodys muc namespace tagging of messages  
						
						 
						
						
						
					 
					
						2015-01-04 12:37:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e32a927300 
							
						 
					 
					
						
						
							
							Use packet callbacks only for IqPackets. Removed unnecessary code  
						
						 
						
						
						
					 
					
						2015-01-04 12:09:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							51f5b84ee4 
							
						 
					 
					
						
						
							
							Merge pull request  #829  from kriztan/patch-1  
						
						 
						
						... 
						
						
						
						corrected German 'private_message_to' 
						
					 
					
						2015-01-04 11:28:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergio 
							
						 
					 
					
						
						
						
						
							
						
						
							c674e9c3e9 
							
						 
					 
					
						
						
							
							Update spanish translations  
						
						 
						
						
						
					 
					
						2015-01-04 11:24:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							b739a0d200 
							
						 
					 
					
						
						
							
							corrected German 'private_message_to'  
						
						 
						
						
						
					 
					
						2015-01-04 11:16:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f338d89753 
							
						 
					 
					
						
						
							
							no longer use ConcurrentHashMap in favor of synchronize on a final HashMap  
						
						 
						
						
						
					 
					
						2015-01-04 00:14:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4f4eff2353 
							
						 
					 
					
						
						
							
							Merge branch 'development'  
						
						 
						
						
						
					 
					
						2015-01-03 22:39:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							58b7e71e58 
							
						 
					 
					
						
						
							
							Added and modified German translations  
						
						 
						
						
						
					 
					
						2015-01-03 19:35:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e89e54a04a 
							
						 
					 
					
						
						
							
							version bump to 0.10  
						
						 
						
						
						
					 
					
						2015-01-03 19:11:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fc8bd64bfd 
							
						 
					 
					
						
						
							
							void messages getting reloaded through mam after clear history  
						
						 
						
						
						
					 
					
						2015-01-03 18:22:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							be7de054be 
							
						 
					 
					
						
						
							
							record voice and attachment refactor  
						
						 
						
						
						
					 
					
						2015-01-03 16:06:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							960b7343d3 
							
						 
					 
					
						
						
							
							disable / enable all accounts  
						
						 
						
						
						
					 
					
						2015-01-03 13:36:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							521c289db1 
							
						 
					 
					
						
						
							
							update last presence only for messages  
						
						 
						
						
						
					 
					
						2015-01-03 13:01:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							715c8545f4 
							
						 
					 
					
						
						
							
							added missing layout file  
						
						 
						
						
						
					 
					
						2015-01-03 10:35:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8bda54d48c 
							
						 
					 
					
						
						
							
							code cleanup  
						
						 
						
						
						
					 
					
						2015-01-03 00:47:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							969044b113 
							
						 
					 
					
						
						
							
							migrated change password into separate activity  
						
						 
						
						
						
					 
					
						2015-01-03 00:11:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1988e244ef 
							
						 
					 
					
						
						
							
							some further otr improvements  
						
						 
						
						
						
					 
					
						2015-01-02 15:14:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f58f27a1f7 
							
						 
					 
					
						
						
							
							click on dynamic tag to filter for that tag  
						
						 
						
						
						
					 
					
						2015-01-02 14:47:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							093c5275c6 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/development' into development  
						
						 
						
						
						
					 
					
						2015-01-02 14:28:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3df23a4f75 
							
						 
					 
					
						
						
							
							allow cancellation of waiting files  
						
						 
						
						
						
					 
					
						2015-01-02 14:27:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f178f23177 
							
						 
					 
					
						
						
							
							Merge pull request  #826  from kriztan/patch-1  
						
						 
						
						... 
						
						
						
						Added German translations 
						
					 
					
						2015-01-02 12:15:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bcd3be59ce 
							
						 
					 
					
						
						
							
							put Conversations into background mode earlier  
						
						 
						
						
						
					 
					
						2015-01-02 12:04:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							eca826caf3 
							
						 
					 
					
						
						
							
							Added German translations  
						
						 
						
						
						
					 
					
						2015-01-02 09:12:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d2f454479 
							
						 
					 
					
						
						
							
							prefer PLAIN over DIGEST-MD5  
						
						 
						
						... 
						
						
						
						DIGEST-MD5 seems to be broken for a lot of cases (OpenFire)
switched priority of PLAIN to not cause any security errors 
						
					 
					
						2015-01-02 01:39:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bb3bf25523 
							
						 
					 
					
						
						
							
							fixed layout file  
						
						 
						
						
						
					 
					
						2015-01-02 01:37:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3833e6dfef 
							
						 
					 
					
						
						
							
							improved OTR verification part one  
						
						 
						
						
						
					 
					
						2015-01-02 01:21:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b71740f0d4 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/development' into development  
						
						 
						
						
						
					 
					
						2014-12-30 09:36:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8f93f9c314 
							
						 
					 
					
						
						
							
							improved fromServer filter  
						
						 
						
						
						
					 
					
						2014-12-30 09:36:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							0882da2568 
							
						 
					 
					
						
						
							
							Make `app_name' string untranslatable  
						
						 
						
						... 
						
						
						
						Remove untranslatable about message
Escape single quote in NL translation 
						
					 
					
						2014-12-29 19:38:47 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3c5d7d4f1b 
							
						 
					 
					
						
						
							
							refactor swithOverToTls stuff  
						
						 
						
						
						
					 
					
						2014-12-30 01:17:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fb8737ed9f 
							
						 
					 
					
						
						
							
							fixed npe in block menu item  
						
						 
						
						
						
					 
					
						2014-12-30 01:16:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c78dc5b494 
							
						 
					 
					
						
						
							
							fixed nl strings  
						
						 
						
						
						
					 
					
						2014-12-30 01:15:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							04de77261b 
							
						 
					 
					
						
						
							
							fixed   #818  
						
						 
						
						
						
					 
					
						2014-12-30 01:13:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5df8e6a5b3 
							
						 
					 
					
						
						
							
							Merge pull request  #812  from kriztan/patch-1  
						
						 
						
						... 
						
						
						
						Update german translations 
						
					 
					
						2014-12-30 00:22:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							55b84d0895 
							
						 
					 
					
						
						
							
							Merge pull request  #813  from plsng/translation  
						
						 
						
						... 
						
						
						
						Update Dutch translations 
						
					 
					
						2014-12-30 00:22:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d1d4e361ad 
							
						 
					 
					
						
						
							
							Merge pull request  #814  from kruks23/translation1  
						
						 
						
						... 
						
						
						
						Update spanish translations 
						
					 
					
						2014-12-30 00:22:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nathan Follens 
							
						 
					 
					
						
						
						
						
							
						
						
							800520b27b 
							
						 
					 
					
						
						
							
							Update Dutch translations  
						
						 
						
						
						
					 
					
						2014-12-29 23:08:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							b48bddb852 
							
						 
					 
					
						
						
							
							Fix typo in method name  
						
						 
						
						
						
					 
					
						2014-12-29 14:21:20 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								sergio 
							
						 
					 
					
						
						
						
						
							
						
						
							164c41661e 
							
						 
					 
					
						
						
							
							Update spanish translations  
						
						 
						
						
						
					 
					
						2014-12-27 13:04:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nathan Follens 
							
						 
					 
					
						
						
						
						
							
						
						
							4a8342a378 
							
						 
					 
					
						
						
							
							Update Dutch translations  
						
						 
						
						
						
					 
					
						2014-12-27 12:53:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							3b3d51b39a 
							
						 
					 
					
						
						
							
							Update german translations  
						
						 
						
						
						
					 
					
						2014-12-27 10:42:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							193d2645e6 
							
						 
					 
					
						
						
							
							code cleanup for change password stuff  
						
						 
						
						
						
					 
					
						2014-12-25 22:28:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0c22a8d1c6 
							
						 
					 
					
						
						
							
							added callback to change account password to notify UI on success / failure  
						
						 
						
						
						
					 
					
						2014-12-25 22:08:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e4d9dca2fe 
							
						 
					 
					
						
						
							
							Add ability to change password on server  
						
						 
						
						... 
						
						
						
						Fixes  #260  
						
					 
					
						2014-12-25 21:38:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2081c1bef7 
							
						 
					 
					
						
						
							
							proper call to invalidateViews()  
						
						 
						
						
						
					 
					
						2014-12-25 19:53:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef1f72ea27 
							
						 
					 
					
						
						
							
							catch another exception in fingerprint generation  
						
						 
						
						
						
					 
					
						2014-12-25 19:53:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							94aeca7c8a 
							
						 
					 
					
						
						
							
							Merge pull request  #810  from kriztan/patch-2  
						
						 
						
						... 
						
						
						
						Update german translations 
						
					 
					
						2014-12-25 10:23:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							3b127ab743 
							
						 
					 
					
						
						
							
							Update german translations  
						
						 
						
						
						
					 
					
						2014-12-25 09:14:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								pulser 
							
						 
					 
					
						
						
						
						
							
						
						
							3ada834839 
							
						 
					 
					
						
						
							
							Show server info option when blocking is unavailable  
						
						 
						
						... 
						
						
						
						Current head of development branch doesn't show server information if
blocking is disabled. This is due to slightly wrong logic on an if
statement. This patch ensures only the blocking option is disabled when
blocking is not supported by the server, and that the feature remains
available. 
						
					 
					
						2014-12-24 20:54:56 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							afbe727b17 
							
						 
					 
					
						
						
							
							Don't allow user to register domain only jids  
						
						 
						
						
						
					 
					
						2014-12-23 17:35:36 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							8a467e33dd 
							
						 
					 
					
						
						
							
							Don't show menu on create account screen  
						
						 
						
						
						
					 
					
						2014-12-23 17:12:52 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							d454788011 
							
						 
					 
					
						
						
							
							Remove old JID validator  
						
						 
						
						
						
					 
					
						2014-12-23 13:23:13 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							01107e31ae 
							
						 
					 
					
						
						
							
							Add more server compatibility info.  
						
						 
						
						... 
						
						
						
						Hide server info behind a checkbox.
Add XEP-0352 support to the server info list
Add XEP-0237 to server info list
Add XEP-0352 support to the server info list
Add MaM and Blocking to the account XEPs list
Also add a toggle button to hide some of the list
Rebase on current codebase
Make MAM string more descriptive
Change show more button to checkbox menu item
Shorten `MAM (History)' to `MAM'
Order XEP list and hide all by default
Supress warning (which is wrong anyways)
Change `Show more' to `Show more info' 
						
					 
					
						2014-12-23 12:44:30 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d5f99560ff 
							
						 
					 
					
						
						
							
							made method private that is no longer required to be public  
						
						 
						
						
						
					 
					
						2014-12-23 18:09:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e152ed1e07 
							
						 
					 
					
						
						
							
							Simplify roster handling code  
						
						 
						
						... 
						
						
						
						Merge result handling code into IqParser
Fixes  #20  
						
					 
					
						2014-12-22 12:53:31 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e1cb72b9ef 
							
						 
					 
					
						
						
							
							Fix NPEs in blocking code  
						
						 
						
						
						
					 
					
						2014-12-22 11:24:08 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							af7a64491f 
							
						 
					 
					
						
						
							
							Add support for XEP-0191 (Blocking command)  
						
						 
						
						... 
						
						
						
						Fixes  #791 
Squash of commits:
534f25d7dae3ce6852243e28fdd0a69ac01e9463
808fdf5147f27a912a60bee39aa4bf1ddd4f43b4
1eaf8a8330710ad35ba7c368e04f909af623ae4c
31585242c2359efdcd0eeddb9745077f54dbc9eb
2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b
e904fb5015bf3a1904ab941a1957edf3b1e7abd2
eebbadf3b3816bbf8fcccb763e419fed252d266f
7c5b87724ce494e5a6e8026557ed50a8fd9f23e8
b0eaaf446937794fe19cbdb4f8309c3ff83d4e42
8c652f9e8bb3512958d9ad8c6f1326505f2d98c8
ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f
f5d49897e0dba691ef53a0eddb9ed34d129ad442
a08fa64c505bd895b7c626cfad182380373be20b
de67079113e08394a276048c31f6b21baa300829
9069f342173ba30c2b20c67529c7ff497a6a257d
0169fa79d161ee898c4b6762e207087682a952d8
8585a5bd75a5d56927fed8317729bd15fffe4dcc
0053528a078369e0b65dcf71bda251072a1299c7
e901a9c3554bd7cca193e92919b463991eadfea7
c5c78257434813c69ab9b7558bcc8f7cbe858433
e905af348d46d77bc46b5f7211527684acc02fab
13a0f9a10c7892b0f90f5fabd2f2615701b0fd66
2cfba1e24b0139839e4453b92be7e20634d150cf
58e074fb5bb44b05a8104250fccd7c024c808c1a
0d6cf98fc8eab212d798ac79b336f9b70a14f06d
e23620f56b85bcab9f3b5d9ce1c01524cd9674dc
d72cd2fcc8d54176c3ff53411a69b9bb4642eff3
195143dff8836623a37094a6b8fa6aa01ef31580
5f5f3caf3a1e480a99d27ee5c34ba516419c52e4
1dee3d5861c9f9c710da4cbda3688d94c622ca93
23949b8aa32c78b27bab49bb3c4f3ff588925ce1
9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1 
						
					 
					
						2014-12-22 08:19:00 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1517641713 
							
						 
					 
					
						
						
							
							get rid of special self presence object and incorporate that into roster  
						
						 
						
						
						
					 
					
						2014-12-20 17:23:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ce4848f742 
							
						 
					 
					
						
						
							
							more null checks for otr fingerprints  
						
						 
						
						
						
					 
					
						2014-12-20 16:01:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							40335785aa 
							
						 
					 
					
						
						
							
							don't include empty fingerprints in list of otrfingerprints  
						
						 
						
						
						
					 
					
						2014-12-20 15:21:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6b047bed97 
							
						 
					 
					
						
						
							
							fixed another break continue bug  
						
						 
						
						
						
					 
					
						2014-12-20 12:52:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							88f43643bf 
							
						 
					 
					
						
						
							
							inject ui callback into running mam query  
						
						 
						
						
						
					 
					
						2014-12-20 12:52:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							675bac7255 
							
						 
					 
					
						
						
							
							Merge pull request  #794  from svetlemodry/development  
						
						 
						
						... 
						
						
						
						Czech image transfer string fix 
						
					 
					
						2014-12-20 12:14:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							6dd75cbb07 
							
						 
					 
					
						
						
							
							Update spanish translations  
						
						 
						
						
						
					 
					
						2014-12-20 10:54:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							c8cfd1b084 
							
						 
					 
					
						
						
							
							Czech image transfer string fix  
						
						 
						
						
						
					 
					
						2014-12-19 22:50:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a68cb5d364 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-12-19 13:40:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							627982df90 
							
						 
					 
					
						
						
							
							fixed   #755  
						
						 
						
						
						
					 
					
						2014-12-19 13:40:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							7c4a306ae4 
							
						 
					 
					
						
						
							
							Czech translation updated  
						
						 
						
						... 
						
						
						
						added missing strings 
						
					 
					
						2014-12-18 18:42:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							948112c2f3 
							
						 
					 
					
						
						
							
							Update german translations  
						
						 
						
						
						
					 
					
						2014-12-18 12:10:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f00e168752 
							
						 
					 
					
						
						
							
							clean up conversation history after swtiching to a different conversation  
						
						 
						
						
						
					 
					
						2014-12-17 21:05:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							de952cc959 
							
						 
					 
					
						
						
							
							show error if jid couldn't be parsed in new contact dialog  
						
						 
						
						
						
					 
					
						2014-12-17 21:04:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c30108eb17 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-12-17 10:51:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							741a0c129d 
							
						 
					 
					
						
						
							
							made scroling smoother + bug fixes for history loading  
						
						 
						
						
						
					 
					
						2014-12-17 10:50:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							80435eca5c 
							
						 
					 
					
						
						
							
							smoothed out scrolling a bit  
						
						 
						
						
						
					 
					
						2014-12-17 09:32:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5603440a91 
							
						 
					 
					
						
						
							
							Merge pull request  #783  from SamWhited/quiet-hours  
						
						 
						
						... 
						
						
						
						Update summary in TimePreference change listener 
						
					 
					
						2014-12-17 07:15:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1a7ed4ed7c 
							
						 
					 
					
						
						
							
							properly detect images in share with  
						
						 
						
						
						
					 
					
						2014-12-17 07:12:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fd4cf499a2 
							
						 
					 
					
						
						
							
							Merge branch 'issue756' of  https://github.com/SamWhited/Conversations  into SamWhited-issue756  
						
						 
						
						
						
					 
					
						2014-12-17 07:00:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3f6638cb64 
							
						 
					 
					
						
						
							
							properly count mam messages  
						
						 
						
						
						
					 
					
						2014-12-17 06:59:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							0b4987581f 
							
						 
					 
					
						
						
							
							Handle time comparisons using longs  
						
						 
						
						
						
					 
					
						2014-12-16 18:03:16 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							6659339eff 
							
						 
					 
					
						
						
							
							Allow sending of any filetype via intent  
						
						 
						
						... 
						
						
						
						Fixes  #756  
						
					 
					
						2014-12-15 22:31:55 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							f9c783085d 
							
						 
					 
					
						
						
							
							Update summary in TimePreference change listener  
						
						 
						
						... 
						
						
						
						Ensures the summary is updated even if we change the time preference
programatically; also allows other places to stop the summary from being
updated by setting a new listener. 
						
					 
					
						2014-12-15 17:46:32 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e2f50ab855 
							
						 
					 
					
						
						
							
							go through mam history page by page. load mam dynamically on scroll  
						
						 
						
						
						
					 
					
						2014-12-15 23:06:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							03ca971e2e 
							
						 
					 
					
						
						
							
							Merge pull request  #782  from SamWhited/quiet-hours  
						
						 
						
						... 
						
						
						
						Make some magic number constants final 
						
					 
					
						2014-12-15 19:28:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							ea61142d7e 
							
						 
					 
					
						
						
							
							Make some magic number constants final  
						
						 
						
						
						
					 
					
						2014-12-15 11:39:18 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ab2187dbdf 
							
						 
					 
					
						
						
							
							fixed crashing on unparsed jids  
						
						 
						
						
						
					 
					
						2014-12-15 17:36:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							183e31ade1 
							
						 
					 
					
						
						
							
							Merge branch 'quiet-hours' of  https://github.com/SamWhited/Conversations  into SamWhited-quiet-hours  
						
						 
						
						
						
					 
					
						2014-12-15 17:35:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e084266595 
							
						 
					 
					
						
						
							
							migrated more jid parsing to use getAttributeAsJid. added error logging  
						
						 
						
						
						
					 
					
						2014-12-15 17:29:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							af0f8e87bb 
							
						 
					 
					
						
						
							
							Make silent notification when quiet hours are on  
						
						 
						
						... 
						
						
						
						Notify, just don't play a sound or vibrate
Also make the Java annoyingly verbose... I can't help myself... ahh! 
						
					 
					
						2014-12-15 11:23:50 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							25d8546ae8 
							
						 
					 
					
						
						
							
							Merge branch 'quiet-hours' of  https://github.com/SamWhited/Conversations  into SamWhited-quiet-hours  
						
						 
						
						
						
					 
					
						2014-12-15 17:16:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2bd4621245 
							
						 
					 
					
						
						
							
							fixed history deletion.  fixed   #780  
						
						 
						
						
						
					 
					
						2014-12-15 17:14:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a6cfbf2f2d 
							
						 
					 
					
						
						
							
							Merge pull request  #775  from kruks23/translation1  
						
						 
						
						... 
						
						
						
						Update spanish translations. 
						
					 
					
						2014-12-15 16:57:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							16360242d1 
							
						 
					 
					
						
						
							
							Merge pull request  #781  from drizzt/patch-1  
						
						 
						
						... 
						
						
						
						fixed typo in italian translation 
						
					 
					
						2014-12-15 16:57:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							209e62d68b 
							
						 
					 
					
						
						
							
							avoid npe on weird platform bugs  
						
						 
						
						
						
					 
					
						2014-12-15 16:55:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								drizzt 
							
						 
					 
					
						
						
						
						
							
						
						
							9f6537acdc 
							
						 
					 
					
						
						
							
							fixed typo in italian translation  
						
						 
						
						... 
						
						
						
						s/gallaria/galleria/ 
						
					 
					
						2014-12-15 14:19:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f8a496a5f1 
							
						 
					 
					
						
						
							
							run mam queries only when online  
						
						 
						
						
						
					 
					
						2014-12-14 23:23:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							a6d4b0aec5 
							
						 
					 
					
						
						
							
							Add quiet hours feature  
						
						 
						
						
						
					 
					
						2014-12-14 15:07:41 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5cbae25808 
							
						 
					 
					
						
						
							
							more patches for dns helper  
						
						 
						
						
						
					 
					
						2014-12-14 19:02:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							50410dad33 
							
						 
					 
					
						
						
							
							possible dns fixes  
						
						 
						
						
						
					 
					
						2014-12-14 18:31:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							de06cb38d1 
							
						 
					 
					
						
						
							
							refactored the way certain messages are being found within a conversation  
						
						 
						
						
						
					 
					
						2014-12-14 18:10:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fc293aaede 
							
						 
					 
					
						
						
							
							avoiding concurrent modification  
						
						 
						
						
						
					 
					
						2014-12-13 22:17:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6148f04d7b 
							
						 
					 
					
						
						
							
							fixed regression  
						
						 
						
						
						
					 
					
						2014-12-13 20:05:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							899802646c 
							
						 
					 
					
						
						
							
							reverse through mam history when loading larger chuncks  
						
						 
						
						
						
					 
					
						2014-12-13 15:32:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							1ffdae80a6 
							
						 
					 
					
						
						
							
							Update spanish translations.  
						
						 
						
						
						
					 
					
						2014-12-13 13:24:17 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ae3bd9c9e9 
							
						 
					 
					
						
						
							
							Merge pull request  #767  from kruks23/translation3  
						
						 
						
						... 
						
						
						
						Update spanish translations. 
						
					 
					
						2014-12-09 20:16:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							920067b8ed 
							
						 
					 
					
						
						
							
							Update spanish translations.  
						
						 
						
						
						
					 
					
						2014-12-09 18:33:13 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c0e997e007 
							
						 
					 
					
						
						
							
							Merge pull request  #743  from weiss/update-german-translations  
						
						 
						
						... 
						
						
						
						Update/improve German translations 
						
					 
					
						2014-12-03 00:11:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							53aaaf68d5 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-12-03 00:07:41 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Holger Weiß 
							
						 
					 
					
						
						
						
						
							
						
						
							b5b6589b44 
							
						 
					 
					
						
						
							
							Update/improve German translations  
						
						 
						
						
						
					 
					
						2014-12-02 18:02:17 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							59402da60d 
							
						 
					 
					
						
						
							
							Merge pull request  #737  from kruks23/translation2  
						
						 
						
						... 
						
						
						
						Update spanish translations 
						
					 
					
						2014-12-02 00:31:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							85d5326c32 
							
						 
					 
					
						
						
							
							Merge pull request  #730  from svetlemodry/development  
						
						 
						
						... 
						
						
						
						Updated Czech translation file 
						
					 
					
						2014-12-02 00:31:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							2a2679cfec 
							
						 
					 
					
						
						
							
							Update spanish translations  
						
						 
						
						
						
					 
					
						2014-12-01 23:16:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							2f34f93c3a 
							
						 
					 
					
						
						
							
							pref_about_message string deleted  
						
						 
						
						
						
					 
					
						2014-12-01 21:42:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							59a112ebfe 
							
						 
					 
					
						
						
							
							Updated Czech translation file  
						
						 
						
						... 
						
						
						
						added missing strings
fixing typos, improvements for better understanding 
						
					 
					
						2014-12-01 16:46:17 +01: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 
							
						 
					 
					
						
						
						
						
							
						
						
							21f77cd1e3 
							
						 
					 
					
						
						
							
							fixed italian translation  
						
						 
						
						
						
					 
					
						2014-12-01 09:59:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							99e3fb814d 
							
						 
					 
					
						
						
							
							Merge pull request  #726  from Elinvention/development  
						
						 
						
						... 
						
						
						
						Update Italian translations 
						
					 
					
						2014-12-01 09:51:19 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elinvention 
							
						 
					 
					
						
						
						
						
							
						
						
							e039c8de25 
							
						 
					 
					
						
						
							
							Removed pref_about_message which is not translatable  
						
						 
						
						
						
					 
					
						2014-11-30 21:51:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Elinvention 
							
						 
					 
					
						
						
						
						
							
						
						
							6b772f4141 
							
						 
					 
					
						
						
							
							Added missing italian translations with some minor fixes to existing ones  
						
						 
						
						
						
					 
					
						2014-11-30 21:16:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							52a43db6d6 
							
						 
					 
					
						
						
							
							Merge pull request  #721  from SamWhited/warning_fixes  
						
						 
						
						... 
						
						
						
						Warning "fixes" 
						
					 
					
						2014-11-29 19:14:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							acf446a02c 
							
						 
					 
					
						
						
							
							Merge pull request  #718  from beriain/development  
						
						 
						
						... 
						
						
						
						Update basque translation 
						
					 
					
						2014-11-29 19:13:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d98486d1ca 
							
						 
					 
					
						
						
							
							fixed npe for broken bookmarks  
						
						 
						
						
						
					 
					
						2014-11-29 19:09:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e43ac27e8f 
							
						 
					 
					
						
						
							
							Accessibility: Add missing image descriptions  
						
						 
						
						
						
					 
					
						2014-11-29 08:03:35 -05: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Aitor Beriain 
							
						 
					 
					
						
						
						
						
							
						
						
							d9182fe81c 
							
						 
					 
					
						
						
							
							Update basque translation  
						
						 
						
						
						
					 
					
						2014-11-27 18:33:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3d8a2e7923 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-11-27 10:30:27 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							e1e28e9ef6 
							
						 
					 
					
						
						
							
							Update german translations  
						
						 
						
						... 
						
						
						
						modified translations a bit 
						
					 
					
						2014-11-26 11:39:40 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6f21dc84d5 
							
						 
					 
					
						
						
							
							Merge pull request  #714  from betheg/muc_bookmark_cd  
						
						 
						
						... 
						
						
						
						MUC: option to set/delete bookmark in conference details. 
						
					 
					
						2014-11-24 09:31:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							31b539daf7 
							
						 
					 
					
						
						
							
							MUC: option to set/delete bookmark in conference details.  
						
						 
						
						
						
					 
					
						2014-11-23 21:37:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							4d841587c8 
							
						 
					 
					
						
						
							
							Update german translations  
						
						 
						
						
						
					 
					
						2014-11-23 15:21:12 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							ca761bac3c 
							
						 
					 
					
						
						
							
							Update spanish translations  
						
						 
						
						
						
					 
					
						2014-11-22 00:37:41 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8fe3b2974b 
							
						 
					 
					
						
						
							
							Merge pull request  #698  from kriztan/patch-1  
						
						 
						
						... 
						
						
						
						Update german translations 
						
					 
					
						2014-11-20 21:47:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							3e3767cb06 
							
						 
					 
					
						
						
							
							change status codes string 'number' to a better readable constant.  
						
						 
						
						
						
					 
					
						2014-11-20 21:37:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							13bb46d550 
							
						 
					 
					
						
						
							
							Update german translations  
						
						 
						
						
						
					 
					
						2014-11-20 19:20:49 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4b9a507633 
							
						 
					 
					
						
						
							
							Merge pull request  #691  from kruks23/development  
						
						 
						
						... 
						
						
						
						Update spanish translation 
						
					 
					
						2014-11-19 17:22:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							393807ab2d 
							
						 
					 
					
						
						
							
							Merge pull request  #692  from kriztan/patch-3  
						
						 
						
						... 
						
						
						
						Update german translations 
						
					 
					
						2014-11-19 17:22:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Aitor Beriain 
							
						 
					 
					
						
						
						
						
							
						
						
							24b5d0eb26 
							
						 
					 
					
						
						
							
							Update basque translation  
						
						 
						
						
						
					 
					
						2014-11-19 16:12:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							6847594363 
							
						 
					 
					
						
						
							
							Update german translations  
						
						 
						
						
						
					 
					
						2014-11-19 08:51:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							3ccee22c86 
							
						 
					 
					
						
						
							
							Update spanish translations  
						
						 
						
						
						
					 
					
						2014-11-19 00:16:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							8f33f3540a 
							
						 
					 
					
						
						
							
							Update spanish translations  
						
						 
						
						
						
					 
					
						2014-11-18 23:53:37 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							d2a4855a1e 
							
						 
					 
					
						
						
							
							added rendered versions of new icons  
						
						 
						
						
						
					 
					
						2014-11-18 00:42:19 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c058594ff5 
							
						 
					 
					
						
						
							
							Merge pull request  #681  from SamWhited/searchlocalefix  
						
						 
						
						... 
						
						
						
						Use `Locale.US' for string comparisons in search 
						
					 
					
						2014-11-17 18:27:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							b6d8977237 
							
						 
					 
					
						
						
							
							Use `Locale.US' for string comparisons in search  
						
						 
						
						
						
					 
					
						2014-11-17 12:19:45 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e664a0c936 
							
						 
					 
					
						
						
							
							Merge pull request  #680  from ferdev1/patch-2  
						
						 
						
						... 
						
						
						
						Fix string 2 
						
					 
					
						2014-11-17 18:14:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8865cc406c 
							
						 
					 
					
						
						
							
							trim search before searching  
						
						 
						
						
						
					 
					
						2014-11-17 17:31:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1a5af45afb 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-11-17 17:24:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							252c7e68d6 
							
						 
					 
					
						
						
							
							split search keywords by whitespaces and imply AND operatior  
						
						 
						
						
						
					 
					
						2014-11-17 17:24:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e30e84c819 
							
						 
					 
					
						
						
							
							slightly modified logo / launcher icon  
						
						 
						
						
						
					 
					
						2014-11-17 17:23:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ferdev1 
							
						 
					 
					
						
						
						
						
							
						
						
							6c13b8a9a1 
							
						 
					 
					
						
						
							
							Update strings.xml  
						
						 
						
						
						
					 
					
						2014-11-17 17:13:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							55957a77b3 
							
						 
					 
					
						
						
							
							Fix linter suppression  
						
						 
						
						
						
					 
					
						2014-11-17 09:19:11 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ceecc8ffe7 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-11-17 01:54:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							967cd922e1 
							
						 
					 
					
						
						
							
							highlight muc members by touching their name in muc details.  fixed   #503  
						
						 
						
						
						
					 
					
						2014-11-17 01:54:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							81b93c763a 
							
						 
					 
					
						
						
							
							Merge pull request  #675  from ferdev1/patch-1  
						
						 
						
						... 
						
						
						
						Fix string 
						
					 
					
						2014-11-17 00:04:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2036c58cd7 
							
						 
					 
					
						
						
							
							made tags searchable  
						
						 
						
						
						
					 
					
						2014-11-16 23:58:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8c4236b01b 
							
						 
					 
					
						
						
							
							fixed regression of xmpp uris not working  
						
						 
						
						
						
					 
					
						2014-11-16 22:23:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ferdev1 
							
						 
					 
					
						
						
						
						
							
						
						
							c147f44cf1 
							
						 
					 
					
						
						
							
							Fix string  
						
						 
						
						
						
					 
					
						2014-11-16 18:11:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							155b607f4d 
							
						 
					 
					
						
						
							
							Merge pull request  #673  from SamWhited/development  
						
						 
						
						... 
						
						
						
						Fix fetching accounts by JIDs 
						
					 
					
						2014-11-16 17:35:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cf00f3fade 
							
						 
					 
					
						
						
							
							happy hanukkah  
						
						 
						
						
						
					 
					
						2014-11-16 17:21:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							5765a91db6 
							
						 
					 
					
						
						
							
							Fix fetching accounts by JIDs  
						
						 
						
						... 
						
						
						
						Fixes a crash when publishing an avatar 
						
					 
					
						2014-11-16 10:04:45 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							84b2ce10b7 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-11-16 12:28:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ac8c2b7e62 
							
						 
					 
					
						
						
							
							show full time stamp in connection established field  
						
						 
						
						
						
					 
					
						2014-11-16 12:11:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f18f3086af 
							
						 
					 
					
						
						
							
							better error checking in ssl switch over  
						
						 
						
						
						
					 
					
						2014-11-16 12:00:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							cfdda5f8fd 
							
						 
					 
					
						
						
							
							Don't escape passwords in SASL  
						
						 
						
						... 
						
						
						
						Fixes  #671  
						
					 
					
						2014-11-15 21:11:14 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2067b9bd8d 
							
						 
					 
					
						
						
							
							made scan and show qr code more accessible in VerifyOtrActivity  
						
						 
						
						
						
					 
					
						2014-11-16 02:10:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2b21bc13fc 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						
						
					 
					
						2014-11-16 00:34:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ac4eabbd22 
							
						 
					 
					
						
						
							
							close cursor for database  
						
						 
						
						
						
					 
					
						2014-11-16 00:34:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							88c3537b68 
							
						 
					 
					
						
						
							
							parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareable uri where ever possible  
						
						 
						
						
						
					 
					
						2014-11-16 00:20:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0fb1772f18 
							
						 
					 
					
						
						
							
							Merge pull request  #669  from SamWhited/scramcaching  
						
						 
						
						... 
						
						
						
						Cache SCRAM-SHA-1 keys for current session 
						
					 
					
						2014-11-15 21:02:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4a8fa8b498 
							
						 
					 
					
						
						
							
							Merge pull request  #670  from kruks23/translation9  
						
						 
						
						... 
						
						
						
						Update Spanish Translations 
						
					 
					
						2014-11-15 21:00:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5a634fdf47 
							
						 
					 
					
						
						
							
							small modifications for changing an account status in XmppConnection  
						
						 
						
						
						
					 
					
						2014-11-15 20:54:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							0dc711d710 
							
						 
					 
					
						
						
							
							Update Spanish Translations  
						
						 
						
						
						
					 
					
						2014-11-15 20:48:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							a463f82e3b 
							
						 
					 
					
						
						
							
							Cache SCRAM-SHA-1 keys for current session  
						
						 
						
						
						
					 
					
						2014-11-15 12:57:36 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							69ab8a2adb 
							
						 
					 
					
						
						
							
							Merge pull request  #668  from SamWhited/auth-pinning  
						
						 
						
						... 
						
						
						
						Auth mechanism pinning 
						
					 
					
						2014-11-15 17:44:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							17cec63c14 
							
						 
					 
					
						
						
							
							Set security error status on TLS cert mismatch  
						
						 
						
						
						
					 
					
						2014-11-15 11:40:41 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							d2388a5a7e 
							
						 
					 
					
						
						
							
							Remove extra status wrapper method  
						
						 
						
						
						
					 
					
						2014-11-15 11:31:15 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							251f4d6d7f 
							
						 
					 
					
						
						
							
							Add incompatible server status  
						
						 
						
						
						
					 
					
						2014-11-15 11:29:58 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7ba9854c22 
							
						 
					 
					
						
						
							
							fixed some disco / carbon related bugs  
						
						 
						
						
						
					 
					
						2014-11-15 17:24:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							c09d450db8 
							
						 
					 
					
						
						
							
							Add security error status  
						
						 
						
						
						
					 
					
						2014-11-15 11:21:47 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							d94b07c916 
							
						 
					 
					
						
						
							
							Make account status an enum  
						
						 
						
						
						
					 
					
						2014-11-15 11:12:41 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							847877f9d2 
							
						 
					 
					
						
						
							
							Add auth method pinning  
						
						 
						
						
						
					 
					
						2014-11-15 10:01:08 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							35bf13f5ef 
							
						 
					 
					
						
						
							
							Merge branch 'feature/file_transfer' into development  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/main/res/values/strings.xml 
						
					 
					
						2014-11-15 15:52:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							07b07115d6 
							
						 
					 
					
						
						
							
							Merge branch 'feature/foreground_service' into development  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/main/res/values/strings.xml 
						
					 
					
						2014-11-15 15:51:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5b9c690c47 
							
						 
					 
					
						
						
							
							Merge branch 'feature/otr_verification' into development  
						
						 
						
						
						
					 
					
						2014-11-15 15:50:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4c504dea7a 
							
						 
					 
					
						
						
							
							Merge pull request  #665  from SamWhited/issue71  
						
						 
						
						... 
						
						
						
						Add SCRAM-SHA1 support 
						
					 
					
						2014-11-15 15:34:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							bdc86bb8e3 
							
						 
					 
					
						
						
							
							added low priority and removed date in foreground noticfication  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3c6b3506e3 
							
						 
					 
					
						
						
							
							turn on foreground service in expert settings  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							41f7848f2c 
							
						 
					 
					
						
						
							
							handled more error cases  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ca2d86cf87 
							
						 
					 
					
						
						
							
							better cleanup after unsuccesful transfers  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							47d44448f3 
							
						 
					 
					
						
						
							
							fixed description in notifications and conversation overview  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e0f012dba1 
							
						 
					 
					
						
						
							
							fixed resending for files as well  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cc4f3702a8 
							
						 
					 
					
						
						
							
							made file transfers cancelable  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4ab558715c 
							
						 
					 
					
						
						
							
							adepted conversationadapter to deal with files  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							af2922adea 
							
						 
					 
					
						
						
							
							progress for ibb transfers  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e7a70a46e0 
							
						 
					 
					
						
						
							
							some mime and pgp fixes for file transfer  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							16847a30c8 
							
						 
					 
					
						
						
							
							support for pgp files  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c7acfe85c3 
							
						 
					 
					
						
						
							
							progress for http images as well. fixed open button for sent files  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dac12be53e 
							
						 
					 
					
						
						
							
							copy non local files to private storage first  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							02cbda68a7 
							
						 
					 
					
						
						
							
							bug fixes and various improvements for file transfer  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7a90ca429b 
							
						 
					 
					
						
						
							
							basic arbitrary file transfer  
						
						 
						
						
						
					 
					
						2014-11-15 15:34:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							4b5d6f5b4f 
							
						 
					 
					
						
						
							
							Improve auth error handling and state machine  
						
						 
						
						
						
					 
					
						2014-11-15 08:49:00 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e2fb32841b 
							
						 
					 
					
						
						
							
							Merge pull request  #666  from SamWhited/localefixes  
						
						 
						
						... 
						
						
						
						Spelling fixes 
						
					 
					
						2014-11-15 13:12:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							8650bc2e13 
							
						 
					 
					
						
						
							
							Make licenses info untranslatable  
						
						 
						
						
						
					 
					
						2014-11-14 22:33:18 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							bae2b7ddc6 
							
						 
					 
					
						
						
							
							Spelling fixes in Italian translation  
						
						 
						
						
						
					 
					
						2014-11-14 22:16:58 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							62404b234c 
							
						 
					 
					
						
						
							
							Spelling fix in German translation  
						
						 
						
						
						
					 
					
						2014-11-14 22:13:42 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							0e550789d3 
							
						 
					 
					
						
						
							
							Add SCRAM-SHA1 support  
						
						 
						
						... 
						
						
						
						Factor out GS2 tokanization into own class
Add authentication exception class
Fixes  #71  
						
					 
					
						2014-11-14 18:00:12 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kevin Rauwolf 
							
						 
					 
					
						
						
						
						
							
						
						
							2bb68bcbba 
							
						 
					 
					
						
						
							
							Added check for empty from on group chat packet  
						
						 
						
						
						
					 
					
						2014-11-14 11:40:43 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							793671023b 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-11-14 19:49:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3118340ade 
							
						 
					 
					
						
						
							
							fixed possible npe when loading null counterpart into message  
						
						 
						
						
						
					 
					
						2014-11-14 19:49:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2bbad26fb0 
							
						 
					 
					
						
						
							
							Merge pull request  #653  from kriztan/patch-2  
						
						 
						
						... 
						
						
						
						Update German language 
						
					 
					
						2014-11-14 12:16:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							17c2ed411d 
							
						 
					 
					
						
						
							
							made presences synchronized  
						
						 
						
						
						
					 
					
						2014-11-13 14:44:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2db569b20f 
							
						 
					 
					
						
						
							
							made presences synchronized  
						
						 
						
						
						
					 
					
						2014-11-13 14:44:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							77ba68d61f 
							
						 
					 
					
						
						
							
							more npe checks in muc packet parser  
						
						 
						
						
						
					 
					
						2014-11-13 14:27:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e6a4fa031b 
							
						 
					 
					
						
						
							
							more npe checks in muc packet parser  
						
						 
						
						
						
					 
					
						2014-11-13 14:27:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							88c8373553 
							
						 
					 
					
						
						
							
							Merge pull request  #656  from SamWhited/authrefactor  
						
						 
						
						... 
						
						
						
						Refactor authentication code 
						
					 
					
						2014-11-12 23:01:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							2222483b42 
							
						 
					 
					
						
						
							
							Make sure we're storing the display JID as Unicode  
						
						 
						
						
						
					 
					
						2014-11-12 16:19:16 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							fca3e3c756 
							
						 
					 
					
						
						
							
							Update German language  
						
						 
						
						... 
						
						
						
						deleted 'pref_about_message' 
						
					 
					
						2014-11-12 20:09:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							14cfb60952 
							
						 
					 
					
						
						
							
							Refactor authentication code  
						
						 
						
						
						
					 
					
						2014-11-12 10:15:38 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							b971965697 
							
						 
					 
					
						
						
							
							Update German language  
						
						 
						
						
						
					 
					
						2014-11-12 13:13:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f1e2be4096 
							
						 
					 
					
						
						
							
							check if account is online before doing smp  
						
						 
						
						
						
					 
					
						2014-11-12 12:45:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							52ca2e7391 
							
						 
					 
					
						
						
							
							Merge branch 'feature/otr_verification' of  https://github.com/siacs/Conversations  into feature/otr_verification  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java 
						
					 
					
						2014-11-11 17:45:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d1bf9a3f6d 
							
						 
					 
					
						
						
							
							use auto register for verify otr listeners  
						
						 
						
						
						
					 
					
						2014-11-11 17:42:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							76f4cf1a73 
							
						 
					 
					
						
						
							
							small bug fix  
						
						 
						
						
						
					 
					
						2014-11-11 17:40:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e33fc26cbe 
							
						 
					 
					
						
						
							
							added snackbar to indicate smp. more error handling in verify activity  
						
						 
						
						
						
					 
					
						2014-11-11 17:40:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6cd2ff0d88 
							
						 
					 
					
						
						
							
							initial smp support  
						
						 
						
						
						
					 
					
						2014-11-11 17:40:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e555fe4b03 
							
						 
					 
					
						
						
							
							auto register/unregister listeners  
						
						 
						
						
						
					 
					
						2014-11-11 17:39:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fce78abb1c 
							
						 
					 
					
						
						
							
							temporarliy got rid of some insane work arounds in favor of some maybe less insane work arounds  
						
						 
						
						
						
					 
					
						2014-11-11 00:16:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8cb97f517f 
							
						 
					 
					
						
						
							
							small bug fix  
						
						 
						
						
						
					 
					
						2014-11-10 23:47:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dc98b3dbd5 
							
						 
					 
					
						
						
							
							added snackbar to indicate smp. more error handling in verify activity  
						
						 
						
						
						
					 
					
						2014-11-10 22:03:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8740b55d37 
							
						 
					 
					
						
						
							
							initial smp support  
						
						 
						
						
						
					 
					
						2014-11-10 19:23:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c8a6b05163 
							
						 
					 
					
						
						
							
							made Jid class parse otr session ids  
						
						 
						
						
						
					 
					
						2014-11-10 11:37:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							89ee999e1b 
							
						 
					 
					
						
						
							
							more refactoring for presence selection. removed getTo, getFrom and getJid from Element  
						
						 
						
						
						
					 
					
						2014-11-10 01:24:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							26b4788733 
							
						 
					 
					
						
						
							
							formating  
						
						 
						
						
						
					 
					
						2014-11-09 21:27:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a01ff66537 
							
						 
					 
					
						
						
							
							Merge pull request  #645  from betheg/about_all_libs  
						
						 
						
						... 
						
						
						
						add all used libs to the pref_about_message 
						
					 
					
						2014-11-09 21:18:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							72068d1a26 
							
						 
					 
					
						
						
							
							fixed private messages  
						
						 
						
						
						
					 
					
						2014-11-09 21:14:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							b1da9ae3cc 
							
						 
					 
					
						
						
							
							add libidn to pref_about_message.  
						
						 
						
						
						
					 
					
						2014-11-09 21:02:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							385bea0fe3 
							
						 
					 
					
						
						
							
							s/getResourcepart().isEmpty()/isBareJid()/  
						
						 
						
						
						
					 
					
						2014-11-09 13:13:19 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							56b4ac1751 
							
						 
					 
					
						
						
							
							use isBareJid instead of getResourcePart().isEmpty()  
						
						 
						
						
						
					 
					
						2014-11-09 19:06:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							eb9e988361 
							
						 
					 
					
						
						
							
							fixed muc sender history for some cases (where the previous nick was a valid jid)  
						
						 
						
						
						
					 
					
						2014-11-09 18:24:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							69ef17efc0 
							
						 
					 
					
						
						
							
							migrated some otr stuff to new jid classes  
						
						 
						
						
						
					 
					
						2014-11-09 17:46:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c310ada8b3 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-11-09 17:05:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cb1a36da79 
							
						 
					 
					
						
						
							
							Merge pull request  #642  from SamWhited/accountgetjid  
						
						 
						
						... 
						
						
						
						Rework `Account.getJid()' to return full JIDs 
						
					 
					
						2014-11-09 17:06:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e9af0d4ca7 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						
						
					 
					
						2014-11-09 17:02:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							61f046a675 
							
						 
					 
					
						
						
							
							make avatar service not break on empty names  
						
						 
						
						
						
					 
					
						2014-11-09 17:02:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							180a0e4408 
							
						 
					 
					
						
						
							
							Rework `Account.getJid()' to return full JIDs  
						
						 
						
						... 
						
						
						
						Remove `Account.getFullJid()' 
						
					 
					
						2014-11-09 10:57:22 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ad6fef063b 
							
						 
					 
					
						
						
							
							fixed null pointer in message merger  
						
						 
						
						
						
					 
					
						2014-11-09 16:47:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							377bd49ee8 
							
						 
					 
					
						
						
							
							refactored code to always contain full jid for counterpart  
						
						 
						
						
						
					 
					
						2014-11-09 16:21:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2b99b694eb 
							
						 
					 
					
						
						
							
							fixed full jid for account  
						
						 
						
						
						
					 
					
						2014-11-09 16:20:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							87c4fd9050 
							
						 
					 
					
						
						
							
							return null if from ist not set in abstract stanza  
						
						 
						
						
						
					 
					
						2014-11-09 16:18:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8437dbd480 
							
						 
					 
					
						
						
							
							Merge pull request  #641  from kruks23/translation8  
						
						 
						
						... 
						
						
						
						Update Spanish Translations 
						
					 
					
						2014-11-09 15:20:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							53c7905631 
							
						 
					 
					
						
						
							
							Check for illegal arguments to the toASCII func  
						
						 
						
						
						
					 
					
						2014-11-09 09:05:02 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							f146c203a9 
							
						 
					 
					
						
						
							
							add all used libs to the pref_about_message.  
						
						 
						
						... 
						
						
						
						also improve the notice a bit. 
						
					 
					
						2014-11-09 13:59:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							6f6f15d563 
							
						 
					 
					
						
						
							
							Update Spanish Translations  
						
						 
						
						
						
					 
					
						2014-11-09 13:29:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							7cfcf10f48 
							
						 
					 
					
						
						
							
							Fix contact highlighting in MUC  
						
						 
						
						
						
					 
					
						2014-11-09 07:20:08 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							fc594e9b73 
							
						 
					 
					
						
						
							
							Fix issue with IDN SRV records  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							02db197a89 
							
						 
					 
					
						
						
							
							Fix crash on account creation  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							cc34c60255 
							
						 
					 
					
						
						
							
							Don't crash on packets with no "from" specified  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							1a3327f2b1 
							
						 
					 
					
						
						
							
							Create avatar's for JID's w/o localparts  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							5ce0cd3802 
							
						 
					 
					
						
						
							
							Fields that we sync on should be final  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e49c2b14ed 
							
						 
					 
					
						
						
							
							Fix bug introduced by rebase  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							778fb9de6c 
							
						 
					 
					
						
						
							
							Fix letter avatar selection in MUC  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							efa4cec24d 
							
						 
					 
					
						
						
							
							More formatting fixes in MUC  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							dd426ca6de 
							
						 
					 
					
						
						
							
							Format contact names in MUC properly  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							1f5908b1d1 
							
						 
					 
					
						
						
							
							Fix JID parsing error  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							9db624ec7b 
							
						 
					 
					
						
						
							
							It builds again!  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							864f319500 
							
						 
					 
					
						
						
							
							Add a packet JID place I missed...  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							f108fc5a5c 
							
						 
					 
					
						
						
							
							Update more files to use JID objects  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							bf9207456e 
							
						 
					 
					
						
						
							
							Update another chunk of stuff to use JID objects  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							f15900426d 
							
						 
					 
					
						
						
							
							Update more files to use JID objects  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							9053f4aca0 
							
						 
					 
					
						
						
							
							Move a chunk of classes over to using JID objects  
						
						 
						
						
						
					 
					
						2014-11-09 07:00:40 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							a990861316 
							
						 
					 
					
						
						
							
							Use factories to generate JIDs  
						
						 
						
						
						
					 
					
						2014-11-09 06:59:49 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							a11878b139 
							
						 
					 
					
						
						
							
							Improve JID error handling  
						
						 
						
						
						
					 
					
						2014-11-09 06:59:49 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							8e23b6c272 
							
						 
					 
					
						
						
							
							Add first attempt at JID class  
						
						 
						
						
						
					 
					
						2014-11-09 06:59:49 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							589bf01545 
							
						 
					 
					
						
						
							
							version bump to 0.8.3 + changelog  
						
						 
						
						
						
					 
					
						2014-11-09 11:08:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4d7bee2e38 
							
						 
					 
					
						
						
							
							fixed   #634  
						
						 
						
						
						
					 
					
						2014-11-09 10:51:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6f24432ae3 
							
						 
					 
					
						
						
							
							use proper theme for MTM  
						
						 
						
						
						
					 
					
						2014-11-09 10:51:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							acfbd44529 
							
						 
					 
					
						
						
							
							got rid of MTM and mRandom variable in favor of using a reference to service  
						
						 
						
						
						
					 
					
						2014-11-09 10:50:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							047aaf5d4f 
							
						 
					 
					
						
						
							
							check if socket was null before doing ssl connect  
						
						 
						
						
						
					 
					
						2014-11-08 20:52:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ea657ece0d 
							
						 
					 
					
						
						
							
							update conversation fragment on every backend connect  
						
						 
						
						
						
					 
					
						2014-11-08 20:51:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8a2f20b6ed 
							
						 
					 
					
						
						
							
							Merge pull request  #549  from emdete/p2  
						
						 
						
						... 
						
						
						
						adjust api level wrapping 
						
					 
					
						2014-11-08 13:32:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							014f5a195b 
							
						 
					 
					
						
						
							
							bug fixes for the previous ui refactoring  
						
						 
						
						
						
					 
					
						2014-11-07 21:49:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e45d7bda38 
							
						 
					 
					
						
						
							
							UI code refactoring  
						
						 
						
						
						
					 
					
						2014-11-07 15:38:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e42b6d715b 
							
						 
					 
					
						
						
							
							fixed   #633  
						
						 
						
						
						
					 
					
						2014-11-06 17:25:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dace729c5b 
							
						 
					 
					
						
						
							
							don't show avatar on initial account creation  
						
						 
						
						
						
					 
					
						2014-11-06 16:51:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							413623337b 
							
						 
					 
					
						
						
							
							version bump to 0.8.2  
						
						 
						
						
						
					 
					
						2014-11-06 10:32:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2253814519 
							
						 
					 
					
						
						
							
							fixed notifications for images  
						
						 
						
						
						
					 
					
						2014-11-05 21:37:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6a43bda4d7 
							
						 
					 
					
						
						
							
							fixed   #617  
						
						 
						
						
						
					 
					
						2014-11-05 00:06:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f8d5d6b2b5 
							
						 
					 
					
						
						
							
							reformated license a bit  
						
						 
						
						
						
					 
					
						2014-11-04 23:47:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0c94804813 
							
						 
					 
					
						
						
							
							Merge pull request  #626  from SamWhited/issue612  
						
						 
						
						... 
						
						
						
						Add last seen info to the database 
						
					 
					
						2014-11-04 22:59:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7d4e03cc9a 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-11-04 22:56:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							96563aca52 
							
						 
					 
					
						
						
							
							Add last seen info to the database  
						
						 
						
						... 
						
						
						
						Fixes  #612  
						
					 
					
						2014-11-04 16:41:35 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							e22d3b4946 
							
						 
					 
					
						
						
							
							adjust api level wrapping  
						
						 
						
						
						
					 
					
						2014-11-04 20:05:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							df786cbf01 
							
						 
					 
					
						
						
							
							Shorten license text and fix height of scrollview  
						
						 
						
						
						
					 
					
						2014-11-04 13:26:48 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							7b67f1a19c 
							
						 
					 
					
						
						
							
							Use normal text size and color  
						
						 
						
						
						
					 
					
						2014-11-04 13:17:15 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							55c81eaf15 
							
						 
					 
					
						
						
							
							Make links clickable in about text  
						
						 
						
						
						
					 
					
						2014-11-04 13:09:56 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							88c0793694 
							
						 
					 
					
						
						
							
							link to account details when touching own avatar  
						
						 
						
						
						
					 
					
						2014-11-04 18:52:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							f10dd428ba 
							
						 
					 
					
						
						
							
							Convert about dialog to activity  
						
						 
						
						
						
					 
					
						2014-11-04 12:48:46 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							97b4b012d0 
							
						 
					 
					
						
						
							
							Use real copyright symbol ©  
						
						 
						
						
						
					 
					
						2014-11-04 12:48:25 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							8bf40308c8 
							
						 
					 
					
						
						
							
							Move AboutDialog to correct path  
						
						 
						
						
						
					 
					
						2014-11-04 12:47:58 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							df54ee75b4 
							
						 
					 
					
						
						
							
							Add about dialog with license info  
						
						 
						
						
						
					 
					
						2014-11-04 12:47:58 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ff10b094a0 
							
						 
					 
					
						
						
							
							clear avatar cache after nick name change  
						
						 
						
						
						
					 
					
						2014-11-04 18:27:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ff22f93185 
							
						 
					 
					
						
						
							
							Merge pull request  #625  from SamWhited/linterfix  
						
						 
						
						... 
						
						
						
						Make linter ignore properly checked API mismatch 
						
					 
					
						2014-11-04 17:59:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							b234b690c9 
							
						 
					 
					
						
						
							
							Make linter ignore properly checked API mismatch  
						
						 
						
						
						
					 
					
						2014-11-04 11:52:47 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cd5a56e8e7 
							
						 
					 
					
						
						
							
							show avatar in editaccount  
						
						 
						
						
						
					 
					
						2014-11-04 17:38:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b824e55277 
							
						 
					 
					
						
						
							
							register nfc callback in every activity that provides a proper sharable uri  
						
						 
						
						
						
					 
					
						2014-11-04 17:10:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							2ce95b19a9 
							
						 
					 
					
						
						
							
							optimize code abit  
						
						 
						
						
						
					 
					
						2014-11-04 13:32:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							b6c20d9260 
							
						 
					 
					
						
						
							
							implement "correct" ndef parsing  
						
						 
						
						
						
					 
					
						2014-11-04 13:32:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b3582c970e 
							
						 
					 
					
						
						
							
							made qr code available from muc and contact details as well  
						
						 
						
						
						
					 
					
						2014-11-04 12:15:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							12e2f0bdd7 
							
						 
					 
					
						
						
							
							added missing return statement. fixed api bug  
						
						 
						
						
						
					 
					
						2014-11-04 11:04:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							fb24bf98c9 
							
						 
					 
					
						
						
							
							be more OO  
						
						 
						
						
						
					 
					
						2014-11-04 10:49:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							32396b3bde 
							
						 
					 
					
						
						
							
							support pre JELLY_BEAN ndef  
						
						 
						
						
						
					 
					
						2014-11-04 10:48:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7a9327d960 
							
						 
					 
					
						
						
							
							fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @emdete  
						
						 
						
						
						
					 
					
						2014-11-03 23:47:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d458919c8f 
							
						 
					 
					
						
						
							
							unfinishd qr code implemenation. thanks to @emdete  
						
						 
						
						
						
					 
					
						2014-11-03 22:47:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							08cb23a886 
							
						 
					 
					
						
						
							
							fixed merge error  
						
						 
						
						
						
					 
					
						2014-11-03 21:22:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7d7be8efd8 
							
						 
					 
					
						
						
							
							Merge branch 'nfc' of  https://github.com/siacs/Conversations  into nfc  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/main/AndroidManifest.xml 
						
					 
					
						2014-11-03 21:07:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a054a3fbb4 
							
						 
					 
					
						
						
							
							use different filter for nfc intents  
						
						 
						
						
						
					 
					
						2014-11-03 21:04:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							28a186cd6c 
							
						 
					 
					
						
						
							
							basic beam code / untested  
						
						 
						
						
						
					 
					
						2014-11-03 20:55:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4614ff343e 
							
						 
					 
					
						
						
							
							create file explicitly before downloading image  
						
						 
						
						
						
					 
					
						2014-11-03 20:55:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c48407f3b4 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-11-03 20:28:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							696dd07a41 
							
						 
					 
					
						
						
							
							basic beam code / untested  
						
						 
						
						
						
					 
					
						2014-11-03 20:00:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ec9c264cf7 
							
						 
					 
					
						
						
							
							more error handling for http connection  
						
						 
						
						
						
					 
					
						2014-11-03 19:59:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							39ae34d3e6 
							
						 
					 
					
						
						
							
							Wrap "last seen" time.  
						
						 
						
						... 
						
						
						
						Fixes  #611  
						
					 
					
						2014-11-03 08:28:20 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3e05ef77b1 
							
						 
					 
					
						
						
							
							version bump to 0.8.1  
						
						 
						
						
						
					 
					
						2014-11-03 11:20:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							49920649db 
							
						 
					 
					
						
						
							
							always use exif helper  
						
						 
						
						
						
					 
					
						2014-11-03 11:20:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							27f42dfb63 
							
						 
					 
					
						
						
							
							more error handling in xmppconnection  
						
						 
						
						
						
					 
					
						2014-11-03 10:03:45 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1ea2e7dc3b 
							
						 
					 
					
						
						
							
							fixed arrayoutofbounds + spelling  
						
						 
						
						
						
					 
					
						2014-11-01 14:33:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							46f147a82c 
							
						 
					 
					
						
						
							
							Merge branch 'gradle' into development  
						
						 
						
						... 
						
						
						
						Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib 
						
					 
					
						2014-10-30 15:33:13 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7b4f3637db 
							
						 
					 
					
						
						
							
							only end otr session if there is more than one contact presence. reset otherwise  
						
						 
						
						
						
					 
					
						2014-10-30 10:59:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e4567e7a62 
							
						 
					 
					
						
						
							
							cleanup for clear conversation history. small otr fixes  
						
						 
						
						
						
					 
					
						2014-10-30 00:31:44 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1b62d94093 
							
						 
					 
					
						
						
							
							replace the exif interface with a small static class from 3d gallery  
						
						 
						
						
						
					 
					
						2014-10-29 18:12:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							03593ba56f 
							
						 
					 
					
						
						
							
							proper error state for images  
						
						 
						
						
						
					 
					
						2014-10-29 11:31:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							64209829f7 
							
						 
					 
					
						
						
							
							fixed 'share image' context menu  
						
						 
						
						
						
					 
					
						2014-10-29 09:57:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							bb26a84269 
							
						 
					 
					
						
						
							
							fixed intent managment  
						
						 
						
						
						
					 
					
						2014-10-29 09:57:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							962e8183f6 
							
						 
					 
					
						
						
							
							end otr session if plain text message from another instance is being received  
						
						 
						
						
						
					 
					
						2014-10-28 18:02:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f256a466d8 
							
						 
					 
					
						
						
							
							improvements on findConversation  
						
						 
						
						
						
					 
					
						2014-10-28 17:15:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							161623eca2 
							
						 
					 
					
						
						
							
							always show verify fingerprint if there is an active otr session  
						
						 
						
						
						
					 
					
						2014-10-28 17:15:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7dcce220cb 
							
						 
					 
					
						
						
							
							reworked dns retry  
						
						 
						
						
						
					 
					
						2014-10-27 21:48:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							915def24f9 
							
						 
					 
					
						
						
							
							removed unnecessary logging from avatar service  
						
						 
						
						
						
					 
					
						2014-10-27 21:48:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							698572d218 
							
						 
					 
					
						
						
							
							proper cleanup after pgp image decryption  
						
						 
						
						
						
					 
					
						2014-10-27 21:47:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f45a841caf 
							
						 
					 
					
						
						
							
							fixed url parsing  
						
						 
						
						
						
					 
					
						2014-10-27 21:47:17 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							da822ebae8 
							
						 
					 
					
						
						
							
							check for links in pgp encrypted messages as well  
						
						 
						
						
						
					 
					
						2014-10-27 11:00:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b045dea549 
							
						 
					 
					
						
						
							
							set divider for image meta information to '|' to not conflict with URL. breaks images downloaded in between 0.7.3 and now  
						
						 
						
						
						
					 
					
						2014-10-26 20:18:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d86b7f3192 
							
						 
					 
					
						
						
							
							Merge pull request  #588  from betheg/remove_unused_cast  
						
						 
						
						... 
						
						
						
						remove some unused cast 
						
					 
					
						2014-10-26 20:17:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							020dc863b1 
							
						 
					 
					
						
						
							
							remove some unused cast  
						
						 
						
						
						
					 
					
						2014-10-26 18:54:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							8dae4b1eb9 
							
						 
					 
					
						
						
							
							fix possible fallthrough.  
						
						 
						
						
						
					 
					
						2014-10-26 18:30:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8171633eb9 
							
						 
					 
					
						
						
							
							don't merge downloadable messages  
						
						 
						
						
						
					 
					
						2014-10-24 23:18:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8fb8985412 
							
						 
					 
					
						
						
							
							added message option to download images  
						
						 
						
						
						
					 
					
						2014-10-24 19:30:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e1f11a5735 
							
						 
					 
					
						
						
							
							also show some text in new image notification  
						
						 
						
						
						
					 
					
						2014-10-24 18:27:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							864f3610b3 
							
						 
					 
					
						
						
							
							picture notification and some drive by bug fixes  
						
						 
						
						
						
					 
					
						2014-10-24 14:34:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cbc3d9bd6f 
							
						 
					 
					
						
						
							
							notify only after image has been received over http. introduced mini grace for catching up with SM or offline messages  
						
						 
						
						
						
					 
					
						2014-10-24 13:29:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d73a77643d 
							
						 
					 
					
						
						
							
							context menu for messages. allow to resend single messages  
						
						 
						
						
						
					 
					
						2014-10-23 21:27:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							281ce3105f 
							
						 
					 
					
						
						
							
							Make conversations the root project  
						
						 
						
						
						
					 
					
						2014-10-22 15:47:11 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d04afe453a 
							
						 
					 
					
						
						
							
							ability to download pgp encrypted files over http as well  
						
						 
						
						
						
					 
					
						2014-10-22 19:05:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c067bf96b0 
							
						 
					 
					
						
						
							
							small bug fixes for the conversation activity  
						
						 
						
						
						
					 
					
						2014-10-22 17:32:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							62b0fc3fda 
							
						 
					 
					
						
						
							
							made httpconnection accept aes encrypted files  
						
						 
						
						
						
					 
					
						2014-10-22 13:06:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							45bdadd915 
							
						 
					 
					
						
						
							
							better aproach on thread saftey  
						
						 
						
						
						
					 
					
						2014-10-22 00:25:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							df2257aed6 
							
						 
					 
					
						
						
							
							added hostname verifier to httpconnection  
						
						 
						
						
						
					 
					
						2014-10-22 00:00:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							40c74b432e 
							
						 
					 
					
						
						
							
							made iterating over hashmap in notification service thread safe  
						
						 
						
						
						
					 
					
						2014-10-21 23:59:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							63704b114c 
							
						 
					 
					
						
						
							
							throw exception when no servers are left to try  
						
						 
						
						
						
					 
					
						2014-10-21 20:13:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3821a72644 
							
						 
					 
					
						
						
							
							fixed   #564  
						
						 
						
						
						
					 
					
						2014-10-21 19:43:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a56ee63a3e 
							
						 
					 
					
						
						
							
							update ui when new avatar was found  
						
						 
						
						
						
					 
					
						2014-10-21 15:26:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0d767c3971 
							
						 
					 
					
						
						
							
							proper avatar caching  
						
						 
						
						
						
					 
					
						2014-10-21 14:57:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							21961673cb 
							
						 
					 
					
						
						
							
							refactored avatar generation. first step  
						
						 
						
						
						
					 
					
						2014-10-20 21:08:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0bb2c3c4d5 
							
						 
					 
					
						
						
							
							keep reference to previous and next message in message  
						
						 
						
						
						
					 
					
						2014-10-20 17:01:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0b61fb0129 
							
						 
					 
					
						
						
							
							Merge pull request  #554  from SamWhited/tls  
						
						 
						
						... 
						
						
						
						Enable TLSv1.1 and 1.2 and add option to enable/disable SSLv3 
						
					 
					
						2014-10-20 00:03:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8263e07336 
							
						 
					 
					
						
						
							
							mtm support for image downloader  
						
						 
						
						
						
					 
					
						2014-10-19 23:42:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							44f9022d95 
							
						 
					 
					
						
						
							
							use new 'api' to add messages to a conversation  
						
						 
						
						
						
					 
					
						2014-10-19 23:15:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c9238ef5ae 
							
						 
					 
					
						
						
							
							force tls for registrations as well  
						
						 
						
						
						
					 
					
						2014-10-19 23:14:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a201f9e53f 
							
						 
					 
					
						
						
							
							got rid of copyonwrite array list for messages  
						
						 
						
						
						
					 
					
						2014-10-19 23:13:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							99ee049115 
							
						 
					 
					
						
						
							
							Make legacy SSL option default to false  
						
						 
						
						
						
					 
					
						2014-10-19 16:11:35 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							6c7c3ddf15 
							
						 
					 
					
						
						
							
							Add "Enable legacy SSL" preference  
						
						 
						
						
						
					 
					
						2014-10-19 15:53:03 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e8bf75d79b 
							
						 
					 
					
						
						
							
							force tls  
						
						 
						
						
						
					 
					
						2014-10-19 20:48:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f824193c56 
							
						 
					 
					
						
						
							
							Merge branch 'srv_fix' of  https://github.com/lactide/Conversations  into lactide-srv_fix  
						
						 
						
						
						
					 
					
						2014-10-19 20:17:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							113b7d1736 
							
						 
					 
					
						
						
							
							Remove support for legacy SSL  
						
						 
						
						
						
					 
					
						2014-10-18 20:22:26 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0605390144 
							
						 
					 
					
						
						
							
							do not attempt to download images when not connected  
						
						 
						
						
						
					 
					
						2014-10-17 13:09:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3372e50155 
							
						 
					 
					
						
						
							
							made grace period on a per account basis  
						
						 
						
						
						
					 
					
						2014-10-17 11:01:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Frank Zschockelt 
							
						 
					 
					
						
						
						
						
							
						
						
							c725da954c 
							
						 
					 
					
						
						
							
							try all srv responses if necessary  
						
						 
						
						
						
					 
					
						2014-10-16 23:31:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5e3caf9626 
							
						 
					 
					
						
						
							
							additonal safty net for disabling notifications  
						
						 
						
						
						
					 
					
						2014-10-16 19:10:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0fd634ae52 
							
						 
					 
					
						
						
							
							simplified determination whether otr needs starting in a session  
						
						 
						
						
						
					 
					
						2014-10-16 16:09:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							c4b9d42861 
							
						 
					 
					
						
						
							
							Enable all supported protocols including TLSv1.1 and 1.2  
						
						 
						
						
						
					 
					
						2014-10-16 10:02:47 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c1a55608df 
							
						 
					 
					
						
						
							
							log ending otr sessions on disconnect  
						
						 
						
						
						
					 
					
						2014-10-16 15:53:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6cfb14a2e4 
							
						 
					 
					
						
						
							
							forground/background logging without csi  
						
						 
						
						
						
					 
					
						2014-10-16 15:39:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							45e0f99b88 
							
						 
					 
					
						
						
							
							make image download message to type=image only after completion  
						
						 
						
						
						
					 
					
						2014-10-16 15:29:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							88d88ffb7b 
							
						 
					 
					
						
						
							
							added file observer to get notified when files are deleted:  fixes   #396  
						
						 
						
						
						
					 
					
						2014-10-16 02:39:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f5019ba966 
							
						 
					 
					
						
						
							
							detect deleted files on start up. got rid of lagecy image provider for performance reasons. NOTE: this will prevent you to access images older than version 0.6  
						
						 
						
						
						
					 
					
						2014-10-15 22:08:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cb4069f0f2 
							
						 
					 
					
						
						
							
							refactored file download status. make image http download available for carbon copied (sent) messages as well  
						
						 
						
						
						
					 
					
						2014-10-15 19:32:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1927a3d99c 
							
						 
					 
					
						
						
							
							Merge pull request  #547  from emdete/p0  
						
						 
						
						... 
						
						
						
						remove warning about <> cast 
						
					 
					
						2014-10-15 15:38:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							f021ee8562 
							
						 
					 
					
						
						
							
							remove warning about <> cast  
						
						 
						
						
						
					 
					
						2014-10-15 15:25:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9d960f2741 
							
						 
					 
					
						
						
							
							synchronization for listeners  
						
						 
						
						
						
					 
					
						2014-10-15 14:41:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f063b1c063 
							
						 
					 
					
						
						
							
							synchronization for notification  
						
						 
						
						
						
					 
					
						2014-10-15 14:33:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1428628a5d 
							
						 
					 
					
						
						
							
							removed unecessary update  
						
						 
						
						
						
					 
					
						2014-10-15 14:32:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d09739d166 
							
						 
					 
					
						
						
							
							changed pgp decoding mechanism  
						
						 
						
						
						
					 
					
						2014-10-15 02:09:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3c557a1bb4 
							
						 
					 
					
						
						
							
							don't show invalid file size  
						
						 
						
						
						
					 
					
						2014-10-14 19:33:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							262128c8f9 
							
						 
					 
					
						
						
							
							recreate http connection after restart. fixes stale download button. better failing  
						
						 
						
						
						
					 
					
						2014-10-14 19:27:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							031b739af8 
							
						 
					 
					
						
						
							
							catch can't open database exception  
						
						 
						
						
						
					 
					
						2014-10-14 18:26:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e98460771b 
							
						 
					 
					
						
						
							
							read image bounds on downloaded image  
						
						 
						
						
						
					 
					
						2014-10-14 18:16:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							470410b389 
							
						 
					 
					
						
						
							
							possible work around for notification bug  
						
						 
						
						
						
					 
					
						2014-10-14 17:14:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c18e986a93 
							
						 
					 
					
						
						
							
							fixed rare npe  
						
						 
						
						
						
					 
					
						2014-10-14 16:25:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4fdc6b2eac 
							
						 
					 
					
						
						
							
							renaming  
						
						 
						
						
						
					 
					
						2014-10-14 12:02:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							bbb0693f4a 
							
						 
					 
					
						
						
							
							basic image over http downloading  
						
						 
						
						
						
					 
					
						2014-10-14 01:06:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7e373bc89f 
							
						 
					 
					
						
						
							
							Merge pull request  #543  from emdete/dedepricate  
						
						 
						
						... 
						
						
						
						use setAlpha(float) method, not the deprecated one 
						
					 
					
						2014-10-13 18:15:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d61e4cce10 
							
						 
					 
					
						
						
							
							reworked muc details and contact details a bit  
						
						 
						
						
						
					 
					
						2014-10-13 14:36:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							a42f0dd3bc 
							
						 
					 
					
						
						
							
							use setAlpha(float) method, not the depricated one  
						
						 
						
						
						
					 
					
						2014-10-13 14:08:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2ec021a426 
							
						 
					 
					
						
						
							
							redesigned contact details a bit  
						
						 
						
						
						
					 
					
						2014-10-13 12:36:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c6f9b23def 
							
						 
					 
					
						
						
							
							fixed npes  
						
						 
						
						
						
					 
					
						2014-10-09 23:08:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							ce446840fc 
							
						 
					 
					
						
						
							
							remove this.this member  
						
						 
						
						
						
					 
					
						2014-10-08 16:54:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							10411944b1 
							
						 
					 
					
						
						
							
							bullet proofing some code  
						
						 
						
						
						
					 
					
						2014-10-08 14:10:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3d88ffc5cd 
							
						 
					 
					
						
						
							
							fixed possible logout bugs  
						
						 
						
						
						
					 
					
						2014-10-08 12:21:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3737a96dbb 
							
						 
					 
					
						
						
							
							refactored read marker  
						
						 
						
						
						
					 
					
						2014-10-07 16:02:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							919c98207b 
							
						 
					 
					
						
						
							
							made disabled notifications permanent across restarts  
						
						 
						
						
						
					 
					
						2014-10-07 15:18:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d5227e5c25 
							
						 
					 
					
						
						
							
							refactored grace period  
						
						 
						
						
						
					 
					
						2014-10-07 13:37:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7f52435273 
							
						 
					 
					
						
						
							
							fixed regression of not showing status message  
						
						 
						
						
						
					 
					
						2014-10-07 11:51:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b6f5e4a217 
							
						 
					 
					
						
						
							
							cleanung up the scroll fix a little  
						
						 
						
						
						
					 
					
						2014-10-06 22:03:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0a93093bc7 
							
						 
					 
					
						
						
							
							fixed npe  
						
						 
						
						
						
					 
					
						2014-10-06 19:27:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							16d5429f80 
							
						 
					 
					
						
						
							
							muc options clean up  
						
						 
						
						
						
					 
					
						2014-10-06 13:34:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b788b84c31 
							
						 
					 
					
						
						
							
							refactored muc bookmark to extend element. keep all elements the server or other clients added before  
						
						 
						
						
						
					 
					
						2014-10-06 00:33:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6b3097ee27 
							
						 
					 
					
						
						
							
							only delivery get and set iq packets to unhandled iq listener. only create jingle packets with type=get or set  
						
						 
						
						
						
					 
					
						2014-10-05 14:26:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ddb76b0e73 
							
						 
					 
					
						
						
							
							fixed rare npe  
						
						 
						
						
						
					 
					
						2014-10-05 14:05:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f7f7a73ce7 
							
						 
					 
					
						
						
							
							Merge pull request  #524  from betheg/muc_errors_conditions  
						
						 
						
						... 
						
						
						
						MUC: differentiated a few more errors. 
						
					 
					
						2014-10-05 13:18:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bf893bee08 
							
						 
					 
					
						
						
							
							Merge pull request  #523  from betheg/leaked_window  
						
						 
						
						... 
						
						
						
						fixed an 'activity has leaked window' 
						
					 
					
						2014-10-05 13:18:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							54e9235bfc 
							
						 
					 
					
						
						
							
							MUC: differentiated a few more errors.  
						
						 
						
						
						
					 
					
						2014-10-05 12:31:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4a260baa12 
							
						 
					 
					
						
						
							
							fixed   #510  
						
						 
						
						
						
					 
					
						2014-10-05 12:05:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							26ce62f365 
							
						 
					 
					
						
						
							
							end otr session instead of only resetting  
						
						 
						
						
						
					 
					
						2014-10-05 11:14:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							45bd0449fb 
							
						 
					 
					
						
						
							
							sending initial ping before going online after login/resume to ensure that all presences and messages have been loaded  
						
						 
						
						
						
					 
					
						2014-10-05 10:46:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							5250ef536f 
							
						 
					 
					
						
						
							
							fixed an 'activity has leaked window'  
						
						 
						
						
						
					 
					
						2014-10-04 18:32:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5371dd025a 
							
						 
					 
					
						
						
							
							no dns retry after nosrv error  
						
						 
						
						
						
					 
					
						2014-10-04 14:33:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d5e62ffe89 
							
						 
					 
					
						
						
							
							added missing status messages after message scroll  
						
						 
						
						
						
					 
					
						2014-10-04 14:32:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							79315bdd61 
							
						 
					 
					
						
						
							
							reset pending subscription request  
						
						 
						
						
						
					 
					
						2014-10-04 14:32:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							18409946c6 
							
						 
					 
					
						
						
							
							implemented ping (xep-0199)  fixed   #517  
						
						 
						
						
						
					 
					
						2014-10-03 19:24:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							9a4b48d1ec 
							
						 
					 
					
						
						
							
							let's own otr-fingerprint copy to clipboard.  
						
						 
						
						
						
					 
					
						2014-10-03 16:20:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9ae52a235f 
							
						 
					 
					
						
						
							
							revised tablet ui.  fixed   #423  
						
						 
						
						
						
					 
					
						2014-10-03 15:00:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0e56ff93e9 
							
						 
					 
					
						
						
							
							fixed possible npe  
						
						 
						
						
						
					 
					
						2014-10-03 11:55:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							facd15f037 
							
						 
					 
					
						
						
							
							check if display is off for notifications  
						
						 
						
						
						
					 
					
						2014-10-02 22:17:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f671938e84 
							
						 
					 
					
						
						
							
							mark conversation as read when displayed marker from another client is received  
						
						 
						
						
						
					 
					
						2014-10-02 21:07:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cc76e15b95 
							
						 
					 
					
						
						
							
							avoided unecessary message searchs  
						
						 
						
						
						
					 
					
						2014-10-02 18:54:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f8be57d43f 
							
						 
					 
					
						
						
							
							show displayed by contact on all devices  
						
						 
						
						
						
					 
					
						2014-10-02 18:31:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4b09f0e9d3 
							
						 
					 
					
						
						
							
							properly dismiss notifications  
						
						 
						
						
						
					 
					
						2014-10-02 17:36:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fd6f5b0e84 
							
						 
					 
					
						
						
							
							calculate sample size for thumbnails as well  
						
						 
						
						
						
					 
					
						2014-09-30 16:22:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0733a94127 
							
						 
					 
					
						
						
							
							Merge pull request  #505  from betheg/fix_invite  
						
						 
						
						... 
						
						
						
						fixed muc invite with <body/>. 
						
					 
					
						2014-09-30 11:53:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							511b7a53f4 
							
						 
					 
					
						
						
							
							notifiy only when necessary  
						
						 
						
						
						
					 
					
						2014-09-29 18:28:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							c8160b010d 
							
						 
					 
					
						
						
							
							fixed muc invite with <body/>.  
						
						 
						
						
						
					 
					
						2014-09-29 17:59:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							87010e6094 
							
						 
					 
					
						
						
							
							more improvments for new notification service  
						
						 
						
						
						
					 
					
						2014-09-28 16:33:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bff23c2e23 
							
						 
					 
					
						
						
							
							new notification service. first draft  
						
						 
						
						
						
					 
					
						2014-09-28 15:21:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1ae9338fc9 
							
						 
					 
					
						
						
							
							made muc passwords and prefereced encryption method persistant across restarts  
						
						 
						
						
						
					 
					
						2014-09-27 18:16:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							1d3a6125d2 
							
						 
					 
					
						
						
							
							add false argument to inflate.  
						
						 
						
						
						
					 
					
						2014-09-27 16:45:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2415781ebf 
							
						 
					 
					
						
						
							
							fixed some lint warnings. thanks @betheg  
						
						 
						
						
						
					 
					
						2014-09-27 11:46:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8fb0fb0c0d 
							
						 
					 
					
						
						
							
							anwser to xmpp: style uris. fixed open conversations from android address book  
						
						 
						
						
						
					 
					
						2014-09-27 11:37:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6e77343407 
							
						 
					 
					
						
						
							
							revised send button in landscape mode  
						
						 
						
						
						
					 
					
						2014-09-27 10:51:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							54278febb4 
							
						 
					 
					
						
						
							
							changed method that determins whether or not sm is available  
						
						 
						
						
						
					 
					
						2014-09-23 15:36:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							248a1693ea 
							
						 
					 
					
						
						
							
							refactored options menu handling a bit  
						
						 
						
						
						
					 
					
						2014-09-23 15:06:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b14f693c2e 
							
						 
					 
					
						
						
							
							dont mark message as send on resend  
						
						 
						
						
						
					 
					
						2014-09-23 11:49:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							12c2fde61b 
							
						 
					 
					
						
						
							
							fixed rare npe  
						
						 
						
						
						
					 
					
						2014-09-23 11:48:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							59009ded82 
							
						 
					 
					
						
						
							
							fixed very rare npe  
						
						 
						
						
						
					 
					
						2014-09-22 16:04:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							45aede14bd 
							
						 
					 
					
						
						
							
							fixed   #452  
						
						 
						
						
						
					 
					
						2014-09-22 13:23:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							bb065020ff 
							
						 
					 
					
						
						
							
							don't show time stamp within the last 6 hours of a new day  
						
						 
						
						
						
					 
					
						2014-09-22 11:00:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c2bc15f5ba 
							
						 
					 
					
						
						
							
							added 'model' to selectable resources.  fixed   #461  
						
						 
						
						
						
					 
					
						2014-09-22 11:00:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1f91ed11fa 
							
						 
					 
					
						
						
							
							show full date in message list,  fixed   #328  
						
						 
						
						
						
					 
					
						2014-09-21 23:16:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							98a8fd4d05 
							
						 
					 
					
						
						
							
							changed message merger a bit  
						
						 
						
						
						
					 
					
						2014-09-21 22:58:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cca5865ecb 
							
						 
					 
					
						
						
							
							fixed   #454  - added fast srcolling to some lists  
						
						 
						
						
						
					 
					
						2014-09-21 00:45:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d806923d57 
							
						 
					 
					
						
						
							
							Merge pull request  #460  from betheg/receipts  
						
						 
						
						... 
						
						
						
						indicates received messages with a tick. 
						
					 
					
						2014-09-20 19:55:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							37aacbeb74 
							
						 
					 
					
						
						
							
							fixed presence splitting  
						
						 
						
						
						
					 
					
						2014-09-20 16:26:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0b86f65bdc 
							
						 
					 
					
						
						
							
							fixed   #470  
						
						 
						
						
						
					 
					
						2014-09-20 16:02:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							a86a09ab5b 
							
						 
					 
					
						
						
							
							indicates received messages with a tick.  
						
						 
						
						
						
					 
					
						2014-09-20 15:49:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							295bfb7f1d 
							
						 
					 
					
						
						
							
							made xmppconnection service available in generators  
						
						 
						
						
						
					 
					
						2014-09-20 15:29:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c282ef4645 
							
						 
					 
					
						
						
							
							scroll fixes  
						
						 
						
						
						
					 
					
						2014-09-19 21:09:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2a185c8fc9 
							
						 
					 
					
						
						
							
							background daemon doesn't start automatically if there are no enabled accounts.  fixed   #443   fixed   #442  
						
						 
						
						
						
					 
					
						2014-09-19 17:21:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3da0d5adce 
							
						 
					 
					
						
						
							
							fixed   #462  
						
						 
						
						
						
					 
					
						2014-09-19 14:35:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8796af22d1 
							
						 
					 
					
						
						
							
							Merge pull request  #448  from betheg/add_break  
						
						 
						
						... 
						
						
						
						add a forgotten break and remove some unused imports 
						
					 
					
						2014-09-19 10:32:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							b9e7f4870c 
							
						 
					 
					
						
						
							
							add a forgotten break and remove some unused imports  
						
						 
						
						
						
					 
					
						2014-09-13 21:15:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							00ff5c2dbd 
							
						 
					 
					
						
						
							
							MUC: notify also on private messages  
						
						 
						
						
						
					 
					
						2014-09-13 14:02:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							0d873903b8 
							
						 
					 
					
						
						
							
							add proper namespace in carbon  
						
						 
						
						
						
					 
					
						2014-09-12 20:14:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							db816187f8 
							
						 
					 
					
						
						
							
							check if market is available before starting to install openkey chain  
						
						 
						
						
						
					 
					
						2014-09-11 18:02:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dee46f3453 
							
						 
					 
					
						
						
							
							match color in contact details to the colors in the send button. also migrated some other colors from hard coding to using resources  
						
						 
						
						
						
					 
					
						2014-09-11 14:24:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ff41918cb7 
							
						 
					 
					
						
						
							
							missed show=chat for send button colorization  
						
						 
						
						
						
					 
					
						2014-09-11 13:19:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fef41ba2a2 
							
						 
					 
					
						
						
							
							pare body in type=normal messages as well  
						
						 
						
						
						
					 
					
						2014-09-11 13:18:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							31f11070e3 
							
						 
					 
					
						
						
							
							IT'S CHRISTMAS ALREADY!  
						
						 
						
						
						
					 
					
						2014-09-10 17:59:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4b2e06b9c3 
							
						 
					 
					
						
						
							
							version bump, changelog and one last minute change for OTR  
						
						 
						
						
						
					 
					
						2014-09-09 14:30:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c02ef80086 
							
						 
					 
					
						
						
							
							Merge branch 'master' of github.com:siacs/Conversations  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/eu/siacs/conversations/crypto/PgpEngine.java
	src/eu/siacs/conversations/persistance/FileBackend.java
	src/eu/siacs/conversations/ui/ShareWithActivity.java 
						
					 
					
						2014-09-09 14:16:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							facb1242b6 
							
						 
					 
					
						
						
							
							don't reset images from sending to waiting  
						
						 
						
						
						
					 
					
						2014-09-09 13:56:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d92e8381db 
							
						 
					 
					
						
						
							
							setting to increase font size.  fixed   #420  
						
						 
						
						
						
					 
					
						2014-09-08 23:58:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1871521aed 
							
						 
					 
					
						
						
							
							simplefied some code that might have been the source for some strange bugs  
						
						 
						
						
						
					 
					
						2014-09-08 20:29:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b23f8bd472 
							
						 
					 
					
						
						
							
							introduced downloadable interface. reverted some of the changes made to OTR  
						
						 
						
						
						
					 
					
						2014-09-08 20:09:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a6f0f0cb6e 
							
						 
					 
					
						
						
							
							bug fixes for forcing encryption  
						
						 
						
						
						
					 
					
						2014-09-08 14:29:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5cb11396f6 
							
						 
					 
					
						
						
							
							fixed sending offline pgp messages  
						
						 
						
						
						
					 
					
						2014-09-08 14:08:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							58953e6193 
							
						 
					 
					
						
						
							
							settings to force encryption and setting for not saving messages to disk.  fixed   #353  
						
						 
						
						
						
					 
					
						2014-09-08 13:37:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3b9fd28ef4 
							
						 
					 
					
						
						
							
							don't fail displayed or received messages  
						
						 
						
						
						
					 
					
						2014-09-08 12:51:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							19f98f5143 
							
						 
					 
					
						
						
							
							warn on missing presence subscription  
						
						 
						
						
						
					 
					
						2014-09-08 12:46:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							409fdd8596 
							
						 
					 
					
						
						
							
							Merge branch 'development' of github.com:siacs/Conversations into development  
						
						 
						
						
						
					 
					
						2014-09-07 23:08:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							449c2a544b 
							
						 
					 
					
						
						
							
							fixed   #321  - delete otr fingerprints  
						
						 
						
						
						
					 
					
						2014-09-07 23:08:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5fe3f207d4 
							
						 
					 
					
						
						
							
							Merge pull request  #426  from betheg/remove_strings  
						
						 
						
						... 
						
						
						
						deleted some unused string-resources and imports, also deleted edit_account_dialog.xml. 
						
					 
					
						2014-09-07 17:13:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							90947597e5 
							
						 
					 
					
						
						
							
							fixed   #425  
						
						 
						
						
						
					 
					
						2014-09-07 16:53:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							f4d86ecff3 
							
						 
					 
					
						
						
							
							deleted some unused string-resources and imports, also deleted edit_account_dialog.xml.  
						
						 
						
						
						
					 
					
						2014-09-07 15:58:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							27ad80afc2 
							
						 
					 
					
						
						
							
							trying to avoid rejectedexection  
						
						 
						
						
						
					 
					
						2014-09-07 15:11:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							ecd613dcdd 
							
						 
					 
					
						
						
							
							MUC: set the password from bookmarks.  
						
						 
						
						
						
					 
					
						2014-09-07 14:06:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d9990e6cd8 
							
						 
					 
					
						
						
							
							made shareing text with conferences possible again  
						
						 
						
						
						
					 
					
						2014-09-07 13:01:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b334ebd0fa 
							
						 
					 
					
						
						
							
							added missing breaks oO  
						
						 
						
						
						
					 
					
						2014-09-07 12:43:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							890fb9a1b4 
							
						 
					 
					
						
						
							
							fixed npe  
						
						 
						
						
						
					 
					
						2014-09-07 00:09:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9a945af6b9 
							
						 
					 
					
						
						
							
							Merge branch 'development' of github.com:siacs/Conversations into development  
						
						 
						
						
						
					 
					
						2014-09-06 18:21:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0e5a0a07fd 
							
						 
					 
					
						
						
							
							made otr a little bit more solid when there is no presence subscription  
						
						 
						
						
						
					 
					
						2014-09-06 18:21:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							375ec3a686 
							
						 
					 
					
						
						
							
							MUC: set password from invite message.  
						
						 
						
						
						
					 
					
						2014-09-05 22:07:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dc02137106 
							
						 
					 
					
						
						
							
							warn user if no presence subscription exists  
						
						 
						
						
						
					 
					
						2014-09-05 13:29:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							34228d0e78 
							
						 
					 
					
						
						
							
							improved logging for avatar fetches  
						
						 
						
						
						
					 
					
						2014-09-05 13:29:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b8d289a932 
							
						 
					 
					
						
						
							
							fixed   #342  - otr with facebook and other services without resources  
						
						 
						
						
						
					 
					
						2014-09-04 19:56:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							01389e900b 
							
						 
					 
					
						
						
							
							reconnect accounts when resource has been changed in settings  
						
						 
						
						
						
					 
					
						2014-09-04 13:56:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9817251ed5 
							
						 
					 
					
						
						
							
							made muc password dialog hide the password (password field)  
						
						 
						
						
						
					 
					
						2014-09-04 11:46:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7a3bc5dc45 
							
						 
					 
					
						
						
							
							nick parsing (xep 0172) also enabled for messages and for pep  
						
						 
						
						
						
					 
					
						2014-09-04 10:50:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1d6c09e8ff 
							
						 
					 
					
						
						
							
							Merge pull request  #397  from GZep/development  
						
						 
						
						... 
						
						
						
						XEP-0172 
						
					 
					
						2014-09-04 10:28:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							50f90d37b8 
							
						 
					 
					
						
						
							
							Merge pull request  #417  from emdete/unicode_emoticons  
						
						 
						
						... 
						
						
						
						improve regex, implement pattern cache 
						
					 
					
						2014-09-04 10:16:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6b9219c5f4 
							
						 
					 
					
						
						
							
							added support for password protected muc -  fixed   #203  and  fixed   #395  
						
						 
						
						
						
					 
					
						2014-09-03 19:35:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f19b1fb823 
							
						 
					 
					
						
						
							
							changed order of snackbar hints  
						
						 
						
						
						
					 
					
						2014-09-03 18:58:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							0a2c73f246 
							
						 
					 
					
						
						
							
							improve emo mapping  
						
						 
						
						
						
					 
					
						2014-09-03 17:44:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							0a686bc71c 
							
						 
					 
					
						
						
							
							use class, use codepoint  
						
						 
						
						
						
					 
					
						2014-09-03 17:29:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							584984807e 
							
						 
					 
					
						
						
							
							make pattern static  
						
						 
						
						
						
					 
					
						2014-09-03 16:10:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							cb3ba4045e 
							
						 
					 
					
						
						
							
							improve regex, implement pattern cache  
						
						 
						
						
						
					 
					
						2014-09-03 15:39:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2b941d19f8 
							
						 
					 
					
						
						
							
							more openpgp bug fixes  
						
						 
						
						
						
					 
					
						2014-09-03 15:39:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							253438e698 
							
						 
					 
					
						
						
							
							more openpgp bug fixes  
						
						 
						
						
						
					 
					
						2014-09-03 15:33:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							664c9c434f 
							
						 
					 
					
						
						
							
							avoiding resource conflicts  
						
						 
						
						
						
					 
					
						2014-09-03 14:57:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f1494f83ff 
							
						 
					 
					
						
						
							
							fixed pgp signature creation  
						
						 
						
						
						
					 
					
						2014-09-03 13:06:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5ae62f18b4 
							
						 
					 
					
						
						
							
							fixed pgp signature creation  
						
						 
						
						
						
					 
					
						2014-09-03 13:05:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1a09a4706b 
							
						 
					 
					
						
						
							
							added ability to disable notifications for specific conversations -  fixed   #322  
						
						 
						
						
						
					 
					
						2014-09-03 12:36:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1f378bffc8 
							
						 
					 
					
						
						
							
							made emoticon parsing enableable - default false  
						
						 
						
						
						
					 
					
						2014-09-03 09:15:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							97b52abaf9 
							
						 
					 
					
						
						
							
							fixed   #410  by removing that config option  
						
						 
						
						
						
					 
					
						2014-09-02 16:00:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0ae852a633 
							
						 
					 
					
						
						
							
							refactored share with activity  
						
						 
						
						
						
					 
					
						2014-09-02 15:51:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							567827ffca 
							
						 
					 
					
						
						
							
							fixed   #406  
						
						 
						
						
						
					 
					
						2014-09-02 11:31:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c62937016b 
							
						 
					 
					
						
						
							
							rotate avatars  
						
						 
						
						... 
						
						
						
						Conflicts:
	src/eu/siacs/conversations/persistance/FileBackend.java 
						
					 
					
						2014-09-02 11:31:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2c9b2e6bf8 
							
						 
					 
					
						
						
							
							fixed   #406  
						
						 
						
						
						
					 
					
						2014-09-02 11:27:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f888b167c6 
							
						 
					 
					
						
						
							
							rotate avatars  
						
						 
						
						
						
					 
					
						2014-09-02 11:19:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6045bcc2eb 
							
						 
					 
					
						
						
							
							Merge pull request  #408  from emdete/unicode_emoticons  
						
						 
						
						... 
						
						
						
						add all whitespaces in regex 
						
					 
					
						2014-09-02 10:39:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							a7b3aa343e 
							
						 
					 
					
						
						
							
							add all whitespaces in regex  
						
						 
						
						
						
					 
					
						2014-09-02 01:18:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6291ebf1a3 
							
						 
					 
					
						
						
							
							Merge pull request  #380  from emdete/unicode_emoticons  
						
						 
						
						... 
						
						
						
						add translation from ascii to unicode emoticons 
						
					 
					
						2014-09-01 23:58:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							546082147a 
							
						 
					 
					
						
						
							
							transform ascii to emoticons (on display only)  
						
						 
						
						
						
					 
					
						2014-09-01 23:48:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d42ea45b1c 
							
						 
					 
					
						
						
							
							fixed   #403  
						
						 
						
						
						
					 
					
						2014-09-01 14:03:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a7881754f5 
							
						 
					 
					
						
						
							
							fixed   #403  
						
						 
						
						
						
					 
					
						2014-09-01 13:51:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								M. Dietrich 
							
						 
					 
					
						
						
						
						
							
						
						
							2acf510ea9 
							
						 
					 
					
						
						
							
							optimize string operations a bit  
						
						 
						
						
						
					 
					
						2014-09-01 10:40:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gayaz Yusipov 
							
						 
					 
					
						
						
						
						
							
						
						
							5b24534ab6 
							
						 
					 
					
						
						
							
							Contact presenceName property  
						
						 
						
						
						
					 
					
						2014-08-31 23:14:05 +04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3558fa5f5b 
							
						 
					 
					
						
						
							
							deleted unnecessary log  
						
						 
						
						
						
					 
					
						2014-08-31 21:02:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							94389ac22a 
							
						 
					 
					
						
						
							
							show merged time and status in message adapter  
						
						 
						
						
						
					 
					
						2014-08-31 18:55:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							bda7724e31 
							
						 
					 
					
						
						
							
							improvements for merge conditions  
						
						 
						
						
						
					 
					
						2014-08-31 18:21:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							28fa48704d 
							
						 
					 
					
						
						
							
							add missing blank before nick  
						
						 
						
						
						
					 
					
						2014-08-31 17:48:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Bahtiar `kalkin-` Gadimov 
							
						 
					 
					
						
						
						
						
							
						
						
							3e3451bcff 
							
						 
					 
					
						
						
							
							Smarter nickname highlight insert in confernces  
						
						 
						
						
						
					 
					
						2014-08-31 17:24:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1ac5be4855 
							
						 
					 
					
						
						
							
							some code cleanup  
						
						 
						
						
						
					 
					
						2014-08-31 16:28:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d456085e5 
							
						 
					 
					
						
						
							
							Merge pull request  #391  from betheg/fix_typo  
						
						 
						
						... 
						
						
						
						fix forgotten spelling. 
						
					 
					
						2014-08-31 15:56:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1cc16161ef 
							
						 
					 
					
						
						
							
							require encrypted to be the same for messages to get merged  
						
						 
						
						
						
					 
					
						2014-08-31 15:54:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8f8d4e320d 
							
						 
					 
					
						
						
							
							experimental message merging  
						
						 
						
						
						
					 
					
						2014-08-31 14:29:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							969cba5ee6 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/development' into fix_typo  
						
						 
						
						
						
					 
					
						2014-08-30 14:00:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gayaz Yusipov 
							
						 
					 
					
						
						
						
						
							
						
						
							ec6220969d 
							
						 
					 
					
						
						
							
							XEP-0172  
						
						 
						
						
						
					 
					
						2014-08-30 14:26:46 +04: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 
							
						 
					 
					
						
						
						
						
							
						
						
							6d82a69ba3 
							
						 
					 
					
						
						
							
							send inactive or active on every connect and resume  
						
						 
						
						
						
					 
					
						2014-08-30 09:22:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							265bd06250 
							
						 
					 
					
						
						
							
							added basic csi  
						
						 
						
						
						
					 
					
						2014-08-30 09:22:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9ad5c6925d 
							
						 
					 
					
						
						
							
							version bump to 0.6 with changelogs  
						
						 
						
						
						
					 
					
						2014-08-30 08:51:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8840d082ba 
							
						 
					 
					
						
						
							
							brought npe catcher back for kxml parser  
						
						 
						
						
						
					 
					
						2014-08-30 08:31:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							3714947d5f 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'upstream/development' into fix_typo  
						
						 
						
						
						
					 
					
						2014-08-29 23:30:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5450a2ae46 
							
						 
					 
					
						
						
							
							fixed link to old resource  
						
						 
						
						
						
					 
					
						2014-08-29 14:05:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b0d777d9ca 
							
						 
					 
					
						
						
							
							fixed npe  
						
						 
						
						
						
					 
					
						2014-08-29 12:14:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							33172246c9 
							
						 
					 
					
						
						
							
							fixed   #389  
						
						 
						
						
						
					 
					
						2014-08-29 10:24:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							98dabe9ab4 
							
						 
					 
					
						
						
							
							fix forgotten spelling.  
						
						 
						
						
						
					 
					
						2014-08-28 16:49:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							85b31b8d8b 
							
						 
					 
					
						
						
							
							fixed spelling thanks @betheg  
						
						 
						
						
						
					 
					
						2014-08-28 11:01:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							431d4ed44b 
							
						 
					 
					
						
						
							
							translated missing string in settings  
						
						 
						
						
						
					 
					
						2014-08-27 09:43:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							450b911cb2 
							
						 
					 
					
						
						
							
							fixing duplicate private muc messages  
						
						 
						
						
						
					 
					
						2014-08-25 19:20:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							07b422d4c8 
							
						 
					 
					
						
						
							
							fixed message hint  
						
						 
						
						
						
					 
					
						2014-08-25 15:43:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4e791c8a01 
							
						 
					 
					
						
						
							
							fixed faulty db creation on first install  
						
						 
						
						
						
					 
					
						2014-08-24 20:53:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a30bc8a3e2 
							
						 
					 
					
						
						
							
							use otr encrypiton instead of plain when contact has exactly one online presence and an otr fingerprint  
						
						 
						
						
						
					 
					
						2014-08-24 11:21:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e0b759340d 
							
						 
					 
					
						
						
							
							jump right into edit account if now accounts are configured  
						
						 
						
						
						
					 
					
						2014-08-23 21:31:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d504daec16 
							
						 
					 
					
						
						
							
							changed workflow on inital avatar publication  
						
						 
						
						
						
					 
					
						2014-08-23 20:00:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f7437ecc36 
							
						 
					 
					
						
						
							
							experimental muc message deduplication  
						
						 
						
						
						
					 
					
						2014-08-23 15:57:39 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							9b0bf9b5bc 
							
						 
					 
					
						
						
							
							fixed another npe  
						
						 
						
						
						
					 
					
						2014-08-22 13:22:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c40c8ee910 
							
						 
					 
					
						
						
							
							tiny redesign for private muc messages  
						
						 
						
						
						
					 
					
						2014-08-22 13:22:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4875b52f09 
							
						 
					 
					
						
						
							
							make avatars persisent / available even without internet  
						
						 
						
						
						
					 
					
						2014-08-21 12:32:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							301477c764 
							
						 
					 
					
						
						
							
							save newly taken photos in DCIM dir  
						
						 
						
						
						
					 
					
						2014-08-21 09:19:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7808e5b77f 
							
						 
					 
					
						
						
							
							added roster versioning to calculation of server compat  
						
						 
						
						
						
					 
					
						2014-08-21 07:47:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7f5456e41b 
							
						 
					 
					
						
						
							
							check if service is bound before adding conferences or contacts  
						
						 
						
						
						
					 
					
						2014-08-21 07:46:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9f4043c679 
							
						 
					 
					
						
						
							
							avoid race condition for otr key in jingle  
						
						 
						
						
						
					 
					
						2014-08-21 07:39:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							bd467b6b9d 
							
						 
					 
					
						
						
							
							deregister listener in editaccount  
						
						 
						
						
						
					 
					
						2014-08-21 07:38:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							06da080371 
							
						 
					 
					
						
						
							
							revised manage account activity. removed contexual action mode  
						
						 
						
						
						
					 
					
						2014-08-20 11:32:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6345217328 
							
						 
					 
					
						
						
							
							fixed lint error  
						
						 
						
						
						
					 
					
						2014-08-19 15:27:26 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							38f36aa263 
							
						 
					 
					
						
						
							
							more error handling for avatar publication  
						
						 
						
						
						
					 
					
						2014-08-16 17:31:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5aa8afdc1c 
							
						 
					 
					
						
						
							
							some improvements for the edit account activity  
						
						 
						
						
						
					 
					
						2014-08-16 09:44:37 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							9c18d57e07 
							
						 
					 
					
						
						
							
							refactored Conversations Adapter into seperate class  
						
						 
						
						
						
					 
					
						2014-08-15 13:18:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2ab14a6ff2 
							
						 
					 
					
						
						
							
							fixed   #356  
						
						 
						
						
						
					 
					
						2014-08-15 13:11:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							48c780d15a 
							
						 
					 
					
						
						
							
							fixed muc pm avatar  
						
						 
						
						
						
					 
					
						2014-08-14 22:09:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e73a6525c7 
							
						 
					 
					
						
						
							
							fixed bug in caps hash generation. thanks Asterix of the Gajim project  
						
						 
						
						
						
					 
					
						2014-08-14 13:41:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							510d8a2ae3 
							
						 
					 
					
						
						
							
							another rare npe fixed  
						
						 
						
						
						
					 
					
						2014-08-14 09:59:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b2cc17c362 
							
						 
					 
					
						
						
							
							trying to fix rotation problems  
						
						 
						
						
						
					 
					
						2014-08-13 13:44:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							457e7be5e2 
							
						 
					 
					
						
						
							
							fixed   #348  
						
						 
						
						
						
					 
					
						2014-08-13 11:22:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a4faa158c0 
							
						 
					 
					
						
						
							
							only notify ui on significant muc changes  
						
						 
						
						
						
					 
					
						2014-08-13 11:21:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							07e6873025 
							
						 
					 
					
						
						
							
							try to make openpgp a little more reliable  
						
						 
						
						
						
					 
					
						2014-08-13 11:21:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5477ff1aea 
							
						 
					 
					
						
						
							
							fixed weird snackbar click issues  
						
						 
						
						
						
					 
					
						2014-08-12 23:23:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							721b308f28 
							
						 
					 
					
						
						
							
							fixed long press to bring back default in publish avatar activity  
						
						 
						
						
						
					 
					
						2014-08-12 21:03:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6952e630c4 
							
						 
					 
					
						
						
							
							show user name as well in confernce details if real name was shown  
						
						 
						
						
						
					 
					
						2014-08-12 11:36:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5ed9c2a805 
							
						 
					 
					
						
						
							
							show own avatar in muc details  
						
						 
						
						
						
					 
					
						2014-08-11 23:22:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8a82586d5b 
							
						 
					 
					
						
						
							
							fixed avatar in notification  
						
						 
						
						
						
					 
					
						2014-08-11 23:18:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f247abc2dc 
							
						 
					 
					
						
						
							
							handle bare jid presences. fixes for otr  
						
						 
						
						
						
					 
					
						2014-08-11 13:46:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9960cb819e 
							
						 
					 
					
						
						
							
							Merge pull request  #344  from 1nsan3/development  
						
						 
						
						... 
						
						
						
						Hardware search button 
						
					 
					
						2014-08-11 12:52:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gero Kraus 
							
						 
					 
					
						
						
						
						
							
						
						
							70423204f4 
							
						 
					 
					
						
						
							
							Updated StartConversationActivity to react on Search Button Pressing  
						
						 
						
						
						
					 
					
						2014-08-10 21:03:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b35aa3ed07 
							
						 
					 
					
						
						
							
							added limited private muc chat feature (messages are now properly marked) - long press on user icon will sent private messages.  fixed   #259  
						
						 
						
						
						
					 
					
						2014-08-10 15:27:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6de53791b5 
							
						 
					 
					
						
						
							
							fixed rare npe after race condition  
						
						 
						
						
						
					 
					
						2014-08-10 14:04:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1a6e42e7c1 
							
						 
					 
					
						
						
							
							potential fix for rejected execution exception  
						
						 
						
						
						
					 
					
						2014-08-10 14:04:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0cda7f7819 
							
						 
					 
					
						
						
							
							work around xml parser issues...  
						
						 
						
						
						
					 
					
						2014-08-09 11:37:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d486d5def9 
							
						 
					 
					
						
						
							
							trying to fix activity has been destroyed error  
						
						 
						
						
						
					 
					
						2014-08-09 11:37:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a33bf0b4ae 
							
						 
					 
					
						
						
							
							show add to roster dialog when trying to start otr session  
						
						 
						
						
						
					 
					
						2014-08-09 11:36:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a059dfab2c 
							
						 
					 
					
						
						
							
							fixed very rare npe  
						
						 
						
						
						
					 
					
						2014-08-09 11:35:49 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							0bab1a4613 
							
						 
					 
					
						
						
							
							bug fix for 'back to default'  
						
						 
						
						
						
					 
					
						2014-08-09 09:44:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							96a41b5b51 
							
						 
					 
					
						
						
							
							ability to bring default picture back with long press in publish avatar  
						
						 
						
						
						
					 
					
						2014-08-09 09:38:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f6615843f9 
							
						 
					 
					
						
						
							
							grant uri permission on share picture  
						
						 
						
						
						
					 
					
						2014-08-09 09:38:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							de2964cd25 
							
						 
					 
					
						
						
							
							more fixes for notfication in conferences  
						
						 
						
						
						
					 
					
						2014-08-09 09:37:37 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							620d1df82e 
							
						 
					 
					
						
						
							
							fixed   #320  
						
						 
						
						
						
					 
					
						2014-08-07 14:09:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6536c1aeb1 
							
						 
					 
					
						
						
							
							bug fix for not working notification grace period in muc  
						
						 
						
						
						
					 
					
						2014-08-07 11:02:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2b4d9e8b60 
							
						 
					 
					
						
						
							
							fixed problems with sha sum calculation on avatar write. delete avatars with non matching sha sum  
						
						 
						
						
						
					 
					
						2014-08-06 18:36:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ba63727f50 
							
						 
					 
					
						
						
							
							fetch missing avatars from server  
						
						 
						
						
						
					 
					
						2014-08-05 22:58:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							08755e56a5 
							
						 
					 
					
						
						
							
							show own avatar after publication. no persistancy yet  
						
						 
						
						
						
					 
					
						2014-08-05 13:00:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9aba9a4059 
							
						 
					 
					
						
						
							
							error messages for publish avatar  
						
						 
						
						
						
					 
					
						2014-08-05 12:21:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f8b4d5f338 
							
						 
					 
					
						
						
							
							publish avatars  
						
						 
						
						
						
					 
					
						2014-08-05 01:36:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							629ff3afcd 
							
						 
					 
					
						
						
							
							proper account send to publish avatar activity  
						
						 
						
						
						
					 
					
						2014-08-03 20:42:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							daab16bdef 
							
						 
					 
					
						
						
							
							activity for future avatar publications. not working yet  
						
						 
						
						
						
					 
					
						2014-08-03 20:28:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							88d1bd356c 
							
						 
					 
					
						
						
							
							get rid of 'use phones self contact picture option'  
						
						 
						
						
						
					 
					
						2014-07-31 15:18:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							990f0f6d73 
							
						 
					 
					
						
						
							
							refactored account array adapter into seperate class. added account image  
						
						 
						
						
						
					 
					
						2014-07-31 15:09:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							27b306444b 
							
						 
					 
					
						
						
							
							fixed   #326   fixed   #202  
						
						 
						
						
						
					 
					
						2014-07-31 13:26:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							511f74116f 
							
						 
					 
					
						
						
							
							fixed npe for the rare case that user has disabled his action bar  
						
						 
						
						
						
					 
					
						2014-07-30 21:30:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							88e5713a80 
							
						 
					 
					
						
						
							
							fixed npe in start conversation activity  
						
						 
						
						
						
					 
					
						2014-07-30 21:26:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							bc24cf93ab 
							
						 
					 
					
						
						
							
							fixed generation of muc pictures with copyonwrite user list  
						
						 
						
						
						
					 
					
						2014-07-30 21:25:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fe46d36137 
							
						 
					 
					
						
						
							
							fixed rare npe in loading of selfi  
						
						 
						
						
						
					 
					
						2014-07-30 21:24:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1521b91b27 
							
						 
					 
					
						
						
							
							fixed   #239  - show contact names and pictures in muc if real jid is known  
						
						 
						
						
						
					 
					
						2014-07-29 14:42:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4c90bd9b46 
							
						 
					 
					
						
						
							
							fixed bug in message parser  
						
						 
						
						
						
					 
					
						2014-07-27 22:31:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0e93e5ce52 
							
						 
					 
					
						
						
							
							trying to work around npe in androids xml parser  
						
						 
						
						
						
					 
					
						2014-07-27 19:06:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f8fedeb697 
							
						 
					 
					
						
						
							
							fixe race conditons with newIntent  
						
						 
						
						
						
					 
					
						2014-07-27 19:05:39 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							5182a92e58 
							
						 
					 
					
						
						
							
							fixed npe when user was very quick with starting to type in startConversationactivity  
						
						 
						
						
						
					 
					
						2014-07-26 15:44:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							52ad718251 
							
						 
					 
					
						
						
							
							removed duplicates from muc suggestions  
						
						 
						
						
						
					 
					
						2014-07-24 17:21:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c7c3db478a 
							
						 
					 
					
						
						
							
							included version string in crash reports  
						
						 
						
						
						
					 
					
						2014-07-24 12:33:56 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							983104f2f0 
							
						 
					 
					
						
						
							
							presonalized read up to this point message  
						
						 
						
						
						
					 
					
						2014-07-24 01:17:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7ee2ef5233 
							
						 
					 
					
						
						
							
							answer correctly if both markers and receipts are requested  
						
						 
						
						
						
					 
					
						2014-07-24 01:04:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							23e5fb5d56 
							
						 
					 
					
						
						
							
							fixed bug with otr session being initilized over and over again  
						
						 
						
						
						
					 
					
						2014-07-23 18:04:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5c118f6dd7 
							
						 
					 
					
						
						
							
							more disco. fixed chat markers with jappix  
						
						 
						
						
						
					 
					
						2014-07-23 14:30:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1f4ea552cd 
							
						 
					 
					
						
						
							
							some cleanup  
						
						 
						
						
						
					 
					
						2014-07-22 18:58:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4607e2c546 
							
						 
					 
					
						
						
							
							switched to mtm  
						
						 
						
						
						
					 
					
						2014-07-22 17:27:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9fcc195a6d 
							
						 
					 
					
						
						
							
							brought settings and manage account menu items back  
						
						 
						
						
						
					 
					
						2014-07-22 17:23:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							84642b7492 
							
						 
					 
					
						
						
							
							refactored message adapter into seperate class  
						
						 
						
						
						
					 
					
						2014-07-22 15:31:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							66e3ccc2dc 
							
						 
					 
					
						
						
							
							save login nick for mucs during join  
						
						 
						
						
						
					 
					
						2014-07-21 22:57:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e3ebccc762 
							
						 
					 
					
						
						
							
							back to normal invites.  fixed   #298  
						
						 
						
						
						
					 
					
						2014-07-21 19:55:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b223784560 
							
						 
					 
					
						
						
							
							added hint to explain the contact has read up to this point  
						
						 
						
						
						
					 
					
						2014-07-21 19:54:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a787f58a90 
							
						 
					 
					
						
						
							
							fixed   #292  
						
						 
						
						
						
					 
					
						2014-07-21 18:20:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2fe20ffa8e 
							
						 
					 
					
						
						
							
							fixed   #267  
						
						 
						
						
						
					 
					
						2014-07-21 16:16:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f9ed76f5e1 
							
						 
					 
					
						
						
							
							switched to direct invites.  fixes   #284  
						
						 
						
						
						
					 
					
						2014-07-21 16:04:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							87aff4c6d8 
							
						 
					 
					
						
						
							
							fixed bug where presence requests where sent on display of contact details  
						
						 
						
						
						
					 
					
						2014-07-21 15:17:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							aa844df144 
							
						 
					 
					
						
						
							
							fixed   #290  
						
						 
						
						
						
					 
					
						2014-07-21 15:16:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3b7f89bbb0 
							
						 
					 
					
						
						
							
							disable subscription checkboxes when account is offline  
						
						 
						
						
						
					 
					
						2014-07-20 13:21:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							542cbef53b 
							
						 
					 
					
						
						
							
							hide verify snackbar when otr session is ended. fixed npe  
						
						 
						
						
						
					 
					
						2014-07-20 12:36:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b5005d60de 
							
						 
					 
					
						
						
							
							simplified presence subscription in contact details  
						
						 
						
						
						
					 
					
						2014-07-20 03:14:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							185c485fc6 
							
						 
					 
					
						
						
							
							fixed   #254  
						
						 
						
						
						
					 
					
						2014-07-20 02:34:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							22e504b8f9 
							
						 
					 
					
						
						
							
							ignore groupchats messages that are pending leave  
						
						 
						
						
						
					 
					
						2014-07-20 02:26:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c65600edc9 
							
						 
					 
					
						
						
							
							pending leaves and joins for muc  
						
						 
						
						
						
					 
					
						2014-07-18 21:57:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9cfb4ee6c3 
							
						 
					 
					
						
						
							
							only show muc errors if actually connected  
						
						 
						
						
						
					 
					
						2014-07-18 19:36:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4307b1de72 
							
						 
					 
					
						
						
							
							notify ui on roster changes  
						
						 
						
						
						
					 
					
						2014-07-18 15:35:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6b74c0594e 
							
						 
					 
					
						
						
							
							show snackbar if conference was not found  
						
						 
						
						
						
					 
					
						2014-07-18 12:44:33 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							38a9242955 
							
						 
					 
					
						
						
							
							brought muc invites back. + couple of bug fixes + refactoring  
						
						 
						
						
						
					 
					
						2014-07-17 00:03:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							670dead695 
							
						 
					 
					
						
						
							
							improvements on the dublicate muc messages issue  
						
						 
						
						
						
					 
					
						2014-07-16 19:03:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							02351de94b 
							
						 
					 
					
						
						
							
							made grace period work for muc as well  
						
						 
						
						
						
					 
					
						2014-07-16 12:45:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0ec1c022b9 
							
						 
					 
					
						
						
							
							fixed rare npe  
						
						 
						
						
						
					 
					
						2014-07-16 12:42:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e79a34b651 
							
						 
					 
					
						
						
							
							redesigned muc details a little bit  
						
						 
						
						
						
					 
					
						2014-07-16 12:34:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9532a9889b 
							
						 
					 
					
						
						
							
							couple of bug fixes related to muc renaming  
						
						 
						
						
						
					 
					
						2014-07-15 21:54:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							177e802a77 
							
						 
					 
					
						
						
							
							fixed   #276  
						
						 
						
						
						
					 
					
						2014-07-15 20:41:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e20842608b 
							
						 
					 
					
						
						
							
							unregister bookmark on conversation when bookmark is deleted  
						
						 
						
						
						
					 
					
						2014-07-15 20:41:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fc5143734e 
							
						 
					 
					
						
						
							
							added confirm dialog before contact and bookmark removal  
						
						 
						
						
						
					 
					
						2014-07-15 19:41:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ed4d0d38e3 
							
						 
					 
					
						
						
							
							bug fix on deleting conference bookmarks  
						
						 
						
						
						
					 
					
						2014-07-15 17:19:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2a82f23f36 
							
						 
					 
					
						
						
							
							use nick from bookmark if available  
						
						 
						
						
						
					 
					
						2014-07-15 17:11:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2ebd92b7a7 
							
						 
					 
					
						
						
							
							pushing bookmarks back to server  
						
						 
						
						
						
					 
					
						2014-07-15 14:32:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6031af8606 
							
						 
					 
					
						
						
							
							use proper picture on bookmarked conferences when joined. use bookmark title when no subject is set  
						
						 
						
						
						
					 
					
						2014-07-14 17:13:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e2f886d121 
							
						 
					 
					
						
						
							
							fetch bookmarks from server  
						
						 
						
						
						
					 
					
						2014-07-14 11:47:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9968ae5260 
							
						 
					 
					
						
						
							
							refactored ui listeners a little bit  
						
						 
						
						
						
					 
					
						2014-07-12 13:42:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fd5760d27a 
							
						 
					 
					
						
						
							
							made conversation list thread safe  
						
						 
						
						
						
					 
					
						2014-07-12 12:41:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c512d98b74 
							
						 
					 
					
						
						
							
							moved iq parser to seperate class as well  
						
						 
						
						
						
					 
					
						2014-07-12 12:28:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							99fe44a737 
							
						 
					 
					
						
						
							
							cleanup for presence parser  
						
						 
						
						
						
					 
					
						2014-07-12 11:13:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							99935dd630 
							
						 
					 
					
						
						
							
							moved most of the message/presence generation into seperate classes  
						
						 
						
						
						
					 
					
						2014-07-12 03:44:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							789383e5cb 
							
						 
					 
					
						
						
							
							made message parser and presence parser implement interface On*PacketReceived  
						
						 
						
						
						
					 
					
						2014-07-12 02:36:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7a26f27212 
							
						 
					 
					
						
						
							
							switch SearchView with custom action view  
						
						 
						
						
						
					 
					
						2014-07-11 23:44:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							610df2eddc 
							
						 
					 
					
						
						
							
							added join conference dialog  
						
						 
						
						
						
					 
					
						2014-07-11 19:48:41 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							690ee4988e 
							
						 
					 
					
						
						
							
							improved iterating over hashmap  
						
						 
						
						
						
					 
					
						2014-07-11 19:48:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2b14ad51ec 
							
						 
					 
					
						
						
							
							fishing invites and delivery reports out of carbon copied messages  
						
						 
						
						
						
					 
					
						2014-07-11 14:49:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							beb82310da 
							
						 
					 
					
						
						
							
							made jingle connection array thread safe  
						
						 
						
						
						
					 
					
						2014-07-11 14:26:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0193e0291c 
							
						 
					 
					
						
						
							
							cleanup. removed old contacts activity. WARNING: this will temporarly disable muc invites  
						
						 
						
						
						
					 
					
						2014-07-11 14:07:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f6649ef838 
							
						 
					 
					
						
						
							
							changed 'show time threshold' to 6h  
						
						 
						
						
						
					 
					
						2014-07-11 13:55:29 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e7a0040ec5 
							
						 
					 
					
						
						
							
							fixed   #255  and made some other improvements to the subscription mgmt  
						
						 
						
						
						
					 
					
						2014-07-11 13:52:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8ebd14cef4 
							
						 
					 
					
						
						
							
							Merge pull request  #262  from kruks23/development  
						
						 
						
						... 
						
						
						
						Show time in messages previous days 
						
					 
					
						2014-07-11 13:12:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							355a6d1723 
							
						 
					 
					
						
						
							
							dirty push / delete flags are not set/reset correctly  
						
						 
						
						
						
					 
					
						2014-07-10 23:49:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a523127a80 
							
						 
					 
					
						
						
							
							fixed   #38  
						
						 
						
						
						
					 
					
						2014-07-10 19:42:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							bb6e732ca1 
							
						 
					 
					
						
						
							
							Show time in messages previous days  
						
						 
						
						
						
					 
					
						2014-07-10 18:04:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							8379f69516 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-07-10 15:13:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e97b524455 
							
						 
					 
					
						
						
							
							added create contact dialog  
						
						 
						
						
						
					 
					
						2014-07-10 13:19:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f8763015eb 
							
						 
					 
					
						
						
							
							added contextual menu for contacts  
						
						 
						
						
						
					 
					
						2014-07-10 01:55:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2684ecda1e 
							
						 
					 
					
						
						
							
							small changes  
						
						 
						
						
						
					 
					
						2014-07-10 00:53:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							203c85e114 
							
						 
					 
					
						
						
							
							made searchview text color white  
						
						 
						
						
						
					 
					
						2014-07-10 00:53:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3bdf84b6a0 
							
						 
					 
					
						
						
							
							filter contacts and starting confercenes  
						
						 
						
						
						
					 
					
						2014-07-10 00:53:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7c3f3b2a3e 
							
						 
					 
					
						
						
							
							added group add button  
						
						 
						
						
						
					 
					
						2014-07-10 00:53:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c1ee9e682a 
							
						 
					 
					
						
						
							
							added action bar menu to start conversation  
						
						 
						
						
						
					 
					
						2014-07-10 00:53:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							502a1bdb9c 
							
						 
					 
					
						
						
							
							changed support lib to v13. added tabs and fragments to start conversation activity  
						
						 
						
						
						
					 
					
						2014-07-10 00:53:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9260ed4047 
							
						 
					 
					
						
						
							
							inital activity  
						
						 
						
						
						
					 
					
						2014-07-10 00:53:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							c7088489bd 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						 
						
						
						
					 
					
						2014-07-09 22:05:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6e3e1d310a 
							
						 
					 
					
						
						
							
							unified warnings/error msgs  
						
						 
						
						
						
					 
					
						2014-07-09 21:45:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							71324261e5 
							
						 
					 
					
						
						
							
							Show time in messages previous days  
						
						 
						
						
						
					 
					
						2014-07-08 21:13:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							da0b426125 
							
						 
					 
					
						
						
							
							contact tiles follow material colors as well  
						
						 
						
						
						
					 
					
						2014-07-08 11:42:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d4ce42ac84 
							
						 
					 
					
						
						
							
							made account jid lowercase  
						
						 
						
						
						
					 
					
						2014-07-04 16:25:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c68777c67c 
							
						 
					 
					
						
						
							
							made contact jids lower case  
						
						 
						
						
						
					 
					
						2014-07-04 16:22:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							363682065d 
							
						 
					 
					
						
						
							
							added timeout to jingle socket  
						
						 
						
						
						
					 
					
						2014-07-03 22:55:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f33d2497f8 
							
						 
					 
					
						
						
							
							more xmlpullparser fixes  
						
						 
						
						
						
					 
					
						2014-07-03 22:53:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							32648ec859 
							
						 
					 
					
						
						
							
							Merge branch 'development'  
						
						 
						
						
						
					 
					
						2014-07-03 11:43:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e02ae4cde2 
							
						 
					 
					
						
						
							
							fixed array out of bounds in isMuc  
						
						 
						
						
						
					 
					
						2014-07-03 11:32:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c2af2ef812 
							
						 
					 
					
						
						
							
							enabled anti alising for tiles  
						
						 
						
						
						
					 
					
						2014-07-02 10:43:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							655ce10843 
							
						 
					 
					
						
						
							
							allow state loss on fragment change  
						
						 
						
						
						
					 
					
						2014-07-01 14:56:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6028bf4ee2 
							
						 
					 
					
						
						
							
							fixed npe on rare occasion of show element in presence being null  
						
						 
						
						
						
					 
					
						2014-07-01 14:53:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2738d834b4 
							
						 
					 
					
						
						
							
							fixed   #216  
						
						 
						
						
						
					 
					
						2014-07-01 13:31:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4070c33605 
							
						 
					 
					
						
						
							
							fixed image sharing with contacts that have multiple presences  
						
						 
						
						
						
					 
					
						2014-07-01 12:57:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fcc5b3674c 
							
						 
					 
					
						
						
							
							removed old notification icon  
						
						 
						
						
						
					 
					
						2014-06-30 21:07:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c86f96e856 
							
						 
					 
					
						
						
							
							fixed rare npe in verify otr fingerprint dialog  
						
						 
						
						
						
					 
					
						2014-06-30 20:29:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							121fb58d5e 
							
						 
					 
					
						
						
							
							possible fix for  #232  
						
						 
						
						
						
					 
					
						2014-06-30 12:01:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dcb21cb9e6 
							
						 
					 
					
						
						
							
							couple of modifications for disco discovery  
						
						 
						
						
						
					 
					
						2014-06-30 11:43:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9a239f6589 
							
						 
					 
					
						
						
							
							fixed   #235  
						
						 
						
						
						
					 
					
						2014-06-30 10:51:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							42ad901356 
							
						 
					 
					
						
						
							
							fixed   #228  
						
						 
						
						
						
					 
					
						2014-06-30 10:46:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							53533ca74e 
							
						 
					 
					
						
						
							
							added error message for  #240  
						
						 
						
						
						
					 
					
						2014-06-30 10:36:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d58d428874 
							
						 
					 
					
						
						
							
							more error handling for jingle connections  
						
						 
						
						
						
					 
					
						2014-06-29 13:44:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8eedc1a57f 
							
						 
					 
					
						
						
							
							raised ping time out  
						
						 
						
						
						
					 
					
						2014-06-27 11:42:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3a57f6df89 
							
						 
					 
					
						
						
							
							faulty otr messages now generate an error  
						
						 
						
						
						
					 
					
						2014-06-26 16:42:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3bb585c020 
							
						 
					 
					
						
						
							
							fixed rare bug with attach image menu  
						
						 
						
						
						
					 
					
						2014-06-26 12:09:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							513b3959dc 
							
						 
					 
					
						
						
							
							moved some try catchs around  
						
						 
						
						
						
					 
					
						2014-06-25 19:16:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							66bb5c9b51 
							
						 
					 
					
						
						
							
							more npe fixes  
						
						 
						
						
						
					 
					
						2014-06-25 17:54:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5db04a37bd 
							
						 
					 
					
						
						
							
							fixed two rare npe  
						
						 
						
						
						
					 
					
						2014-06-25 17:32:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							31657974bf 
							
						 
					 
					
						
						
							
							more kxml fuck ups fixed  
						
						 
						
						
						
					 
					
						2014-06-25 17:24:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d63a9eb306 
							
						 
					 
					
						
						
							
							fixed odd occurrences of a cursor returned by the system being NULL. wtf ukas  
						
						 
						
						
						
					 
					
						2014-06-25 17:21:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							16c63c91e2 
							
						 
					 
					
						
						
							
							wraped stanza writer in try catch  
						
						 
						
						
						
					 
					
						2014-06-25 17:15:40 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							dfbc42ecd7 
							
						 
					 
					
						
						
							
							some fixes for otr with multiple parties  
						
						 
						
						
						
					 
					
						2014-06-25 16:55:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ea261c1032 
							
						 
					 
					
						
						
							
							more otr fixes  
						
						 
						
						
						
					 
					
						2014-06-24 16:14:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6ef9421d35 
							
						 
					 
					
						
						
							
							fixes for offline otr  
						
						 
						
						
						
					 
					
						2014-06-24 15:07:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							18d0e57f52 
							
						 
					 
					
						
						
							
							fixed regression with chat markers not working  
						
						 
						
						
						
					 
					
						2014-06-23 23:29:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d7656dd420 
							
						 
					 
					
						
						
							
							fix for not being able to send otr encrypted images to offline contacts. unconfirmed  
						
						 
						
						
						
					 
					
						2014-06-23 21:48:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							43e276e325 
							
						 
					 
					
						
						
							
							possible better distribution of contact picture colors  
						
						 
						
						
						
					 
					
						2014-06-23 21:13:58 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							fafc5306d7 
							
						 
					 
					
						
						
							
							moved message packet creation into sperate class  
						
						 
						
						
						
					 
					
						2014-06-22 17:24:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f559bd14dd 
							
						 
					 
					
						
						
							
							establish otr connection before sending image  
						
						 
						
						
						
					 
					
						2014-06-22 13:57:57 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							beafb06b6a 
							
						 
					 
					
						
						
							
							clear input field after conference pgp message  
						
						 
						
						
						
					 
					
						2014-06-16 23:43:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7e8c68b698 
							
						 
					 
					
						
						
							
							streamlined onpresenceselected listener  
						
						 
						
						
						
					 
					
						2014-06-16 14:21:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							30a0be2998 
							
						 
					 
					
						
						
							
							fixed bug in intent filter. cleaned share with activity  
						
						 
						
						
						
					 
					
						2014-06-16 14:06:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0102032fc5 
							
						 
					 
					
						
						
							
							added share image intent to android manifest for testing purposes  
						
						 
						
						
						
					 
					
						2014-06-16 14:06:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							41834b5e24 
							
						 
					 
					
						
						
							
							code cleanup / unification  
						
						 
						
						
						
					 
					
						2014-06-16 14:06:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b9477edb53 
							
						 
					 
					
						
						
							
							cleanup; removed unnecessary imports and log outputs  
						
						 
						
						
						
					 
					
						2014-06-16 12:18:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							febf23de1f 
							
						 
					 
					
						
						
							
							Rounded minutes ago and last seen + Update Spanish Translations  
						
						 
						
						
						
					 
					
						2014-06-15 18:27:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Steven Dee 
							
						 
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7f1a4a6fb8 
							
						 
					 
					
						
						
							
							infite scrolling  
						
						 
						
						
						
					 
					
						2014-06-14 16:59:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7bdee8c19b 
							
						 
					 
					
						
						
							
							fixed   #197  
						
						 
						
						
						
					 
					
						2014-06-14 14:27:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							471ed7838a 
							
						 
					 
					
						
						
							
							fixed   #204  
						
						 
						
						
						
					 
					
						2014-06-14 10:29:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d067448808 
							
						 
					 
					
						
						
							
							offline sending of images  
						
						 
						
						
						
					 
					
						2014-06-13 18:16:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							76f3894107 
							
						 
					 
					
						
						
							
							status waiting for images sent offline  
						
						 
						
						
						
					 
					
						2014-06-13 15:05:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							eb7ed78605 
							
						 
					 
					
						
						
							
							moved last seen to contact details  
						
						 
						
						
						
					 
					
						2014-06-13 11:50:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							899da61555 
							
						 
					 
					
						
						
							
							further bullet proofing  
						
						 
						
						
						
					 
					
						2014-06-13 11:16:52 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a92fb88e51 
							
						 
					 
					
						
						
							
							fixed   #201  
						
						 
						
						
						
					 
					
						2014-06-13 10:39:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							592aded106 
							
						 
					 
					
						
						
							
							finished offline otr  
						
						 
						
						
						
					 
					
						2014-06-12 23:04:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b1482212b8 
							
						 
					 
					
						
						
							
							fire onContactStatusChanged only on online/offline changes. not on status changes  
						
						 
						
						
						
					 
					
						2014-06-12 18:27:50 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							bb90452673 
							
						 
					 
					
						
						
							
							groundwork for offline otr messages  
						
						 
						
						
						
					 
					
						2014-06-11 21:53:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							95f1a3d57d 
							
						 
					 
					
						
						
							
							select presence dialog now suggests last used presence  
						
						 
						
						
						
					 
					
						2014-06-10 17:34:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							285ffa86e7 
							
						 
					 
					
						
						
							
							fixed scrolling issues  
						
						 
						
						
						
					 
					
						2014-06-10 17:01:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2eb2bac3e6 
							
						 
					 
					
						
						
							
							cleanup  
						
						 
						
						
						
					 
					
						2014-06-10 14:12:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							c6ffb85d5f 
							
						 
					 
					
						
						
							
							Muc Icon tile color fix  
						
						 
						
						
						
					 
					
						2014-06-10 13:19:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							794b13fcfa 
							
						 
					 
					
						
						
							
							fixing  #184  
						
						 
						
						
						
					 
					
						2014-06-07 19:00:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							60d0881852 
							
						 
					 
					
						
						
							
							removed unnecessary variable in message class  
						
						 
						
						
						
					 
					
						2014-06-07 14:42:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							71886ed2ab 
							
						 
					 
					
						
						
							
							localized date. rounded minutes, hours and dates in last seen  
						
						 
						
						
						
					 
					
						2014-06-07 13:57:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ea8f3a2675 
							
						 
					 
					
						
						
							
							possible fix to be able to images and encrypted messages at a faster rate  
						
						 
						
						
						
					 
					
						2014-06-07 13:25:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							df7f7c5c4e 
							
						 
					 
					
						
						
							
							do not just simply resend images  
						
						 
						
						
						
					 
					
						2014-06-06 20:06:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3fd371cd53 
							
						 
					 
					
						
						
							
							fixed last_seen_now  
						
						 
						
						
						
					 
					
						2014-06-06 19:39:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fc656c5571 
							
						 
					 
					
						
						
							
							removed presence from last seen  
						
						 
						
						
						
					 
					
						2014-06-06 19:37:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							246776067a 
							
						 
					 
					
						
						
							
							put xep333 parsing into parser class  
						
						 
						
						
						
					 
					
						2014-06-06 18:49:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							476ab656ef 
							
						 
					 
					
						
						
							
							refactored presence parsing into dedicated class  
						
						 
						
						
						
					 
					
						2014-06-06 18:26:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c489f368b8 
							
						 
					 
					
						
						
							
							added abbrev_all to date format  
						
						 
						
						
						
					 
					
						2014-06-06 16:44:14 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							99e5098780 
							
						 
					 
					
						
						
							
							#158  Try to solve MM/dd date in each locale  
						
						 
						
						
						
					 
					
						2014-06-06 16:15:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a1507d91ff 
							
						 
					 
					
						
						
							
							fixes   #172  
						
						 
						
						
						
					 
					
						2014-06-06 13:59:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5fe926b645 
							
						 
					 
					
						
						
							
							basic last seen feature. no peristancy just yet. no polish  
						
						 
						
						
						
					 
					
						2014-06-06 11:39:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a583471af8 
							
						 
					 
					
						
						
							
							read marker is now a little less in your face  
						
						 
						
						
						
					 
					
						2014-06-05 01:57:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							9a448f822f 
							
						 
					 
					
						
						
							
							image provider path name now with .webp ending  
						
						 
						
						
						
					 
					
						2014-06-04 22:35:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							83e919f8af 
							
						 
					 
					
						
						
							
							experimental gui to display read status  
						
						 
						
						
						
					 
					
						2014-06-04 21:40:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dc50e0a7e3 
							
						 
					 
					
						
						
							
							fixed regression with newly created conversations not being shown properly  
						
						 
						
						
						
					 
					
						2014-06-04 19:25:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7e4e7426ee 
							
						 
					 
					
						
						
							
							received and displayed messages (xep 333) are now marked properly  
						
						 
						
						
						
					 
					
						2014-06-04 18:44:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ba2ad82c7e 
							
						 
					 
					
						
						
							
							more bug fixes for the pgp problem  
						
						 
						
						
						
					 
					
						2014-06-04 12:31:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2f2aa7aa21 
							
						 
					 
					
						
						
							
							fixed pgp on incoming carbon messages  
						
						 
						
						
						
					 
					
						2014-06-04 11:55:38 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							cedc1f40b3 
							
						 
					 
					
						
						
							
							answer to xep 184 message receipts.  fixes   #95  
						
						 
						
						
						
					 
					
						2014-06-03 15:48:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4e82f4337e 
							
						 
					 
					
						
						
							
							added pgp sig on muc rename  
						
						 
						
						
						
					 
					
						2014-06-03 11:04:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5b6140dc64 
							
						 
					 
					
						
						
							
							long press on images revails share with intent  
						
						 
						
						
						
					 
					
						2014-06-02 21:27:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1982151630 
							
						 
					 
					
						
						
							
							linked openkeychain install dialog from decrypt messages box  
						
						 
						
						
						
					 
					
						2014-06-01 19:29:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c17db8e34e 
							
						 
					 
					
						
						
							
							changed roster to concurrent hashmap  
						
						 
						
						
						
					 
					
						2014-06-01 19:17:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							32a21e1ab9 
							
						 
					 
					
						
						
							
							unified crypto messages and made lock icon work for conferences  
						
						 
						
						
						
					 
					
						2014-06-01 19:08:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8ea73feec4 
							
						 
					 
					
						
						
							
							added warning when public keys are missing  
						
						 
						
						
						
					 
					
						2014-06-01 18:52:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							f1505f9f36 
							
						 
					 
					
						
						
							
							Fix tile rendering for larger conferences  
						
						 
						
						
						
					 
					
						2014-06-01 16:30:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1a4b1f8a2f 
							
						 
					 
					
						
						
							
							show dialog when no contact in a muc has pgp support  
						
						 
						
						
						
					 
					
						2014-06-01 11:24:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5d0e1374b2 
							
						 
					 
					
						
						
							
							OpenPGP key display in muc details is now prettier and linked to openkeychain  
						
						 
						
						
						
					 
					
						2014-06-01 10:22:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alethea Butler 
							
						 
					 
					
						
						
						
						
							
						
						
							97957bcfb9 
							
						 
					 
					
						
						
							
							Removed TASK_ON_HOME flag from intent created from share  
						
						 
						
						
						
					 
					
						2014-05-31 13:33:46 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alethea Butler 
							
						 
					 
					
						
						
						
						
							
						
						
							d67d792409 
							
						 
					 
					
						
						
							
							Made the navigateUp override behave like a navigate up  
						
						 
						
						
						
					 
					
						2014-05-31 12:53:23 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alethea Butler 
							
						 
					 
					
						
						
						
						
							
						
						
							b04fd2337e 
							
						 
					 
					
						
						
							
							Refactored into onNavigateUp  
						
						 
						
						
						
					 
					
						2014-05-31 11:50:09 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							15096aa0dd 
							
						 
					 
					
						
						
							
							Merge branch 'development' of github.com:siacs/Conversations into development  
						
						 
						
						
						
					 
					
						2014-05-31 11:55:24 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							57ded7ee58 
							
						 
					 
					
						
						
							
							fixed regression that led to the wakelock not being released again  
						
						 
						
						
						
					 
					
						2014-05-31 11:54:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alethea Butler 
							
						 
					 
					
						
						
						
						
							
						
						
							0edfd36195 
							
						 
					 
					
						
						
							
							Up button goes to contacts after initial setup  
						
						 
						
						
						
					 
					
						2014-05-30 23:41:44 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alethea Butler 
							
						 
					 
					
						
						
						
						
							
						
						
							78686e9bce 
							
						 
					 
					
						
						
							
							Disabled the Home button when it's not the Up button  
						
						 
						
						
						
					 
					
						2014-05-30 23:18:50 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							75b14a1d5c 
							
						 
					 
					
						
						
							
							More harcoded translations + updated Spanish  
						
						 
						
						
						
					 
					
						2014-05-29 18:17:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							655565eccc 
							
						 
					 
					
						
						
							
							display pgp key id in muc details and use keys to encrypt groupchat  
						
						 
						
						
						
					 
					
						2014-05-28 10:41:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b605577cd9 
							
						 
					 
					
						
						
							
							encrypted group messages are now properly decrypted  
						
						 
						
						
						
					 
					
						2014-05-28 10:41:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fd4897e1a5 
							
						 
					 
					
						
						
							
							first tries on crypto muc  
						
						 
						
						
						
					 
					
						2014-05-28 10:41:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e348afac54 
							
						 
					 
					
						
						
							
							possible fix for  #149  and  #142  
						
						 
						
						
						
					 
					
						2014-05-28 10:37:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7f825f8027 
							
						 
					 
					
						
						
							
							error msg on offline subscription changes  
						
						 
						
						
						
					 
					
						2014-05-24 11:17:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							03854f30c9 
							
						 
					 
					
						
						
							
							Merge pull request  #146  from kruks23/development  
						
						 
						
						... 
						
						
						
						More harcoded translations + Spanish 
						
					 
					
						2014-05-24 10:03:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							00377b64c7 
							
						 
					 
					
						
						
							
							Merge pull request  #140  from strb/mucicons  
						
						 
						
						... 
						
						
						
						Refactored unknown contact picture generation 
						
					 
					
						2014-05-24 10:01:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							d74faa3f7c 
							
						 
					 
					
						
						
							
							More harcoded translations + Spanish  
						
						 
						
						
						
					 
					
						2014-05-24 00:17:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							d6fd0343ae 
							
						 
					 
					
						
						
							
							Title activities translations + contacts translations + update Spanish Translations  
						
						 
						
						
						
					 
					
						2014-05-23 16:20: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 
							
						 
					 
					
						
						
						
						
							
						
						
							a5d54d70ee 
							
						 
					 
					
						
						
							
							code cleanup  
						
						 
						
						
						
					 
					
						2014-05-23 10:07:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							950165033b 
							
						 
					 
					
						
						
							
							Contact details translations + update spanish translations  
						
						 
						
						
						
					 
					
						2014-05-22 22:58:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b99779432c 
							
						 
					 
					
						
						
							
							offline crud of contacts  
						
						 
						
						
						
					 
					
						2014-05-22 14:33:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ad960b393d 
							
						 
					 
					
						
						
							
							implementet missing methods on the new roster mgmt  
						
						 
						
						
						
					 
					
						2014-05-22 12:57:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f0d2ca260e 
							
						 
					 
					
						
						
							
							fixed   #136  
						
						 
						
						
						
					 
					
						2014-05-22 09:36:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1db807ef58 
							
						 
					 
					
						
						
							
							write contacts on system shutdown  
						
						 
						
						
						
					 
					
						2014-05-21 22:22:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5a6da5afaa 
							
						 
					 
					
						
						
							
							Merge branch 'development' of github.com:siacs/Conversations into development  
						
						 
						
						
						
					 
					
						2014-05-21 20:28:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6d90a5cd57 
							
						 
					 
					
						
						
							
							further improvment trying to deal with large images  
						
						 
						
						
						
					 
					
						2014-05-21 20:27:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							0883de0701 
							
						 
					 
					
						
						
							
							Refactored unknown contact picture generation  
						
						 
						
						... 
						
						
						
						Introduce drawTile method in order to remove code duplication 
						
					 
					
						2014-05-21 18:28:51 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							2674d40704 
							
						 
					 
					
						
						
							
							Fix highlight detection in MUC channels  
						
						 
						
						... 
						
						
						
						We only detect highlights if a word starts with the nick (matched in
case insensitive manner), followed by optional punctuation, followed by
another word boundary. 
						
					 
					
						2014-05-21 18:05:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0de9d57420 
							
						 
					 
					
						
						
							
							cleaned up shared text  
						
						 
						
						
						
					 
					
						2014-05-21 16:43:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9d2ce5ff98 
							
						 
					 
					
						
						
							
							auto retry image compression with decreasing sample size  
						
						 
						
						
						
					 
					
						2014-05-21 00:39:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fa9cbeb746 
							
						 
					 
					
						
						
							
							close input stream  
						
						 
						
						
						
					 
					
						2014-05-20 22:54:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7f0efa089f 
							
						 
					 
					
						
						
							
							trying to deal with larger images  
						
						 
						
						
						
					 
					
						2014-05-20 22:52:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							aba1ca7918 
							
						 
					 
					
						
						
							
							Update Spanish Translations + harcoded just_now  
						
						 
						
						
						
					 
					
						2014-05-20 18:49:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f79d92ab67 
							
						 
					 
					
						
						
							
							highlight people in conferences by clicken on their picture  
						
						 
						
						
						
					 
					
						2014-05-20 11:44:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							13f9f23946 
							
						 
					 
					
						
						
							
							fixed ping time out after session resume  
						
						 
						
						
						
					 
					
						2014-05-20 11:05:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8f92d8d109 
							
						 
					 
					
						
						
							
							ported pending subscription support to new roster mgmt  
						
						 
						
						
						
					 
					
						2014-05-20 10:48:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							371c985c25 
							
						 
					 
					
						
						
							
							made roster persistant aka enabled versioning again  
						
						 
						
						
						
					 
					
						2014-05-19 21:05:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a6f9a742c0 
							
						 
					 
					
						
						
							
							some code cleanup to deal with the roster mgmt changes from earlier  
						
						 
						
						
						
					 
					
						2014-05-19 15:39:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							993477cd83 
							
						 
					 
					
						
						
							
							reworked roster/contact handling. might break some stuff. not sycing to disk yet  
						
						 
						
						
						
					 
					
						2014-05-19 15:15:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							590e2403ab 
							
						 
					 
					
						
						
							
							bind and session request more compatible  
						
						 
						
						
						
					 
					
						2014-05-18 17:32:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e857cf979d 
							
						 
					 
					
						
						
							
							fixed   #123  fixed122  
						
						 
						
						
						
					 
					
						2014-05-18 13:23:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7fc7201abb 
							
						 
					 
					
						
						
							
							cleaned up edit account dialog a little  
						
						 
						
						
						
					 
					
						2014-05-18 11:49:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0cdd74417f 
							
						 
					 
					
						
						
							
							fixed   #53  aka server not found bug  
						
						 
						
						
						
					 
					
						2014-05-18 11:25:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							66aacf7e3e 
							
						 
					 
					
						
						
							
							sending session after unsucesfull session resume.  fixed   #116  
						
						 
						
						
						
					 
					
						2014-05-17 21:57:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							736e09fbb5 
							
						 
					 
					
						
						
							
							added record audio button  
						
						 
						
						
						
					 
					
						2014-05-17 19:21:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							27060e303c 
							
						 
					 
					
						
						
							
							made sending session more compliant  
						
						 
						
						
						
					 
					
						2014-05-17 19:20:31 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4c17937640 
							
						 
					 
					
						
						
							
							receiving pgp images important bug fix  
						
						 
						
						
						
					 
					
						2014-05-17 19:19:06 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								the-username 
							
						 
					 
					
						
						
						
						
							
						
						
							e34fddd7e1 
							
						 
					 
					
						
						
							
							Update Validator.java  
						
						 
						
						
						
					 
					
						2014-05-17 12:50:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bab69ffcf9 
							
						 
					 
					
						
						
							
							fixed   #108  
						
						 
						
						
						
					 
					
						2014-05-17 11:08:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8bf0945f2f 
							
						 
					 
					
						
						
							
							permanent notification disapears now when account is being deleted + code clean up  
						
						 
						
						
						
					 
					
						2014-05-17 10:03:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b84b67268b 
							
						 
					 
					
						
						
							
							fixed   #113  
						
						 
						
						
						
					 
					
						2014-05-17 09:43:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cd1afbd39a 
							
						 
					 
					
						
						
							
							reworked message to conferences  
						
						 
						
						
						
					 
					
						2014-05-16 22:46:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a0a5ca9585 
							
						 
					 
					
						
						
							
							fixed npe for otr sessions with non contacts  
						
						 
						
						
						
					 
					
						2014-05-16 22:44:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aa68045c58 
							
						 
					 
					
						
						
							
							offline sending of pgp fixed  
						
						 
						
						
						
					 
					
						2014-05-16 13:42:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1cf1e62e30 
							
						 
					 
					
						
						
							
							fixed null in shared link  
						
						 
						
						
						
					 
					
						2014-05-16 12:07:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Benoit Bouvarel 
							
						 
					 
					
						
						
						
						
							
						
						
							3d0f08e319 
							
						 
					 
					
						
						
							
							French translation + hard-coded string > @string  
						
						 
						
						
						
					 
					
						2014-05-16 01:13:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							13d73a196c 
							
						 
					 
					
						
						
							
							fixed npe  
						
						 
						
						
						
					 
					
						2014-05-15 10:27:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ca7e24c30d 
							
						 
					 
					
						
						
							
							hiding the prepare image toast after error or success  
						
						 
						
						
						
					 
					
						2014-05-14 18:43:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							08a26d2772 
							
						 
					 
					
						
						
							
							fixed possible npe  
						
						 
						
						
						
					 
					
						2014-05-14 18:39:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f4eebd091c 
							
						 
					 
					
						
						
							
							fixed   #105  
						
						 
						
						
						
					 
					
						2014-05-14 18:32:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							81d2760505 
							
						 
					 
					
						
						
							
							made message parser non static  
						
						 
						
						
						
					 
					
						2014-05-14 12:56:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1f600be4dd 
							
						 
					 
					
						
						
							
							code clean up  
						
						 
						
						
						
					 
					
						2014-05-14 11:49:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a1a90a03e0 
							
						 
					 
					
						
						
							
							added presence selection  
						
						 
						
						
						
					 
					
						2014-05-13 17:42:23 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f1bdf1d4c5 
							
						 
					 
					
						
						
							
							Merge branch 'development' into feature/take_picture  
						
						 
						
						
						
					 
					
						2014-05-13 17:11:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							71545f4f66 
							
						 
					 
					
						
						
							
							code cleanup  
						
						 
						
						
						
					 
					
						2014-05-13 17:11:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9492e28902 
							
						 
					 
					
						
						
							
							takeing pictures over intent  
						
						 
						
						
						
					 
					
						2014-05-13 16:48:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a8010e7133 
							
						 
					 
					
						
						
							
							Merge branch 'development' into feature/take_picture  
						
						 
						
						
						
					 
					
						2014-05-13 15:40:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							84e79040df 
							
						 
					 
					
						
						
							
							static method for providing content uri  
						
						 
						
						
						
					 
					
						2014-05-13 15:37:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6dfd885d34 
							
						 
					 
					
						
						
							
							submenu for attach file  
						
						 
						
						
						
					 
					
						2014-05-13 15:25:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7e66731960 
							
						 
					 
					
						
						
							
							ensure that iq response is being send out for jingle packets. remove jingle connection from manager after termination  
						
						 
						
						
						
					 
					
						2014-05-13 14:49:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f38c7b22fd 
							
						 
					 
					
						
						
							
							further translations  
						
						 
						
						
						
					 
					
						2014-05-13 11:23:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ad9b9b9096 
							
						 
					 
					
						
						
							
							fixed npe in tag writer  
						
						 
						
						
						
					 
					
						2014-05-13 10:23:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3455d10a4a 
							
						 
					 
					
						
						
							
							Better error handling if attach file doesnt work (on permission denied)  
						
						 
						
						... 
						
						
						
						and unified encrypted and unencrypted file attachment 
						
					 
					
						2014-05-12 14:59:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							8632954e61 
							
						 
					 
					
						
						
							
							fixed possible npe and possible exception  
						
						 
						
						
						
					 
					
						2014-05-10 11:03:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef0bc6714a 
							
						 
					 
					
						
						
							
							added dialog for otr file transfer  
						
						 
						
						
						
					 
					
						2014-05-09 21:20:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3b8446e6d5 
							
						 
					 
					
						
						
							
							link to openkeychain from contact details  
						
						 
						
						
						
					 
					
						2014-05-09 20:47:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a14a28973a 
							
						 
					 
					
						
						
							
							nicer descriptions in notificaton for images and encrypted messages  
						
						 
						
						
						
					 
					
						2014-05-09 20:46:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Dominik Schürmann 
							
						 
					 
					
						
						
						
						
							
						
						
							8a2da100d5 
							
						 
					 
					
						
						
							
							Improve OTR fingerprint dialog and fix german sentence  
						
						 
						
						
						
					 
					
						2014-05-08 19:03:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c555a9d03c 
							
						 
					 
					
						
						
							
							sending text message after returing from pending intent  
						
						 
						
						
						
					 
					
						2014-05-08 17:31:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7fa61564b8 
							
						 
					 
					
						
						
							
							better flow after returning from openkeychain for various actions  
						
						 
						
						
						
					 
					
						2014-05-08 16:52:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							99a56a2bde 
							
						 
					 
					
						
						
							
							offer to announce pgp key if pgp encryption is selected from menu  
						
						 
						
						
						
					 
					
						2014-05-08 14:35:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0ed29c1c77 
							
						 
					 
					
						
						
							
							more informative dialog if contact doesn't announce public key  
						
						 
						
						
						
					 
					
						2014-05-08 14:23:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dc73a25ae4 
							
						 
					 
					
						
						
							
							code cleanup  
						
						 
						
						
						
					 
					
						2014-05-08 11:53:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0d8bf660db 
							
						 
					 
					
						
						
							
							fixed download button on pgp images  
						
						 
						
						
						
					 
					
						2014-05-08 10:14:12 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							daa000dd75 
							
						 
					 
					
						
						
							
							improved next encryption selection  
						
						 
						
						
						
					 
					
						2014-05-07 13:09:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							247f45f46b 
							
						 
					 
					
						
						
							
							remembering text. awesome  
						
						 
						
						
						
					 
					
						2014-05-07 12:59:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							12a3865c47 
							
						 
					 
					
						
						
							
							correct status after error iq  
						
						 
						
						
						
					 
					
						2014-05-07 12:58:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							955b7dbc7e 
							
						 
					 
					
						
						
							
							wee bit of code cleanup  
						
						 
						
						
						
					 
					
						2014-05-07 12:33:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							461f2ffb16 
							
						 
					 
					
						
						
							
							basic pgp encrypted file transfer  
						
						 
						
						
						
					 
					
						2014-05-06 21:34:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f7033cb7e0 
							
						 
					 
					
						
						
							
							content name and creator are properly set  
						
						 
						
						
						
					 
					
						2014-05-03 18:47:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2df57f38a0 
							
						 
					 
					
						
						
							
							properly reply to iq requests. reply to disco  
						
						 
						
						
						
					 
					
						2014-05-03 17:42:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4822d4dce7 
							
						 
					 
					
						
						
							
							allow roster pushes only from bare jid or null  
						
						 
						
						
						
					 
					
						2014-05-03 17:07:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3cfb4a0cd6 
							
						 
					 
					
						
						
							
							added restart button to openkeychain dialog  
						
						 
						
						
						
					 
					
						2014-05-03 15:24:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							82bccedf70 
							
						 
					 
					
						
						
							
							nicer dialog screen if openkeychain is not installed  
						
						 
						
						
						
					 
					
						2014-05-02 12:02:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							37c8e157d0 
							
						 
					 
					
						
						
							
							reworked openpgp integration part  #1  
						
						 
						
						
						
					 
					
						2014-05-01 22:33:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4b66b4b5d1 
							
						 
					 
					
						
						
							
							bug fix for jingle  
						
						 
						
						
						
					 
					
						2014-04-26 17:26:22 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f36f218469 
							
						 
					 
					
						
						
							
							unified presence selection for otr and file transfer  
						
						 
						
						
						
					 
					
						2014-04-26 12:40:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a55ddb889e 
							
						 
					 
					
						
						
							
							fixed   #75  
						
						 
						
						
						
					 
					
						2014-04-25 23:14:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6942840061 
							
						 
					 
					
						
						
							
							setting backround color if image comes directly from cache  
						
						 
						
						
						
					 
					
						2014-04-25 23:09:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							645139eb68 
							
						 
					 
					
						
						
							
							couple of more optimazations on image loading  
						
						 
						
						
						
					 
					
						2014-04-25 23:06:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bf2d0d5596 
							
						 
					 
					
						
						
							
							smoother scrolling (first step)  
						
						 
						
						
						
					 
					
						2014-04-25 16:24:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							18c183a767 
							
						 
					 
					
						
						
							
							deny files with unknown file types  
						
						 
						
						
						
					 
					
						2014-04-23 21:19:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9a8e55acd1 
							
						 
					 
					
						
						
							
							added download button for images not accepted automatically  
						
						 
						
						
						
					 
					
						2014-04-22 18:46:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aa5f775fc7 
							
						 
					 
					
						
						
							
							added support for ibb  
						
						 
						
						
						
					 
					
						2014-04-22 13:11:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d151ad9031 
							
						 
					 
					
						
						
							
							code cleanup  
						
						 
						
						
						
					 
					
						2014-04-21 20:39:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							77da0c6b5d 
							
						 
					 
					
						
						
							
							allow images to be opened with gallary app  
						
						 
						
						
						
					 
					
						2014-04-21 19:51:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fc6a16c31b 
							
						 
					 
					
						
						
							
							added missing transport id  
						
						 
						
						
						
					 
					
						2014-04-21 12:03:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4d730fd1ed 
							
						 
					 
					
						
						
							
							added proxy activate and a lot of code clean up. totatly untested  
						
						 
						
						
						
					 
					
						2014-04-20 22:34:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							04418484a2 
							
						 
					 
					
						
						
							
							made our spanish friends happy.  fixed   #68  
						
						 
						
						
						
					 
					
						2014-04-20 20:53:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d140ef6390 
							
						 
					 
					
						
						
							
							fixed   #50  
						
						 
						
						
						
					 
					
						2014-04-20 20:48:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8003e53013 
							
						 
					 
					
						
						
							
							more jingle bug fixes  
						
						 
						
						
						
					 
					
						2014-04-19 11:58:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7299fe7c8b 
							
						 
					 
					
						
						
							
							fixed replace contact in conversation  
						
						 
						
						
						
					 
					
						2014-04-19 02:58:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8c59668273 
							
						 
					 
					
						
						
							
							made debugging verbose again on specific parts  
						
						 
						
						
						
					 
					
						2014-04-19 02:19:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1235e3daca 
							
						 
					 
					
						
						
							
							fixed default autoaccept file size and wrongly marked message  
						
						 
						
						
						
					 
					
						2014-04-19 01:51:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5c0873c7ca 
							
						 
					 
					
						
						
							
							cleaned up debug log a little bit  
						
						 
						
						
						
					 
					
						2014-04-19 01:14:30 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7ccbf0008a 
							
						 
					 
					
						
						
							
							fixed concurrent modification of contacts which led to missing presences  
						
						 
						
						
						
					 
					
						2014-04-18 21:26:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1e5f916b2a 
							
						 
					 
					
						
						
							
							tried to avoid some more race conditions in jingle  
						
						 
						
						
						
					 
					
						2014-04-18 11:57:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							625fbe7d81 
							
						 
					 
					
						
						
							
							Merge branch 'master' into development  
						
						 
						
						
						
					 
					
						2014-04-18 01:07:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							18c0c31b65 
							
						 
					 
					
						
						
							
							work around for bug in xmlpullparser  
						
						 
						
						
						
					 
					
						2014-04-18 00:33:00 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							07cf07ad58 
							
						 
					 
					
						
						
							
							lot of cleanup in jingle part  
						
						 
						
						
						
					 
					
						2014-04-18 00:17:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8006931f80 
							
						 
					 
					
						
						
							
							put more string into strings.xml  
						
						 
						
						
						
					 
					
						2014-04-18 00:17:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0de0cb90a0 
							
						 
					 
					
						
						
							
							fixed destination bug  
						
						 
						
						
						
					 
					
						2014-04-18 00:17:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e29ce19f20 
							
						 
					 
					
						
						
							
							fixed   #63  
						
						 
						
						
						
					 
					
						2014-04-18 00:17:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a04d736f75 
							
						 
					 
					
						
						
							
							fixed possible race conditions with presences  
						
						 
						
						
						
					 
					
						2014-04-18 00:17:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4a36abf30f 
							
						 
					 
					
						
						
							
							added clear history dialog (no funcionality)  
						
						 
						
						
						
					 
					
						2014-04-18 00:17:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e711da7248 
							
						 
					 
					
						
						
							
							jingle sessions now get terminated proberly on success  
						
						 
						
						
						
					 
					
						2014-04-16 12:50:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bdf9770a61 
							
						 
					 
					
						
						
							
							made ui with sending images a little smoother  
						
						 
						
						
						
					 
					
						2014-04-15 15:19:02 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							513f3c47b2 
							
						 
					 
					
						
						
							
							added very basic, very untested gui on the receiving side  
						
						 
						
						
						
					 
					
						2014-04-14 21:21:13 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							18c3333271 
							
						 
					 
					
						
						
							
							tried to fix some race conditions. not adding duplicate candidates. needs more checks though  
						
						 
						
						
						
					 
					
						2014-04-14 20:35:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jelmer Vernooij 
							
						 
					 
					
						
						
						
						
							
						
						
							802c21a793 
							
						 
					 
					
						
						
							
							Fix two typos: assoziated -> associated.  
						
						 
						
						
						
					 
					
						2014-04-14 02:22:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							e4f9a38c76 
							
						 
					 
					
						
						
							
							Some icon tweaks  
						
						 
						
						... 
						
						
						
						Use Roboto Light, thinner lines between tiles, slightly smaller letters 
						
					 
					
						2014-04-13 21:13:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							132689376c 
							
						 
					 
					
						
						
							
							Added ellipsis tile for large conversations  
						
						 
						
						... 
						
						
						
						For more than 4 members in a conversation, the fourth tile now contains
an ellipsis to indicate this 
						
					 
					
						2014-04-13 21:13:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Andreas Straub 
							
						 
					 
					
						
						
						
						
							
						
						
							901ce085a7 
							
						 
					 
					
						
						
							
							Major Contact Picture code cleanup  
						
						 
						
						... 
						
						
						
						Notifications now have pseudotransparent icons, icons are generated in
the correct size. 
						
					 
					
						2014-04-13 21:13:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							084ab51b1d 
							
						 
					 
					
						
						
							
							transmitting files between two conversations works. no error handling and no ui on the receiving end  
						
						 
						
						
						
					 
					
						2014-04-13 21:10:36 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7dfe4ae082 
							
						 
					 
					
						
						
							
							some code cleanup. added setting to auto accept files. socks5 connections are now threaded  
						
						 
						
						
						
					 
					
						2014-04-13 18:09:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							27d5966ac3 
							
						 
					 
					
						
						
							
							more efficant way of calculating the sha1 sum. closing connections  
						
						 
						
						
						
					 
					
						2014-04-13 11:32:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7b554f2001 
							
						 
					 
					
						
						
							
							fixed minor typos  
						
						 
						
						
						
					 
					
						2014-04-12 10:45:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f57b669f83 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/strb/Conversations  into strb-development  
						
						 
						
						
						
					 
					
						2014-04-12 10:22:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d936a830e4 
							
						 
					 
					
						
						
							
							add sha1 sum to file  
						
						 
						
						
						
					 
					
						2014-04-12 10:02:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								andy 
							
						 
					 
					
						
						
						
						
							
						
						
							f3b07250dd 
							
						 
					 
					
						
						
							
							Added tiled MUC icons  
						
						 
						
						... 
						
						
						
						Now, MUCs have icons with up to 4 tiles representing MUC members,
similar to the gmail app.
Some caveats:
As of now, no ordering is imposed on the members, we simply pick the
first (up to) 4 returned by the MucOptions object. This could be done
better, e.g. by picking more important members first (based on
affil/role), or even going so far as to order them by how recently they
sent a message in the MUC.
Also, the code generating the tiles is really messy right now (tons of
copy and paste). It seems to work though. I will clean this up soon. 
						
					 
					
						2014-04-12 03:47:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								andy 
							
						 
					 
					
						
						
						
						
							
						
						
							c230733736 
							
						 
					 
					
						
						
							
							More Contact Picture refactors  
						
						 
						
						... 
						
						
						
						Use polymorphism to avoid dynamic dispatch based on nulled parameters.
Next up: Prettier MUC icons 
						
					 
					
						2014-04-12 03:46:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								andy 
							
						 
					 
					
						
						
						
						
							
						
						
							3d6f03e859 
							
						 
					 
					
						
						
							
							Refactor UIHelper to use getContactPicture  
						
						 
						
						... 
						
						
						
						Normalize the interface, reduce code duplication 
						
					 
					
						2014-04-12 03:46:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							96be96f9f8 
							
						 
					 
					
						
						
							
							open latest conversation from notification  
						
						 
						
						
						
					 
					
						2014-04-11 23:05:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							259bb446ca 
							
						 
					 
					
						
						
							
							first file transfer between gajim and conversations. still a lot to do though  
						
						 
						
						
						
					 
					
						2014-04-11 22:49:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c0e0a70869 
							
						 
					 
					
						
						
							
							socks5 initialisation works. doesn't get activate though  
						
						 
						
						
						
					 
					
						2014-04-11 21:13:09 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							51100ab48b 
							
						 
					 
					
						
						
							
							failed messages get now marked inline  
						
						 
						
						
						
					 
					
						2014-04-11 09:13:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							644473205a 
							
						 
					 
					
						
						
							
							incomming jingle packets are routed to their connection. added presence chooser in gui  
						
						 
						
						
						
					 
					
						2014-04-10 14:12:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ba0bedc5fa 
							
						 
					 
					
						
						
							
							changed behaviour of expecption handler to check if accounts are working before removing the stacktrace  
						
						 
						
						
						
					 
					
						2014-04-10 13:19:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							298c7adcd1 
							
						 
					 
					
						
						
							
							disocover stream hosts (xep-0065) cleaned up disco  
						
						 
						
						
						
					 
					
						2014-04-08 23:15:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							92dcf85701 
							
						 
					 
					
						
						
							
							fixed npe  
						
						 
						
						
						
					 
					
						2014-04-08 10:23:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							78bd6c423f 
							
						 
					 
					
						
						
							
							fixed   #52 . thanks @strb  
						
						 
						
						
						
					 
					
						2014-04-07 23:58:59 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3f403fb8a9 
							
						 
					 
					
						
						
							
							jingle connection and manager. able to trigger dialog in gajim  
						
						 
						
						
						
					 
					
						2014-04-07 20:05:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c30bf75a5d 
							
						 
					 
					
						
						
							
							gui for images  
						
						 
						
						
						
					 
					
						2014-04-06 15:34:08 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9fc7a1b980 
							
						 
					 
					
						
						
							
							added button to open images  
						
						 
						
						
						
					 
					
						2014-04-06 15:28:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7749103909 
							
						 
					 
					
						
						
							
							added attach file action  
						
						 
						
						
						
					 
					
						2014-04-06 15:28:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cc977eee90 
							
						 
					 
					
						
						
							
							renamed [Archive conversation|Leave conference] to End this conversation  
						
						 
						
						
						
					 
					
						2014-04-06 15:23:40 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3f872ddc9f 
							
						 
					 
					
						
						
							
							fixed npe  
						
						 
						
						
						
					 
					
						2014-04-06 15:22:56 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							486f198632 
							
						 
					 
					
						
						
							
							use proper, advertised sm namespace  
						
						 
						
						
						
					 
					
						2014-04-05 12:08:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							83a23ad3b1 
							
						 
					 
					
						
						
							
							cleaned up log output a little bit  
						
						 
						
						
						
					 
					
						2014-04-05 11:59:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rene Treffer 
							
						 
					 
					
						
						
						
						
							
						
						
							c82c6251b8 
							
						 
					 
					
						
						
							
							Switch to FULL_SYNC to make prosody happy  
						
						 
						
						
						
					 
					
						2014-04-05 11:39:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							850b24c4db 
							
						 
					 
					
						
						
							
							code cleanup  
						
						 
						
						
						
					 
					
						2014-04-05 09:45:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ee24baa0fd 
							
						 
					 
					
						
						
							
							marked incoming carbons as unread  
						
						 
						
						
						
					 
					
						2014-04-04 22:52:32 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							34bd79ac04 
							
						 
					 
					
						
						
							
							notify on incomming received carbon messages  
						
						 
						
						
						
					 
					
						2014-04-04 17:58:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							caf214c212 
							
						 
					 
					
						
						
							
							fixing more notification f-ups  
						
						 
						
						
						
					 
					
						2014-04-04 13:01:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							db4559efdf 
							
						 
					 
					
						
						
							
							nothing important  
						
						 
						
						
						
					 
					
						2014-04-03 23:57:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bd9dba1a69 
							
						 
					 
					
						
						
							
							Merge branch 'compression' of  https://github.com/rtreffer/Conversations  into rtreffer-compression  
						
						 
						
						
						
					 
					
						2014-04-03 23:50:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							91aeffae1b 
							
						 
					 
					
						
						
							
							possible fix for some weird notification bugs  
						
						 
						
						
						
					 
					
						2014-04-03 23:50:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rene Treffer 
							
						 
					 
					
						
						
						
						
							
						
						
							a0fc1c6c77 
							
						 
					 
					
						
						
							
							Migrate all accounts to use compression  
						
						 
						
						
						
					 
					
						2014-04-03 22:28:37 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rene Treffer 
							
						 
					 
					
						
						
						
						
							
						
						
							4ea11c15e3 
							
						 
					 
					
						
						
							
							Only apply defaults if the account is new  
						
						 
						
						
						
					 
					
						2014-04-03 21:25:03 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rene Treffer 
							
						 
					 
					
						
						
						
						
							
						
						
							5684849249 
							
						 
					 
					
						
						
							
							Remove option to enable/disable TLS (now enabled by default)  
						
						 
						
						
						
					 
					
						2014-04-03 21:22:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rene Treffer 
							
						 
					 
					
						
						
						
						
							
						
						
							e6797e1db4 
							
						 
					 
					
						
						
							
							Remove option for compression (enabled by default / hidden setting)  
						
						 
						
						
						
					 
					
						2014-04-03 20:54:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rene Treffer 
							
						 
					 
					
						
						
						
						
							
						
						
							7db21136a3 
							
						 
					 
					
						
						
							
							Add support for users with empty name  
						
						 
						
						
						
					 
					
						2014-04-03 18:37:48 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rene Treffer 
							
						 
					 
					
						
						
						
						
							
						
						
							9502ff25dd 
							
						 
					 
					
						
						
							
							Add compression support  
						
						 
						
						
						
					 
					
						2014-04-03 18:37:25 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2506ef82df 
							
						 
					 
					
						
						
							
							be compatible with openkeychain api v3  
						
						 
						
						
						
					 
					
						2014-04-03 17:39:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							10f71c53c8 
							
						 
					 
					
						
						
							
							increased version and fixed one last null pointer  
						
						 
						
						
						
					 
					
						2014-04-03 15:24:11 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b91c9afe4b 
							
						 
					 
					
						
						
							
							call change status listener after disable account  
						
						 
						
						
						
					 
					
						2014-04-03 15:13:43 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							217d18b6ac 
							
						 
					 
					
						
						
							
							fixed null pointer  
						
						 
						
						
						
					 
					
						2014-04-03 15:08:53 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9d2d853e1b 
							
						 
					 
					
						
						
							
							fixed   #27  
						
						 
						
						
						
					 
					
						2014-04-03 14:25:54 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e70c0cfffd 
							
						 
					 
					
						
						
							
							Merge pull request  #40  from rtreffer/minidns  
						
						 
						
						... 
						
						
						
						Add ability to use a provided ipv4 address on connect 
						
					 
					
						2014-04-03 11:13:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rene Treffer 
							
						 
					 
					
						
						
						
						
							
						
						
							eae4e5d518 
							
						 
					 
					
						
						
							
							Add ability to use a provided ipv4 address on connect  
						
						 
						
						
						
					 
					
						2014-04-03 11:01:20 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							01925fb2cc 
							
						 
					 
					
						
						
							
							tryping to resolve the wake lock bug  
						
						 
						
						
						
					 
					
						2014-04-03 10:41:21 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2b8dfc2bab 
							
						 
					 
					
						
						
							
							cleared up logging a little bit. no need for an entire stack trace at this point  
						
						 
						
						
						
					 
					
						2014-04-03 10:12:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2efb97efa0 
							
						 
					 
					
						
						
							
							Merge pull request  #39  from rtreffer/minidns  
						
						 
						
						... 
						
						
						
						Switch to a small DNS library for DNS resolving. 
						
					 
					
						2014-04-03 09:50:57 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rene Treffer 
							
						 
					 
					
						
						
						
						
							
						
						
							ff88dc0eaa 
							
						 
					 
					
						
						
							
							Switch to a small DNS library for DNS resolving.  
						
						 
						
						
						
					 
					
						2014-04-03 09:42:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							21be7bc160 
							
						 
					 
					
						
						
							
							added permenant notification when one or more accounts are unable to connect  
						
						 
						
						
						
					 
					
						2014-04-03 09:21:45 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d53dc28f4c 
							
						 
					 
					
						
						
							
							fixed add account dialog showing up multiple times  
						
						 
						
						
						
					 
					
						2014-04-01 23:16:19 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1fe49a0545 
							
						 
					 
					
						
						
							
							fixed digest-md5 auth to work with prosody as well. thank you Florian Schmaus  
						
						 
						
						
						
					 
					
						2014-04-01 11:38:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							601e5ca33e 
							
						 
					 
					
						
						
							
							fixed   #30  - added support for digest-md5 - only works with Icewarp 11???git add src/?  
						
						 
						
						
						
					 
					
						2014-03-31 15:22:27 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aed5b01434 
							
						 
					 
					
						
						
							
							changed all them beautifull colors  
						
						 
						
						
						
					 
					
						2014-03-31 11:11:17 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6bb7764d72 
							
						 
					 
					
						
						
							
							null pointer fix  
						
						 
						
						
						
					 
					
						2014-03-31 09:45:39 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							92e0713373 
							
						 
					 
					
						
						
							
							null pointer fix  
						
						 
						
						
						
					 
					
						2014-03-31 09:43:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ad3e23fa7c 
							
						 
					 
					
						
						
							
							ground work to support multiple auth mechanisms  
						
						 
						
						
						
					 
					
						2014-03-30 21:21:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e8290d52b1 
							
						 
					 
					
						
						
							
							finally fixed #notificationgate  
						
						 
						
						
						
					 
					
						2014-03-29 20:29:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							38efb84690 
							
						 
					 
					
						
						
							
							treat dns timeouts as temporary. also increased timeout  
						
						 
						
						
						
					 
					
						2014-03-28 19:00:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							268eae7813 
							
						 
					 
					
						
						
							
							fixed login issue with latest ejabberd  
						
						 
						
						
						
					 
					
						2014-03-28 18:31:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a649310fe2 
							
						 
					 
					
						
						
							
							streamlined sasl code  
						
						 
						
						
						
					 
					
						2014-03-28 14:48:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f457c629ee 
							
						 
					 
					
						
						
							
							fixed another null pointer reported by he crash reporter. this thing is awesome  
						
						 
						
						
						
					 
					
						2014-03-28 13:32:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b966464324 
							
						 
					 
					
						
						
							
							fixed null pointer issue  
						
						 
						
						
						
					 
					
						2014-03-28 12:58:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0b235171a8 
							
						 
					 
					
						
						
							
							tryping to  fix   #24  - notificationgate - since i still cant reproduce this patches are all blind  
						
						 
						
						
						
					 
					
						2014-03-28 12:22:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ea766d970f 
							
						 
					 
					
						
						
							
							crash reporter  
						
						 
						
						
						
					 
					
						2014-03-27 16:09:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							592068e7cf 
							
						 
					 
					
						
						
							
							code cleanup  
						
						 
						
						
						
					 
					
						2014-03-27 14:41:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8988873d77 
							
						 
					 
					
						
						
							
							more dns fixes. hopefully the last  
						
						 
						
						
						
					 
					
						2014-03-27 14:31:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							800c18956b 
							
						 
					 
					
						
						
							
							dont add new muc to roster  
						
						 
						
						
						
					 
					
						2014-03-27 11:41:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							291dc4c36c 
							
						 
					 
					
						
						
							
							fixed null pointer with missing status msg  
						
						 
						
						
						
					 
					
						2014-03-27 11:09:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f99887d7ca 
							
						 
					 
					
						
						
							
							further dns improvements  
						
						 
						
						
						
					 
					
						2014-03-27 11:03:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4864f7200b 
							
						 
					 
					
						
						
							
							fixed a couple of muc issues. added jingle listener (which doesn't do anything for now)  
						
						 
						
						
						
					 
					
						2014-03-27 02:02:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							185d4d120b 
							
						 
					 
					
						
						
							
							fixed error with leaving mucs  
						
						 
						
						
						
					 
					
						2014-03-26 18:56:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0c37abf1e9 
							
						 
					 
					
						
						
							
							made work around not being a work around any more  
						
						 
						
						
						
					 
					
						2014-03-26 00:17:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							39c651a236 
							
						 
					 
					
						
						
							
							fixed settings opening twice from manage accounts activity  
						
						 
						
						
						
					 
					
						2014-03-25 18:38:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							956b646e2a 
							
						 
					 
					
						
						
							
							more srv lookup fixes  
						
						 
						
						
						
					 
					
						2014-03-25 18:12:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0b9e089ac6 
							
						 
					 
					
						
						
							
							using actual dns servers provided by the system  
						
						 
						
						
						
					 
					
						2014-03-25 17:21:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							10f2231bcf 
							
						 
					 
					
						
						
							
							fixed array out of bounds  
						
						 
						
						
						
					 
					
						2014-03-25 17:08:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1b3c288225 
							
						 
					 
					
						
						
							
							holding wake locks during onStartCommand  
						
						 
						
						
						
					 
					
						2014-03-23 14:15:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ee1c9e611b 
							
						 
					 
					
						
						
							
							more otr fixes  
						
						 
						
						
						
					 
					
						2014-03-21 23:09:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a9e34d3492 
							
						 
					 
					
						
						
							
							tryed to fix more otr bugs. new resource setting  
						
						 
						
						
						
					 
					
						2014-03-21 22:14:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							079712060c 
							
						 
					 
					
						
						
							
							otr safety guard  
						
						 
						
						
						
					 
					
						2014-03-21 21:25:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bbfe102e91 
							
						 
					 
					
						
						
							
							sending offline msgs  
						
						 
						
						
						
					 
					
						2014-03-21 19:58:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							36dccb9f77 
							
						 
					 
					
						
						
							
							fixed users profile picture  
						
						 
						
						
						
					 
					
						2014-03-21 14:58:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b6ea028a9d 
							
						 
					 
					
						
						
							
							added no-copy  
						
						 
						
						
						
					 
					
						2014-03-20 15:49:53 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6be2a08f19 
							
						 
					 
					
						
						
							
							otr messages are now ignored if conversations isnt 100% sure the message is ours  
						
						 
						
						
						
					 
					
						2014-03-19 16:16:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							389d4db311 
							
						 
					 
					
						
						
							
							rename in muc fixed  
						
						 
						
						
						
					 
					
						2014-03-19 15:05:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3a98a695d4 
							
						 
					 
					
						
						
							
							fix bug with presences with no resource attached  
						
						 
						
						
						
					 
					
						2014-03-18 14:35:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0116551ca9 
							
						 
					 
					
						
						
							
							bug fixes with leaving muc on connection loss.  
						
						 
						
						
						
					 
					
						2014-03-16 14:12:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8cd59bb944 
							
						 
					 
					
						
						
							
							better muc invitations. clearified the creation of ad hoc mucs with an alert dialog  
						
						 
						
						
						
					 
					
						2014-03-15 15:13:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							841c6e04a9 
							
						 
					 
					
						
						
							
							muc invites in conference details  
						
						 
						
						
						
					 
					
						2014-03-15 06:20:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							afe1244709 
							
						 
					 
					
						
						
							
							muc creation  
						
						 
						
						
						
					 
					
						2014-03-15 04:59:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8f9712c64e 
							
						 
					 
					
						
						
							
							added security indicator on every single message  
						
						 
						
						
						
					 
					
						2014-03-15 00:19:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b0d57d01c4 
							
						 
					 
					
						
						
							
							renaming conferences over conference details  
						
						 
						
						
						
					 
					
						2014-03-14 23:32:48 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b1a3d09ca6 
							
						 
					 
					
						
						
							
							use conference subject to identiy room  
						
						 
						
						
						
					 
					
						2014-03-14 22:40:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4e4a767743 
							
						 
					 
					
						
						
							
							added display of own fingerprint  
						
						 
						
						
						
					 
					
						2014-03-14 21:36:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bae7418756 
							
						 
					 
					
						
						
							
							fixed logic bug with cleaning of presences  
						
						 
						
						
						
					 
					
						2014-03-14 20:43:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							29e128513d 
							
						 
					 
					
						
						
							
							nick name more persistant than ever before  
						
						 
						
						
						
					 
					
						2014-03-14 20:19:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cc65567366 
							
						 
					 
					
						
						
							
							workaround for some weird clients sending empty string over otr  
						
						 
						
						
						
					 
					
						2014-03-14 19:31:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1bdbeb620f 
							
						 
					 
					
						
						
							
							renaming in mucs now persistent  
						
						 
						
						
						
					 
					
						2014-03-14 19:12:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4e20b81bd9 
							
						 
					 
					
						
						
							
							fixed problem with null messages. added ask again button  
						
						 
						
						
						
					 
					
						2014-03-14 18:56:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							71cb5548eb 
							
						 
					 
					
						
						
							
							removed log output  
						
						 
						
						
						
					 
					
						2014-03-13 22:14:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bf7bba0311 
							
						 
					 
					
						
						
							
							bug fix  
						
						 
						
						
						
					 
					
						2014-03-13 21:45:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9c811f8fb2 
							
						 
					 
					
						
						
							
							sharing text  
						
						 
						
						
						
					 
					
						2014-03-13 21:37:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							507cfba6ad 
							
						 
					 
					
						
						
							
							fixed logic bug where presences where cleared to early  
						
						 
						
						
						
					 
					
						2014-03-13 18:36:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							748582e3ab 
							
						 
					 
					
						
						
							
							start converstaion from address book (sendto)  
						
						 
						
						
						
					 
					
						2014-03-13 18:18:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							678dbd37c6 
							
						 
					 
					
						
						
							
							finished registration  
						
						 
						
						
						
					 
					
						2014-03-13 17:29:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							53fa87b414 
							
						 
					 
					
						
						
							
							removed unnecessary uihelper method  
						
						 
						
						
						
					 
					
						2014-03-13 13:28:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							eec3906692 
							
						 
					 
					
						
						
							
							fixed bug where one couldnt short click to edit in the account list  
						
						 
						
						
						
					 
					
						2014-03-13 04:32:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6db012ac6f 
							
						 
					 
					
						
						
							
							ui for registry.  
						
						 
						
						
						
					 
					
						2014-03-13 04:21:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a80e3131be 
							
						 
					 
					
						
						
							
							contact picture generation centralized + basic registry stuff  
						
						 
						
						
						
					 
					
						2014-03-13 03:52:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							eadebeb77c 
							
						 
					 
					
						
						
							
							added server info and deal with thi 'connecting...' bug  
						
						 
						
						
						
					 
					
						2014-03-12 22:31:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c67238562a 
							
						 
					 
					
						
						
							
							fixed   #9  
						
						 
						
						
						
					 
					
						2014-03-12 19:56:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							848fb2ec24 
							
						 
					 
					
						
						
							
							fix for otr problems  
						
						 
						
						
						
					 
					
						2014-03-12 19:47:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d943e218a4 
							
						 
					 
					
						
						
							
							make conference notificaton optional  
						
						 
						
						
						
					 
					
						2014-03-12 14:55:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							33f8747b87 
							
						 
					 
					
						
						
							
							notifications support vibration now  
						
						 
						
						
						
					 
					
						2014-03-12 01:49:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							01e2a3a4cd 
							
						 
					 
					
						
						
							
							display contact picture in notification  
						
						 
						
						
						
					 
					
						2014-03-11 21:56:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							82fa29bfc5 
							
						 
					 
					
						
						
							
							possible fix for  #9  
						
						 
						
						
						
					 
					
						2014-03-11 17:47:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							11a8a747e3 
							
						 
					 
					
						
						
							
							fixed bug with disabling accounts  
						
						 
						
						
						
					 
					
						2014-03-11 16:49:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							838270432f 
							
						 
					 
					
						
						
							
							cleaner/better logging  
						
						 
						
						
						
					 
					
						2014-03-11 16:27:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0d516b0603 
							
						 
					 
					
						
						
							
							ping stuff  
						
						 
						
						
						
					 
					
						2014-03-11 15:44:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							08023210ba 
							
						 
					 
					
						
						
							
							basic stream managment functionality  
						
						 
						
						
						
					 
					
						2014-03-11 02:53:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e441005c87 
							
						 
					 
					
						
						
							
							cleanup  
						
						 
						
						
						
					 
					
						2014-03-11 02:52:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							05694b4c06 
							
						 
					 
					
						
						
							
							fixed null pointer  
						
						 
						
						
						
					 
					
						2014-03-10 22:05:25 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a5de5060a9 
							
						 
					 
					
						
						
							
							another possible fix for notificationgate  
						
						 
						
						
						
					 
					
						2014-03-10 21:52:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							baf0d64787 
							
						 
					 
					
						
						
							
							exception handler  
						
						 
						
						
						
					 
					
						2014-03-09 13:21:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							91130612d4 
							
						 
					 
					
						
						
							
							cleanup  
						
						 
						
						
						
					 
					
						2014-03-09 12:58:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d543d377b7 
							
						 
					 
					
						
						
							
							possible null pointer fix  
						
						 
						
						
						
					 
					
						2014-03-09 03:33:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a8dd6794f3 
							
						 
					 
					
						
						
							
							sending named presence  
						
						 
						
						
						
					 
					
						2014-03-09 03:24:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6ec5b2f055 
							
						 
					 
					
						
						
							
							possible bug fix for notificationgate  
						
						 
						
						
						
					 
					
						2014-03-08 21:22:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d7ab7715ed 
							
						 
					 
					
						
						
							
							couple of otr related bug fixes and basic ping  
						
						 
						
						
						
					 
					
						2014-03-08 20:14:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5a4328db7d 
							
						 
					 
					
						
						
							
							fixed   #4  - this happend when you would archive (leave) the last conversation  
						
						 
						
						
						
					 
					
						2014-03-08 13:40:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aa31732ea3 
							
						 
					 
					
						
						
							
							last part. update notification if user reads them  
						
						 
						
						
						
					 
					
						2014-03-08 06:25:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							83c5fdaf0e 
							
						 
					 
					
						
						
							
							step three. unread if sent msg in muc arrives. to cryptic? it does awesome shit to you  
						
						 
						
						
						
					 
					
						2014-03-08 06:04:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9a5a429888 
							
						 
					 
					
						
						
							
							step two towards nicer notifications. mark read if carbon arrives  
						
						 
						
						
						
					 
					
						2014-03-08 05:59:31 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							02883a7ac4 
							
						 
					 
					
						
						
							
							first step towards nicer notifications  
						
						 
						
						
						
					 
					
						2014-03-08 05:46:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fbd25c8129 
							
						 
					 
					
						
						
							
							roster version bug  
						
						 
						
						
						
					 
					
						2014-03-08 04:18:58 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e486f0020a 
							
						 
					 
					
						
						
							
							cleanup  
						
						 
						
						
						
					 
					
						2014-03-08 02:48:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							905a79fca8 
							
						 
					 
					
						
						
							
							fixed   #3  
						
						 
						
						
						
					 
					
						2014-03-08 02:06:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a1b72313d7 
							
						 
					 
					
						
						
							
							fixed otr bug  
						
						 
						
						
						
					 
					
						2014-03-08 00:48:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5955da3519 
							
						 
					 
					
						
						
							
							fixed a couple of pgp bugs  
						
						 
						
						
						
					 
					
						2014-03-08 00:31:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							100059b530 
							
						 
					 
					
						
						
							
							ported subscription stuff from old contact dialog  
						
						 
						
						
						
					 
					
						2014-03-07 20:36:04 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							93d11b3c99 
							
						 
					 
					
						
						
							
							made untrust certificate warning more beautified  
						
						 
						
						
						
					 
					
						2014-03-07 20:22:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e4963ce86e 
							
						 
					 
					
						
						
							
							ui fixes for tablets  
						
						 
						
						
						
					 
					
						2014-03-07 18:22:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3bb5fcb3ca 
							
						 
					 
					
						
						
							
							tls exceptions for untrusted certs  
						
						 
						
						
						
					 
					
						2014-03-07 14:24:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1cf05fccdb 
							
						 
					 
					
						
						
							
							api updated  
						
						 
						
						
						
					 
					
						2014-03-06 20:18:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3e52daf5e1 
							
						 
					 
					
						
						
							
							ssl shit  
						
						 
						
						
						
					 
					
						2014-03-06 20:03:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c666b086d6 
							
						 
					 
					
						
						
							
							display keys in contact details  
						
						 
						
						
						
					 
					
						2014-03-06 20:00:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e319dd2cee 
							
						 
					 
					
						
						
							
							api bug fix  
						
						 
						
						
						
					 
					
						2014-03-06 19:59:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4edd623a1e 
							
						 
					 
					
						
						
							
							more details connection error messages  
						
						 
						
						
						
					 
					
						2014-03-06 15:11:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0168f185eb 
							
						 
					 
					
						
						
							
							bug fixes  
						
						 
						
						
						
					 
					
						2014-03-06 04:13:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ac93f7419a 
							
						 
					 
					
						
						
							
							bug fixes. stuff more smoother  
						
						 
						
						
						
					 
					
						2014-03-06 03:57:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2f0b2b865e 
							
						 
					 
					
						
						
							
							user alarmmanager to reschedule wakeups instead of just sleeping  
						
						 
						
						
						
					 
					
						2014-03-06 03:30:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e4f61da079 
							
						 
					 
					
						
						
							
							start service on boot  
						
						 
						
						
						
					 
					
						2014-03-06 00:00:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							999b9691cb 
							
						 
					 
					
						
						
							
							two bugs on tablet fixed  
						
						 
						
						
						
					 
					
						2014-03-05 21:04:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							78312d71dd 
							
						 
					 
					
						
						
							
							reworked contact details  
						
						 
						
						
						
					 
					
						2014-03-05 15:41:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							79ec8b2e81 
							
						 
					 
					
						
						
							
							leaving mucs works  
						
						 
						
						
						
					 
					
						2014-03-04 04:36:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6f86638341 
							
						 
					 
					
						
						
							
							more workaroud for ejabberd bugs  
						
						 
						
						
						
					 
					
						2014-03-04 04:09:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8e4be5256e 
							
						 
					 
					
						
						
							
							Muc Options even more awesome  
						
						 
						
						
						
					 
					
						2014-03-04 02:51:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							69af009c88 
							
						 
					 
					
						
						
							
							avoid some null pointers when pgp api is not installed  
						
						 
						
						
						
					 
					
						2014-03-03 16:39:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c609eefefa 
							
						 
					 
					
						
						
							
							api changes. muc options  
						
						 
						
						
						
					 
					
						2014-03-03 05:01:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2ab6cb0ada 
							
						 
					 
					
						
						
							
							hover effect  
						
						 
						
						
						
					 
					
						2014-03-01 11:05:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							acf80bddd0 
							
						 
					 
					
						
						
							
							rebranding  
						
						 
						
						
						
					 
					
						2014-02-28 18:46:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							03d96266f8 
							
						 
					 
					
						
						
							
							fixed a small graphic glitch  
						
						 
						
						
						
					 
					
						2014-02-28 03:22:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9581dfcde4 
							
						 
					 
					
						
						
							
							made pgp decrypt stuff a little bit more bearable  
						
						 
						
						
						
					 
					
						2014-02-28 02:58:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							37d1a53806 
							
						 
					 
					
						
						
							
							basic pgp support.  
						
						 
						
						
						
					 
					
						2014-02-28 00:22:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bfee69b00b 
							
						 
					 
					
						
						
							
							add contact to roster if a new conversation is created  
						
						 
						
						
						
					 
					
						2014-02-23 21:33:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a5a39fa9af 
							
						 
					 
					
						
						
							
							bug fixes for faulty roster fetch and otr bug between two sc instances  
						
						 
						
						
						
					 
					
						2014-02-22 18:18:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b8e85a2846 
							
						 
					 
					
						
						
							
							subscription mgmt works  
						
						 
						
						
						
					 
					
						2014-02-21 21:35:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b71bfbaa9d 
							
						 
					 
					
						
						
							
							fixed broken bitsets  
						
						 
						
						
						
					 
					
						2014-02-21 19:14:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c82179c0b8 
							
						 
					 
					
						
						
							
							adding and removing roster items now possible. basic error display on error messages  
						
						 
						
						
						
					 
					
						2014-02-20 17:00:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							94ab61d5c0 
							
						 
					 
					
						
						
							
							more speed optimizations  
						
						 
						
						
						
					 
					
						2014-02-19 08:21:33 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							746f959155 
							
						 
					 
					
						
						
							
							roster versioning. roster updates on air. performance fixes in conversation listview  
						
						 
						
						
						
					 
					
						2014-02-19 01:35:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0392e6b2dc 
							
						 
					 
					
						
						
							
							made presences chooser. raw draft. just kinda works  
						
						 
						
						
						
					 
					
						2014-02-16 19:30:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							9c7cacdbdd 
							
						 
					 
					
						
						
							
							show unknown otr fingerprint warining  
						
						 
						
						
						
					 
					
						2014-02-16 16:32:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							42c4c1789a 
							
						 
					 
					
						
						
							
							basic otr support  
						
						 
						
						
						
					 
					
						2014-02-13 23:40:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e63109215e 
							
						 
					 
					
						
						
							
							offline messages  
						
						 
						
						
						
					 
					
						2014-02-11 23:55:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f6a6982bd0 
							
						 
					 
					
						
						
							
							conference histories are now working. only the actually needed history is queried  
						
						 
						
						
						
					 
					
						2014-02-11 15:34:24 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							962263e6e6 
							
						 
					 
					
						
						
							
							small bugfix. messages were not marked as read when conversation was open  
						
						 
						
						
						
					 
					
						2014-02-10 23:12:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b673af2ba0 
							
						 
					 
					
						
						
							
							reworked notification a bit  
						
						 
						
						
						
					 
					
						2014-02-10 22:45:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cfc74e7c8e 
							
						 
					 
					
						
						
							
							fixed a bug where account options where toggled instead of set off. fixed null pointer for missing selfi. made sefli optional  
						
						 
						
						
						
					 
					
						2014-02-10 15:24:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2d0c0e6a40 
							
						 
					 
					
						
						
							
							contact badges  
						
						 
						
						
						
					 
					
						2014-02-10 03:34:00 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c6440aab12 
							
						 
					 
					
						
						
							
							carbons  
						
						 
						
						
						
					 
					
						2014-02-09 14:10:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3eb73c4b9f 
							
						 
					 
					
						
						
							
							made contact details a little bit more pretty. more colors  
						
						 
						
						
						
					 
					
						2014-02-09 02:05:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4a963d6f50 
							
						 
					 
					
						
						
							
							send messages in mucs are no longer displayed twice  
						
						 
						
						
						
					 
					
						2014-02-09 01:00:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c31101dd64 
							
						 
					 
					
						
						
							
							presences are now somewhat stored and displayed to the user via the contact details action.  
						
						 
						
						
						
					 
					
						2014-02-09 00:47:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							95068ee776 
							
						 
					 
					
						
						
							
							reworked new conversation activity again. less asking more knowing. mucs are now connected on creation of the conversation. no reconnect required  
						
						 
						
						
						
					 
					
						2014-02-07 16:50:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							86dbb2f411 
							
						 
					 
					
						
						
							
							wrote the scariest code ever to fetch srv records from dns. todo use real dns servers and dont hard code 8.8.8.8  
						
						 
						
						
						
					 
					
						2014-02-07 06:52:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cda1c2c3a1 
							
						 
					 
					
						
						
							
							refresh contact list  
						
						 
						
						
						
					 
					
						2014-02-07 02:57:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							aa42eb544a 
							
						 
					 
					
						
						
							
							basic muc support. reworked contact list stuff  
						
						 
						
						
						
					 
					
						2014-02-05 22:33:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4670585e7a 
							
						 
					 
					
						
						
							
							reworked edit account dialog. advanced options are now gone. tls option available instead  
						
						 
						
						
						
					 
					
						2014-02-04 22:58:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c01f2cedb6 
							
						 
					 
					
						
						
							
							delete account code now accessible again  
						
						 
						
						
						
					 
					
						2014-02-04 22:26:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4fd8620c6c 
							
						 
					 
					
						
						
							
							allow to temporarily disable accounts  
						
						 
						
						
						
					 
					
						2014-02-04 21:44:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0d80d88736 
							
						 
					 
					
						
						
							
							reworked account managment. now status display actually works  
						
						 
						
						
						
					 
					
						2014-02-04 15:09:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							14a171b088 
							
						 
					 
					
						
						
							
							basic notifications  
						
						 
						
						
						
					 
					
						2014-02-03 18:38:47 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7d79852c84 
							
						 
					 
					
						
						
							
							fixed a bug in xml parsing  
						
						 
						
						
						
					 
					
						2014-02-03 16:04:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3d9294684c 
							
						 
					 
					
						
						
							
							tls is no optional  
						
						 
						
						
						
					 
					
						2014-02-02 17:53:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bbdaf5b0bd 
							
						 
					 
					
						
						
							
							will update messages on conversation update as well  
						
						 
						
						
						
					 
					
						2014-02-02 16:33:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d365bbe480 
							
						 
					 
					
						
						
							
							fetching roster. fixed sending messages as type chat  
						
						 
						
						
						
					 
					
						2014-02-02 16:05:15 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							53d9c9997a 
							
						 
					 
					
						
						
							
							more cleanup. more listeners  
						
						 
						
						
						
					 
					
						2014-02-01 15:07:20 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							43531113b7 
							
						 
					 
					
						
						
							
							more code cleanup for xmpp parser. more eventy. nice unknown contact pictures  
						
						 
						
						
						
					 
					
						2014-02-01 01:25:56 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c3e4f0eaac 
							
						 
					 
					
						
						
							
							parser works but some stuff still needs some refactoring  
						
						 
						
						
						
					 
					
						2014-01-31 00:33:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							6c5c3ac2de 
							
						 
					 
					
						
						
							
							first draft on xml parser and communication. a long way to go. code definitly not perfect. will refactor asap  
						
						 
						
						
						
					 
					
						2014-01-30 16:42:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ad11dab635 
							
						 
					 
					
						
						
							
							added foreign keys constrains. old conversation will actually be removed now like the ui claims  
						
						 
						
						
						
					 
					
						2014-01-29 00:15:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							76cfab03ec 
							
						 
					 
					
						
						
							
							ui flow for first startup with no existing account  
						
						 
						
						
						
					 
					
						2014-01-28 23:15:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							efba73ffd0 
							
						 
					 
					
						
						
							
							refactored newconversationactivty to use array adapter  
						
						 
						
						
						
					 
					
						2014-01-28 22:21:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							52da0fe7c9 
							
						 
					 
					
						
						
							
							account management  
						
						 
						
						
						
					 
					
						2014-01-28 19:21:54 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4f902d8210 
							
						 
					 
					
						
						
							
							conversation archiveable. new conversation will find or restart old conversations  
						
						 
						
						
						
					 
					
						2014-01-27 20:40:42 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							898b0ca8c4 
							
						 
					 
					
						
						
							
							chat bubbles. yeah  
						
						 
						
						
						
					 
					
						2014-01-26 03:27:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							665ef7511f 
							
						 
					 
					
						
						
							
							all access to the persistance layer is now done via the new xmppservice  
						
						 
						
						
						
					 
					
						2014-01-25 19:33:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							df9dcb1060 
							
						 
					 
					
						
						
							
							basic persistance layer. refactor some parts of the conversation activity  
						
						 
						
						
						
					 
					
						2014-01-24 23:58:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							92465091c6 
							
						 
					 
					
						
						
							
							some history fixes  
						
						 
						
						
						
					 
					
						2014-01-24 10:50:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							35f8ab58f4 
							
						 
					 
					
						
						
							
							inital commit  
						
						 
						
						
						
					 
					
						2014-01-24 02:04:05 +01:00