| 
							
							
								 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 |  |