07b0711
Merge branch 'feature/foreground_service' into development
Conflicts: src/main/res/values/strings.xml
iNPUTmice created
5b9c690
Merge branch 'feature/otr_verification' into development
iNPUTmice created
4c504de
Merge pull request #665 from SamWhited/issue71
Add SCRAM-SHA1 support
Daniel Gultsch created
bdc86bb
added low priority and removed date in foreground noticfication
iNPUTmice created
3c6b350
turn on foreground service in expert settings
iNPUTmice created
41f7848
handled more error cases
iNPUTmice created
ca2d86c
better cleanup after unsuccesful transfers
iNPUTmice created
47d4444
fixed description in notifications and conversation overview
iNPUTmice created
e0f012d
fixed resending for files as well
iNPUTmice created
cc4f370
made file transfers cancelable
iNPUTmice created
4ab5587
adepted conversationadapter to deal with files
iNPUTmice created
af2922a
progress for ibb transfers
iNPUTmice created
e7a70a4
some mime and pgp fixes for file transfer
iNPUTmice created
16847a3
support for pgp files
iNPUTmice created
c7acfe8
progress for http images as well. fixed open button for sent files
iNPUTmice created
dac12be
copy non local files to private storage first
iNPUTmice created
02cbda6
bug fixes and various improvements for file transfer
iNPUTmice created
7a90ca4
basic arbitrary file transfer
iNPUTmice created
4b5d6f5
Improve auth error handling and state machine
Sam Whited created
e2fb328
Merge pull request #666 from SamWhited/localefixes
Spelling fixes
Daniel Gultsch created
591326f
Merge pull request #667 from SamWhited/licensesuntranslatable
Make licenses info untranslatable
Daniel Gultsch created
8650bc2
Make licenses info untranslatable
Sam Whited created
bae2b7d
Spelling fixes in Italian translation
Sam Whited created
62404b2
Spelling fix in German translation
Sam Whited created
0e55078
Add SCRAM-SHA1 support
Factor out GS2 tokanization into own class Add authentication exception class Fixes #71
Sam Whited created
c61120b
Merge pull request #664 from squidpickles/development
Added check for empty from on group chat packet
Daniel Gultsch created
2bb68bc
Added check for empty from on group chat packet
Kevin Rauwolf created
7936710
Merge branch 'development' of https://github.com/siacs/Conversations into development
iNPUTmice created
3118340
fixed possible npe when loading null counterpart into message
iNPUTmice created
2bbad26
Merge pull request #653 from kriztan/patch-2
Update German language
Daniel Gultsch created
17c2ed4
made presences synchronized
iNPUTmice created
2db569b
made presences synchronized
iNPUTmice created
77ba68d
more npe checks in muc packet parser
iNPUTmice created
e6a4fa0
more npe checks in muc packet parser
iNPUTmice created
88c8373
Merge pull request #656 from SamWhited/authrefactor
Refactor authentication code
Daniel Gultsch created
a74fa9c
Merge pull request #659 from SamWhited/jidfixes
Make sure we're storing the display JID as Unicode
Daniel Gultsch created
2222483
Make sure we're storing the display JID as Unicode
Sam Whited created
fca3e3c
Update German language
deleted 'pref_about_message'
kriztan created
14cfb60
Refactor authentication code
Sam Whited created
b971965
Update German language
kriztan created
f1e2be4
check if account is online before doing smp
iNPUTmice created
52ca2e7
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
iNPUTmice created
d1bf9a3
use auto register for verify otr listeners
iNPUTmice created
76f4cf1
small bug fix
iNPUTmice created
e33fc26
added snackbar to indicate smp. more error handling in verify activity
iNPUTmice created
6cd2ff0
initial smp support
iNPUTmice created
e555fe4
auto register/unregister listeners
iNPUTmice created
fce78ab
temporarliy got rid of some insane work arounds in favor of some maybe less insane work arounds
iNPUTmice created
8cb97f5
small bug fix
iNPUTmice created
dc98b3d
added snackbar to indicate smp. more error handling in verify activity
iNPUTmice created