| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 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 | 3118340ade | fixed possible npe when loading null counterpart into message | 2014-11-14 19:49:44 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 2db569b20f | made presences synchronized | 2014-11-13 14:44:19 +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 |  | 
			
				
					| 
							
							
								 Sam Whited | 14cfb60952 | Refactor authentication code | 2014-11-12 10:15:38 -05: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 | 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 | 72068d1a26 | fixed private messages | 2014-11-09 21:14:37 +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 |  | 
			
				
					| 
							
							
								 Sam Whited | 53c7905631 | Check for illegal arguments to the toASCII func | 2014-11-09 09:05:02 -05: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 |  |