| 
							
							
								 Sam Whited | a463f82e3b | Cache SCRAM-SHA-1 keys for current session | 2014-11-15 12:57:36 -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 | 5b9c690c47 | Merge branch 'feature/otr_verification' into development | 2014-11-15 15:50:35 +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 |  | 
			
				
					| 
							
							
								 Sam Whited | 4b5d6f5b4f | Improve auth error handling and state machine | 2014-11-15 08:49:00 -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 |  | 
			
				
					| 
							
							
								 Sam Whited | 14cfb60952 | Refactor authentication code | 2014-11-12 10:15:38 -05:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 6cd2ff0d88 | initial smp support | 2014-11-11 17:40:51 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 180a0e4408 | Rework `Account.getJid()' to return full JIDs Remove `Account.getFullJid()' | 2014-11-09 10:57:22 -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 | 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 |  | 
			
				
					| 
							
							
								 Sam Whited | 281ce3105f | Make conversations the root project | 2014-10-22 15:47:11 -04:00 |  |