sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,672 Commits 5 Branches 297 Tags 50 MiB
Commit Graph

6672 Commits

Author SHA1 Message Date
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
Daniel Gultsch 591326f952 Merge pull request #667 from SamWhited/licensesuntranslatable 
Make licenses info untranslatable
 2014-11-15 13:12:16 +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
Daniel Gultsch c61120bfc4 Merge pull request #664 from squidpickles/development 
Added check for empty from on group chat packet
 2014-11-14 21:01:21 +01: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
Daniel Gultsch a74fa9c930 Merge pull request #659 from SamWhited/jidfixes 
Make sure we're storing the display JID as Unicode
 2014-11-12 23:01:04 +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
Daniel Gultsch a45a343604 Merge pull request #644 from SamWhited/barejidchecks 
s/getResourcepart().isEmpty()/isBareJid()/ [EOM]
 2014-11-09 20:05:38 +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
Daniel Gultsch 44de982877 Merge pull request #643 from SamWhited/idndependfix 
Remove unused dependency
 2014-11-09 17:04:47 +01:00