aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * fail jingle file transfer if axolotl key message could not be created. fixes ...Daniel Gultsch2015-11-261-1/+5
| * pgp fixes and revert configuration changesDaniel Gultsch2015-11-2515-129/+91
| * Merge pull request #1569 from fiaxh/conference_one_other_occupantDaniel Gultsch2015-11-241-20/+48
| |\
| | * Own contact picture in tile for conferences with only one other occupantfiaxh2015-11-151-20/+48
| * | Merge pull request #1558 from fiaxh/pgp_api_9.0Daniel Gultsch2015-11-247-44/+137
| |\ \
| | * | Sign empty statusfiaxh2015-11-092-3/+1
| | * | Use OpenPGP-API 9.0fiaxh2015-11-096-43/+138
| | |/
| * / PgpEngine: Get account from conversation instead of from contact. fixes #1568...fiaxh2015-11-151-3/+3
| |/
| * Move migration 19 before 17Andreas Straub2015-11-061-3/+6
| * don't close socket on disconnectDaniel Gultsch2015-11-011-1/+0
| * indicate cbe in chat message hintDaniel Gultsch2015-10-312-1/+23
| * explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-316-16/+46
| * fixed session objects not being build on start upDaniel Gultsch2015-10-302-2/+1
| * Merge pull request #1513 from fiaxh/pgp_background_decryptionDaniel Gultsch2015-10-3010-74/+292
| |\
| | * Show PGP "please wait" message only when actually decryptingfiaxh2015-10-281-1/+5
| | * Decrypt PGP messages in backgroundfiaxh2015-10-289-73/+287
| * | moved db calls made from UI into serial background threadDaniel Gultsch2015-10-291-5/+21
| * | avoid npe when checking for stream restartDaniel Gultsch2015-10-291-2/+4
| * | push CN into nick pep node when uploading certificate. subscribe to nick nodeDaniel Gultsch2015-10-297-5/+47
| * | Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2015-10-291-1/+1
| |\|
| | * Don't synchronize on non-final fieldSam Whited2015-10-261-1/+1
| * | load avatars in message adapter in background taskDaniel Gultsch2015-10-292-13/+111
| * | show encryption type in warned/red messagesDaniel Gultsch2015-10-282-0/+21
| |/
| * Merge pull request #1520 from saqura/self_handle_orientationDaniel Gultsch2015-10-265-1/+50
| |\
| | * Reset the margins manually after rotatingsaqura2015-10-265-1/+50
| * | invalidate menu after backend connection.Daniel Gultsch2015-10-251-0/+1
| |/
| * join muc even if initial conference configuration fetch failedDaniel Gultsch2015-10-222-2/+43
| * fixed read conversations showing up as notifications after a restartDaniel Gultsch2015-10-211-5/+4
| * open unknown files with wildcard intentDaniel Gultsch2015-10-202-10/+15
| * open manage account + certificate chooser when cbe mode is enabledDaniel Gultsch2015-10-202-28/+39
| * move chat state reset from background switch to foreground switch to account ...Daniel Gultsch2015-10-191-3/+3
| * update last seen in mucs. fixes #1508Daniel Gultsch2015-10-191-1/+5
| * add nick to bookmark when entering full jid in join conference dialogDaniel Gultsch2015-10-191-4/+6
| * synchronize around the disco objectDaniel Gultsch2015-10-191-44/+53
| * disconnet in background threadDaniel Gultsch2015-10-171-1/+7
| * only try EXTERNAL auth if client certificate is set for accountDaniel Gultsch2015-10-171-1/+1
| * don't retry building broken omemo keysDaniel Gultsch2015-10-171-4/+15
| * allow redownloading files from remote hosts. fixes #1504Daniel Gultsch2015-10-172-3/+13
| * load axolotl session cache on first device updateDaniel Gultsch2015-10-171-2/+6
| * improved error reporting in trust keys activityDaniel Gultsch2015-10-176-22/+47
| * introduced code to verify omemo device keys with x509 certificates.Daniel Gultsch2015-10-168-65/+190
| * block code when doing unforced disconnectDaniel Gultsch2015-10-162-223/+220
| * moved other name parsing into seperate methodDaniel Gultsch2015-10-151-40/+45
| * use constants for oids in xmppdomainverifierDaniel Gultsch2015-10-151-2/+5
| * more checks for xmppdomainverifier and better wildcard handlingDaniel Gultsch2015-10-151-4/+10
| * use own XmppDomainVerifier instead of deprecated StrictHostnameVerifier. fixe...Daniel Gultsch2015-10-152-2/+116
| * clear bitmap cache before running out of memoryDaniel Gultsch2015-10-141-0/+9
| * make unread status and notifications presistent across restartsDaniel Gultsch2015-10-146-34/+74
| * work with muc services that change the message idDaniel Gultsch2015-10-142-1/+3
| * cleaned up some code. log last tagDaniel Gultsch2015-10-131-8/+14