index
:
conversations
BrianBlade-feature/swipe_out_conversation
CryptoNextAlpha
CryptoNextBeta
JingleFixes
MessageParserNext
UnreadCountBadge
cbe
delay_fixes
development
dnsfixes
feature/file_transfer
feature/foreground_service
feature/http_upload
feature/mam
feature/otr_verification
idn_fixes
issue921
lolipop_dns_server_discovery
master
more_logging_for_view_intent
muc_vcard_avatars
nfc
possible_copperhead_fixes
reworked_host_finder_loop
show_members_in_conference
show_send_button_in_softkeyboard
six_love
slack_workaround
tor_support
travis-fixes
travis_fixes
trz/emojicon-merge
trz/emojicon-new
trz/master
trz/merge_1.10.0
trz/merge_1.10.1
trz/merge_1.11.0
trz/merge_1.11.1
trz/merge_1.11.7
trz/merge_1.12.4
trz/merge_1.5.2
trz/merge_1.6.3
trz/merge_1.9.3
trz/merge_1.9.4
trz/rebase
trz/rename
trz/test
verbose_login_log
copy of conversations repo
lookshe
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
src
/
main
/
java
/
eu
/
siacs
/
conversations
/
crypto
/
PgpEngine.java
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
retrigger key selection if openpgp key was deleted
Daniel Gultsch
2016-10-19
1
-2
/
+7
*
add more logging to pgp engine
Daniel Gultsch
2016-08-30
1
-11
/
+18
*
display toast on pgp error
Daniel Gultsch
2016-06-19
1
-1
/
+1
*
refactored pgp decryption
Daniel Gultsch
2016-06-13
1
-107
/
+0
*
republish pgp signature when changing status
Daniel Gultsch
2016-05-05
1
-1
/
+4
*
allow to delete attachments. fixes #1539
Daniel Gultsch
2016-03-23
1
-2
/
+1
*
only add image files to media scanner
Daniel Gultsch
2016-03-23
1
-3
/
+1
*
check for uuid change when decrypting pgp messages
Daniel Gultsch
2016-02-21
1
-7
/
+6
*
encrypt pgp messages to self
Daniel Gultsch
2015-11-26
1
-8
/
+8
*
pgp fixes and revert configuration changes
Daniel Gultsch
2015-11-25
1
-2
/
+10
*
Merge pull request #1558 from fiaxh/pgp_api_9.0
Daniel Gultsch
2015-11-24
1
-13
/
+29
|
\
|
*
Use OpenPGP-API 9.0
fiaxh
2015-11-09
1
-13
/
+29
*
|
PgpEngine: Get account from conversation instead of from contact. fixes #1568...
fiaxh
2015-11-15
1
-3
/
+3
|
/
*
Decrypt PGP messages in background
fiaxh
2015-10-28
1
-0
/
+19
*
Optimize imports
Andreas Straub
2015-07-20
1
-7
/
+8
*
renamed HttpConnection to HttpDownloadConnection
Daniel Gultsch
2015-07-10
1
-1
/
+1
*
changed mime type handling
Daniel Gultsch
2015-07-01
1
-1
/
+1
*
made httpconnection (download) ready all kind of files
feature/http_upload
Daniel Gultsch
2015-06-30
1
-2
/
+2
*
refactored bodyContainsDownloadable to be more flexible
Daniel Gultsch
2015-06-30
1
-1
/
+1
*
untested pgp support for http upload
Daniel Gultsch
2015-06-29
1
-5
/
+9
*
do not check image file size over http if accepted file size is 0
Daniel Gultsch
2015-01-11
1
-3
/
+6
*
some mime and pgp fixes for file transfer
iNPUTmice
2014-11-15
1
-20
/
+1
*
support for pgp files
iNPUTmice
2014-11-15
1
-2
/
+4
*
Rework `Account.getJid()' to return full JIDs
Sam Whited
2014-11-09
1
-7
/
+7
*
Move a chunk of classes over to using JID objects
Sam Whited
2014-11-09
1
-27
/
+13
*
Merge branch 'gradle' into development
Sam Whited
2014-10-30
1
-18
/
+27
*
Make conversations the root project
Sam Whited
2014-10-22
1
-0
/
+385