aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
* added more well known file typesChristian S2015-07-231-3/+49
* changed default image format in config fileChristian S2015-07-231-2/+2
|\
| * move typing info to ActionBar subtitleChristian S2015-07-204-117/+138
* | copy commitsChristian S2015-07-2324-164/+365
|\ \
| * | show warning when trying to highlight users that have left the conferenceDaniel Gultsch2015-07-222-5/+21
| * | treat private, non-anonymous mucs like 1:1 chats notification wiseDaniel Gultsch2015-07-222-1/+8
| * | Always build own device session automaticallyAndreas Straub2015-07-221-6/+13
| * | add no-store to chat statesDaniel Gultsch2015-07-221-0/+2
| * | use type=chat more often to go along with new, simple carbon and mam rulesDaniel Gultsch2015-07-222-12/+15
| * | use 'interactive mode' when starting downloads from the context menuDaniel Gultsch2015-07-223-3/+2
| * | Hide regenerate keys buttonAndreas Straub2015-07-222-10/+15
| * | Disable trust toggle completely for INACTIVE keysAndreas Straub2015-07-221-0/+1
| * | made image file format configurable by Config.javaDaniel Gultsch2015-07-213-8/+18
| * | fixed npe in error message handlingDaniel Gultsch2015-07-211-1/+1
| * | Add INACTIVE state for removed keysAndreas Straub2015-07-218-40/+101
| * | Fill own device sessions into SessionMapAndreas Straub2015-07-211-7/+14
| * | allow for private messages being started from muc details in anonymous mucsDaniel Gultsch2015-07-213-15/+42
| * | and now do that properlyDaniel Gultsch2015-07-211-1/+1
| * | end otr session when receiving failed otr message warningsDaniel Gultsch2015-07-211-1/+7
| * | bugfix: also add no-permanent-storage to message hintsDaniel Gultsch2015-07-212-1/+2
| * | bugfix: changed condition of onOtrSessionEstablished being calledDaniel Gultsch2015-07-211-6/+6
| * | Use properly fixed numeral values in Trust enumAndreas Straub2015-07-212-9/+31
| * | Remove unused importAndreas Straub2015-07-211-1/+0
| * | Switch payload encryption to AES-GCMAndreas Straub2015-07-213-17/+46
| * | Also decrypt messages from UNTRUSTED sessionsAndreas Straub2015-07-201-1/+1
| * | Refactor axolotl send processing/caching flowAndreas Straub2015-07-203-17/+16
* | | copy commitsChristian S2015-07-2062-428/+3311
|\| |
| * | Start TrustKeysActivity if no keys are TRUSTEDAndreas Straub2015-07-203-10/+21
| * | Do not display clear devices button if not onlineAndreas Straub2015-07-201-0/+1
| * | Add purge axolotl key optionAndreas Straub2015-07-205-38/+96
| * | Fix getNumTrustedKeysAndreas Straub2015-07-201-2/+4
| * | attempt to fix the delay problemDaniel Gultsch2015-07-205-53/+39
| * | changed message bubble appearanceRaphael Pohl2015-07-201-10/+27
| * | rely on refreshUi/refreshUiReal and make sure it is being used everywhereDaniel Gultsch2015-07-2014-76/+66
| * | Merge branch 'CryptoNextBeta' into developmentAndreas Straub2015-07-2058-303/+3045
| |\ \
| | * | Lock TrustKeys if no trusted keys are availableAndreas Straub2015-07-203-4/+48
| | * | Optimize importsAndreas Straub2015-07-2047-195/+167
| | * | Fix set/remove OnUpdateBlocklistListenerAndreas Straub2015-07-201-5/+5
| | * | Fix axolotl database migrationAndreas Straub2015-07-201-2/+5
| | * | Remove device list from EditAccountAndreas Straub2015-07-191-22/+0
| | * | Add clear devices to overflow menu in EditAccountAndreas Straub2015-07-191-3/+11
| | * | Ask for key trust when sending messagesAndreas Straub2015-07-198-57/+453
| | * | Encrypt files for HTTP upload in encrypted chatsAndreas Straub2015-07-192-3/+7
| | * | Refactor trust key ui and show in account detailsAndreas Straub2015-07-193-48/+102
| | * | Send correct body for HTTP filesAndreas Straub2015-07-191-1/+7
| | * | Handle file transmission properly in axolotlAndreas Straub2015-07-191-4/+12
| | * | Remove unneccessary codeAndreas Straub2015-07-191-2/+1
| | * | Fix trust status for outgoing messagesAndreas Straub2015-07-195-28/+43
| | * | Don't merge messages with different trust statusesAndreas Straub2015-07-191-1/+7
| | * | Fix copying of axolotl keys to clipboardSam Whited2015-07-191-1/+1