aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
Commit message (Expand)AuthorAgeFilesLines
* 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-1554-696/+1547
|\|
| * 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-154-12/+11
| * 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
| * 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
| * editkey: always return EditKeyResultVincent Breitmoser2015-10-293-14/+16
| * use Proxy.NO_PROXY instead of null value for no proxyVincent Breitmoser2015-10-296-21/+26
| * encrypttext: fix mimetype check logic (#1574)Vincent Breitmoser2015-10-291-1/+2
| * uploadop: clean up, add loggingVincent Breitmoser2015-10-2911-66/+120
| * prevent crashes in EncryptKeyCompletionView (2)Vincent Breitmoser2015-10-261-10/+19
| * Target SDK 23 and related fixesDominik Schürmann2015-10-262-8/+6
| * Update tokenautocompleteDominik Schürmann2015-10-261-15/+13
| * Update zxing-android-embedded with new custom activityDominik Schürmann2015-10-262-6/+75
| * import: move uri resolution into AsyncTask, prevent NetworkOnMainThreadExceptionVincent Breitmoser2015-10-262-49/+44
| * decrypt: restart operation if interrupted by fragment recreationVincent Breitmoser2015-10-261-15/+12
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-10-261-3/+6
| |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 13:06:00 +0000