aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-1914-231/+524
|\
| * Merge pull request #1543 from rohands/issue_mouseover_hintsVincent2015-11-163-0/+114
| |\
| | * Class names and string names are updatedrohands2015-09-223-9/+9
| | * Updatedrohands2015-09-203-5/+21
| | * Mousehintsrohands2015-09-203-0/+98
| * | decryptlist: fix iteratorsVincent Breitmoser2015-11-151-4/+12
| * | fix delete file securely method and use for delete original fileVincent Breitmoser2015-11-153-70/+58
| * | add documentation on marker packet skippingVincent2015-11-151-1/+9
| * | Merge branch 'master' into v/decrypt-key-lookupVincent Breitmoser2015-11-151-3/+1
| |\ \
| | * | fix accidental commit (thought I had removed that)Vincent Breitmoser2015-11-151-3/+1
| * | | Merge branch 'master' into v/decrypt-key-lookupVincent Breitmoser2015-11-1555-696/+1571
| |\| |
| | * | allow database downgrade for debug buildsVincent Breitmoser2015-11-151-0/+4
| | * | some optimizations and indexes for the main key list queryVincent Breitmoser2015-11-153-15/+23
| | * | provider: add debug variable to explain query plansVincent Breitmoser2015-11-152-4/+29
| | * | decrypt: skip all encountered marker packets (fix #1582)Vincent Breitmoser2015-11-155-12/+35
| | * | inputdataop: leave content as-is if no header found (fixes #1592)Vincent Breitmoser2015-11-141-0/+9
| | * | decryptlist: minor cleanups and documentationVincent Breitmoser2015-11-141-7/+30
| | * | decryptlist: some cleanup and streamlining of control flowVincent Breitmoser2015-11-141-81/+84
| * | | decryptlist: re-decrypt after key lookupVincent Breitmoser2015-10-231-8/+14
| * | | decryptlist: implement key lookup (wip)Vincent Breitmoser2015-10-232-38/+114
* | | | Check if NFC is available before displaying buttonDominik Schürmann2015-11-191-3/+5
| |/ / |/| |
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-131-131/+90
|\ \ \
| * | | openpgpservice: move stream closing into delegating methodVincent Breitmoser2015-11-131-131/+90
* | | | Move permission check to createOperationInputDominik Schürmann2015-11-131-91/+96
|/ / /
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-136-15/+43
|\ \ \
| * \ \ Merge commit '816dce0334e8b8d9da3cb00d31d26033b17040a3'Vincent Breitmoser2015-11-134-15/+29
| |\ \ \
| | * | | service: minor code cleanups in key retrievalVincent Breitmoser2015-11-091-12/+5
| | * | | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-11-092-73/+38
| | |\ \ \
| | * | | | import: apply fixPgpMessage to text for import from clipboardVincent Breitmoser2015-11-063-3/+24
| * | | | | decrypt: skip unavailable and unsuitable keysVincent Breitmoser2015-11-132-0/+14
| | |/ / / | |/| | |
* / | | | Request READ_EXTERNAL_STORAGE for decryptionDominik Schürmann2015-11-132-21/+94
|/ / / /
* | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-0811-12/+351
|\| | |
| * | | bench: add simple s2k benchmark (iterations for 100ms)Vincent Breitmoser2015-11-042-3/+50
| * | | bench: run ops multiple times and for an average timeVincent Breitmoser2015-11-042-16/+29
| * | | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-11-046-62/+241
| |\ \ \
| * | | | bench: simple working benchmarkVincent Breitmoser2015-11-047-20/+47
| * | | | bench: add benchmark operation for testingVincent Breitmoser2015-11-047-1/+253
* | | | | Get whole public key via ACTION_GET_KEYDominik Schürmann2015-11-081-6/+38
* | | | | Cleanup settings activityDominik Schürmann2015-11-081-67/+0
| |/ / / |/| | |
* | | | Support for Android 6 ACTION_PROCESS_TEXTDominik Schürmann2015-11-022-4/+48
* | | | Properly hide fab in ViewKeyActivity, fixes #1580Dominik Schürmann2015-11-021-5/+28
* | | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-023-53/+138
|\ \ \ \
| * \ \ \ Merge pull request #1578 from open-keychain/keyserver-sync-fixDominik Schürmann2015-11-022-39/+87
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | changed KeyserverSyncAdapterService to work with START_REDELIVER_INTENTAdithya Abraham Philip2015-10-312-39/+87
| * | | | keylist: add "search for query" button to empty viewVincent Breitmoser2015-11-021-14/+51
| |/ / /
* / / / Add runtime permission check for QR Code activityDominik Schürmann2015-11-021-14/+78
|/ / /
* | | update material drawer libraryDominik Schürmann2015-10-291-22/+20
* | | import: make operation cancelable (again), make "update all" cancelableVincent Breitmoser2015-10-294-20/+36
* | | import: reduce number of threads a little, and code cleanupVincent Breitmoser2015-10-291-39/+37
* | | make use of proxies a Keyserver propertyVincent Breitmoser2015-10-297-49/+55
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 04:02:38 +0000