aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * indicate cbe in chat message hintDaniel Gultsch2015-10-312-1/+23
| |
| * explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-316-16/+46
| |
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-3123-104/+549
|\|
| * 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
| |\ | | | | | | PGP messages background decryption
| | * 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
| |\ | | | | | | Handle some orientation changes manually
| | * Reset the margins manually after rotatingsaqura2015-10-265-1/+50
| | |
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2015-10-261-0/+1
|\| |
| * | invalidate menu after backend connection.Daniel Gultsch2015-10-251-0/+1
| |/ | | | | | | fixes the menu not being shown after rotation in edit account details
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-223-7/+47
|\|
| * 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
| |
* | bug fixed in updaterChristian S2015-10-222-108/+110
| |
* | Merge 'hlad/hlad' into developmentChristian S2015-10-222-0/+22
|\ \
| * | show resource in dynamic tagshlad2015-10-222-0/+22
| | |
* | | set Conversations + version as user-agent for update checkChristian S2015-10-201-0/+13
| | |
* | | add offline hint to subtitle if contact is offlineChristian S2015-10-201-1404/+1410
| | |
* | | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-208-92/+129
|\ \ \ | | |/ | |/|
| * | 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
| | | | | | | | | | | | for chat states sent in the mean time
| * | 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
| | |
* | | show lastseen as subtitle in chatviewChristian S2015-10-191-2/+3
| | |
* | | copy commitsChristian S2015-10-1713-310/+482
|\| |
| * | 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
| | | | | | | | | | | | cleaned up TrustKeysActivity to automatically close if there is nothing to do
| * | block code when doing unforced disconnectDaniel Gultsch2015-10-162-223/+220
| | |
* | | use standard namespace for httpuploadChristian S2015-10-161-1/+1
| | |
* | | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-1629-197/+911
|\| |
| * | 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. ↵Daniel Gultsch2015-10-152-2/+116
| | | | | | | | | | | | fixes #1189
| * | clear bitmap cache before running out of memoryDaniel Gultsch2015-10-141-0/+9
| | |