conversations-plus

thedevstack/conversations-plus

Fork 0

Commit graph

155b607f4d Merge pull request #673 from SamWhited/development Daniel Gultsch 2014-11-16 17:35:59 +01:00
cf00f3fade happy hanukkah iNPUTmice 2014-11-16 17:21:21 +01:00
5765a91db6 Fix fetching accounts by JIDs Sam Whited 2014-11-16 10:04:45 -05:00
84b2ce10b7 Merge branch 'development' of https://github.com/siacs/Conversations into development iNPUTmice 2014-11-16 12:28:21 +01:00
d43aeb7218 Merge branch 'master' into development iNPUTmice 2014-11-16 12:27:17 +01:00
279534ddb4 version bump to 0.8.4 iNPUTmice 2014-11-16 12:25:08 +01:00
ccc3c10066 show full time stamp in connection established field iNPUTmice 2014-11-16 12:11:14 +01:00
ac8c2b7e62 show full time stamp in connection established field iNPUTmice 2014-11-16 12:11:14 +01:00
f41f3b120c better error checking in ssl switch over iNPUTmice 2014-11-16 12:00:53 +01:00
f18f3086af better error checking in ssl switch over iNPUTmice 2014-11-16 12:00:53 +01:00
2c65477532 Merge pull request #672 from SamWhited/development Daniel Gultsch 2014-11-16 03:13:53 +01:00
cfdda5f8fd Don't escape passwords in SASL Sam Whited 2014-11-15 21:09:51 -05:00
2067b9bd8d made scan and show qr code more accessible in VerifyOtrActivity iNPUTmice 2014-11-16 02:10:29 +01:00
2b21bc13fc Merge branch 'master' into development iNPUTmice 2014-11-16 00:34:44 +01:00
ac4eabbd22 close cursor for database iNPUTmice 2014-11-16 00:34:16 +01:00
88c3537b68 parse otr-fingerprint in qr codes and nfc. include otr fingerprint in shareable uri where ever possible iNPUTmice 2014-11-16 00:20:20 +01:00
0fb1772f18 Merge pull request #669 from SamWhited/scramcaching Daniel Gultsch 2014-11-15 21:02:13 +01:00
4a8fa8b498 Merge pull request #670 from kruks23/translation9 Daniel Gultsch 2014-11-15 21:00:05 +01:00
5a634fdf47 small modifications for changing an account status in XmppConnection iNPUTmice 2014-11-15 20:54:28 +01:00
0dc711d710 Update Spanish Translations kruks23 2014-11-15 20:48:31 +01:00
a463f82e3b Cache SCRAM-SHA-1 keys for current session Sam Whited 2014-11-15 12:57:36 -05:00
69ab8a2adb Merge pull request #668 from SamWhited/auth-pinning Daniel Gultsch 2014-11-15 17:44:51 +01:00
17cec63c14 Set security error status on TLS cert mismatch Sam Whited 2014-11-15 11:40:41 -05:00
d2388a5a7e Remove extra status wrapper method Sam Whited 2014-11-15 11:31:15 -05:00
251f4d6d7f Add incompatible server status Sam Whited 2014-11-15 11:29:58 -05:00
7ba9854c22 fixed some disco / carbon related bugs iNPUTmice 2014-11-15 17:24:06 +01:00
c09d450db8 Add security error status Sam Whited 2014-11-15 11:19:42 -05:00
d94b07c916 Make account status an enum Sam Whited 2014-11-15 11:09:02 -05:00
847877f9d2 Add auth method pinning Sam Whited 2014-11-15 09:42:40 -05:00
35bf13f5ef Merge branch 'feature/file_transfer' into development iNPUTmice 2014-11-15 15:52:15 +01:00
07b07115d6 Merge branch 'feature/foreground_service' into development iNPUTmice 2014-11-15 15:51:27 +01:00
5b9c690c47 Merge branch 'feature/otr_verification' into development iNPUTmice 2014-11-15 15:50:35 +01:00
bdc86bb8e3 added low priority and removed date in foreground noticfication iNPUTmice 2014-11-12 17:33:24 +01:00
3c6b3506e3 turn on foreground service in expert settings iNPUTmice 2014-11-12 14:41:43 +01:00
41f7848f2c handled more error cases iNPUTmice 2014-11-15 15:16:40 +01:00
ca2d86cf87 better cleanup after unsuccesful transfers iNPUTmice 2014-11-15 14:52:51 +01:00
47d44448f3 fixed description in notifications and conversation overview iNPUTmice 2014-11-15 14:40:43 +01:00
e0f012dba1 fixed resending for files as well iNPUTmice 2014-11-15 13:19:04 +01:00
cc4f3702a8 made file transfers cancelable iNPUTmice 2014-11-15 12:37:09 +01:00
4ab558715c adepted conversationadapter to deal with files iNPUTmice 2014-11-14 17:39:03 +01:00
af2922adea progress for ibb transfers iNPUTmice 2014-11-14 14:04:34 +01:00
e7a70a46e0 some mime and pgp fixes for file transfer iNPUTmice 2014-11-14 12:31:57 +01:00
16847a30c8 support for pgp files iNPUTmice 2014-11-14 03:27:18 +01:00
c7acfe85c3 progress for http images as well. fixed open button for sent files iNPUTmice 2014-11-14 01:29:56 +01:00
dac12be53e copy non local files to private storage first iNPUTmice 2014-11-14 00:28:39 +01:00
02cbda68a7 bug fixes and various improvements for file transfer iNPUTmice 2014-11-13 22:59:00 +01:00
7a90ca429b basic arbitrary file transfer iNPUTmice 2014-11-13 21:04:05 +01:00
4c504dea7a Merge pull request #665 from SamWhited/issue71 Daniel Gultsch 2014-11-15 15:34:50 +01:00
4b5d6f5b4f Improve auth error handling and state machine Sam Whited 2014-11-15 08:48:40 -05:00
e2fb32841b Merge pull request #666 from SamWhited/localefixes Daniel Gultsch 2014-11-15 13:12:29 +01:00
591326f952 Merge pull request #667 from SamWhited/licensesuntranslatable Daniel Gultsch 2014-11-15 13:12:16 +01:00
8650bc2e13 Make licenses info untranslatable Sam Whited 2014-11-14 22:33:18 -05:00
bae2b7ddc6 Spelling fixes in Italian translation Sam Whited 2014-11-14 22:16:58 -05:00
62404b234c Spelling fix in German translation Sam Whited 2014-11-14 22:13:42 -05:00
0e550789d3 Add SCRAM-SHA1 support Sam Whited 2014-11-12 15:35:44 -05:00
c61120bfc4 Merge pull request #664 from squidpickles/development Daniel Gultsch 2014-11-14 21:01:21 +01:00
2bb68bcbba Added check for empty from on group chat packet Kevin Rauwolf 2014-11-14 11:40:43 -08:00
793671023b Merge branch 'development' of https://github.com/siacs/Conversations into development iNPUTmice 2014-11-14 19:49:49 +01:00
3118340ade fixed possible npe when loading null counterpart into message iNPUTmice 2014-11-14 19:49:44 +01:00
2bbad26fb0 Merge pull request #653 from kriztan/patch-2 Daniel Gultsch 2014-11-14 12:16:57 +01:00
17c2ed411d made presences synchronized iNPUTmice 2014-11-13 14:44:19 +01:00
2db569b20f made presences synchronized iNPUTmice 2014-11-13 14:44:19 +01:00
77ba68d61f more npe checks in muc packet parser iNPUTmice 2014-11-13 14:27:10 +01:00
e6a4fa031b more npe checks in muc packet parser iNPUTmice 2014-11-13 14:27:10 +01:00
88c8373553 Merge pull request #656 from SamWhited/authrefactor Daniel Gultsch 2014-11-12 23:01:18 +01:00
a74fa9c930 Merge pull request #659 from SamWhited/jidfixes Daniel Gultsch 2014-11-12 23:01:04 +01:00
2222483b42 Make sure we're storing the display JID as Unicode Sam Whited 2014-11-12 16:19:16 -05:00
fca3e3c756 Update German language kriztan 2014-11-12 20:09:14 +01:00
14cfb60952 Refactor authentication code Sam Whited 2014-11-12 10:15:38 -05:00
b971965697 Update German language kriztan 2014-11-12 13:13:59 +01:00
f1e2be4096 check if account is online before doing smp iNPUTmice 2014-11-12 12:45:59 +01:00
52ca2e7391 Merge branch 'feature/otr_verification' of https://github.com/siacs/Conversations into feature/otr_verification iNPUTmice 2014-11-11 17:45:16 +01:00
d1bf9a3f6d use auto register for verify otr listeners iNPUTmice 2014-11-11 17:42:09 +01:00
76f4cf1a73 small bug fix iNPUTmice 2014-11-10 23:47:04 +01:00
e33fc26cbe added snackbar to indicate smp. more error handling in verify activity iNPUTmice 2014-11-10 22:03:23 +01:00
6cd2ff0d88 initial smp support iNPUTmice 2014-11-10 19:23:54 +01:00
e555fe4b03 auto register/unregister listeners iNPUTmice 2014-11-11 17:39:28 +01:00
fce78abb1c temporarliy got rid of some insane work arounds in favor of some maybe less insane work arounds iNPUTmice 2014-11-11 00:16:43 +01:00
8cb97f517f small bug fix iNPUTmice 2014-11-10 23:47:04 +01:00
dc98b3dbd5 added snackbar to indicate smp. more error handling in verify activity iNPUTmice 2014-11-10 22:03:23 +01:00
8740b55d37 initial smp support iNPUTmice 2014-11-10 19:23:54 +01:00
c8a6b05163 made Jid class parse otr session ids iNPUTmice 2014-11-10 11:37:31 +01:00
89ee999e1b more refactoring for presence selection. removed getTo, getFrom and getJid from Element iNPUTmice 2014-11-10 01:24:35 +01:00
26b4788733 formating iNPUTmice 2014-11-09 21:27:37 +01:00
a01ff66537 Merge pull request #645 from betheg/about_all_libs Daniel Gultsch 2014-11-09 21:18:32 +01:00
72068d1a26 fixed private messages iNPUTmice 2014-11-09 21:14:37 +01:00
b1da9ae3cc add libidn to pref_about_message. Michael 2014-11-09 21:00:44 +01:00
a45a343604 Merge pull request #644 from SamWhited/barejidchecks Daniel Gultsch 2014-11-09 20:05:38 +01:00
385bea0fe3 s/getResourcepart().isEmpty()/isBareJid()/ Sam Whited 2014-11-09 13:13:19 -05:00
56b4ac1751 use isBareJid instead of getResourcePart().isEmpty() iNPUTmice 2014-11-09 19:06:43 +01:00
eb9e988361 fixed muc sender history for some cases (where the previous nick was a valid jid) iNPUTmice 2014-11-09 18:24:01 +01:00
69ef17efc0 migrated some otr stuff to new jid classes iNPUTmice 2014-11-09 17:46:00 +01:00
c310ada8b3 Merge branch 'development' of https://github.com/siacs/Conversations into development iNPUTmice 2014-11-09 17:05:20 +01:00
cb1a36da79 Merge pull request #642 from SamWhited/accountgetjid Daniel Gultsch 2014-11-09 17:06:09 +01:00
44de982877 Merge pull request #643 from SamWhited/idndependfix Daniel Gultsch 2014-11-09 17:04:47 +01:00
0aa6efe444 Remove unused dependency Sam Whited 2014-11-09 11:03:22 -05:00
e9af0d4ca7 Merge branch 'master' into development iNPUTmice 2014-11-09 17:02:49 +01:00
61f046a675 make avatar service not break on empty names iNPUTmice 2014-11-09 17:02:39 +01:00
180a0e4408 Rework `Account.getJid()' to return full JIDs Sam Whited 2014-11-09 10:57:22 -05:00
ad6fef063b fixed null pointer in message merger iNPUTmice 2014-11-09 16:47:31 +01:00