aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
Commit message (Collapse)AuthorAgeFilesLines
* decrypt: add tests for skipping stripped and unsuitable decryption subkeysVincent Breitmoser2015-11-131-3/+48
|
* Merge remote-tracking branch 'origin/master'Vincent Breitmoser2015-11-131-18/+18
|\
| * Update support libs to 23.1.1Dominik Schürmann2015-11-131-17/+17
| |
| * Use fixed version of mockitoDominik Schürmann2015-11-131-1/+1
| |
* | 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-093-83/+38
| |\|
| * | import: apply fixPgpMessage to text for import from clipboardVincent Breitmoser2015-11-063-3/+24
| | |
* | | decrypt: skip unavailable and unsuitable keysVincent Breitmoser2015-11-133-0/+16
| |/ |/|
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-0813-12/+367
|\|
| * bench: add simple s2k benchmark (iterations for 100ms)Vincent Breitmoser2015-11-043-5/+54
| |
| * bench: run ops multiple times and for an average timeVincent Breitmoser2015-11-043-16/+31
| |
| * Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-11-0417-89/+300
| |\
| * | bench: simple working benchmarkVincent Breitmoser2015-11-048-20/+52
| | |
| * | bench: add benchmark operation for testingVincent Breitmoser2015-11-049-1/+260
| | |
* | | Get whole public key via ACTION_GET_KEYDominik Schürmann2015-11-081-6/+38
| | |
* | | Cleanup settings activityDominik Schürmann2015-11-082-77/+0
| |/ |/|
* | Add READ_EXTERNAL_STORAGE permissionDominik Schürmann2015-11-031-19/+29
| |
* | Support for Android 6 ACTION_PROCESS_TEXTDominik Schürmann2015-11-0211-4/+63
| |
* | 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-025-55/+168
|\ \
| * \ Merge pull request #1578 from open-keychain/keyserver-sync-fixDominik Schürmann2015-11-022-39/+87
| |\ \ | | |/ | |/| Reworked KeyserverSyncAdapterService
| | * 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-023-16/+81
| |/
* | Add runtime permission check for QR Code activityDominik Schürmann2015-11-021-14/+78
| |
* | Fix API 23 regression for activities without layout, see ↵Dominik Schürmann2015-11-023-10/+17
|/ | | | http://stackoverflow.com/q/32169303
* comment git dependency againDominik Schürmann2015-10-291-1/+1
|
* update material drawer libraryDominik Schürmann2015-10-292-44/+46
|
* import: make operation cancelable (again), make "update all" cancelableVincent Breitmoser2015-10-294-20/+36
| | | | (also, use unbounded blocking queue to fix update of more than 10 keys)
* 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-297-22/+27
|
* encrypttext: fix mimetype check logic (#1574)Vincent Breitmoser2015-10-291-1/+2
|
* uploadop: clean up, add loggingVincent Breitmoser2015-10-2913-74/+135
|
* prevent crashes in EncryptKeyCompletionView (2)Vincent Breitmoser2015-10-261-10/+19
|
* Target SDK 23 and related fixesDominik Schürmann2015-10-264-26/+29
|
* Update stickylistheaders, html-textviewDominik Schürmann2015-10-261-7/+4
|
* Update tokenautocompleteDominik Schürmann2015-10-262-21/+20
|
* Update android-patternview, materialtabstrip, floatingactionbuttonDominik Schürmann2015-10-262-8/+8
|
* Update zxing-android-embedded with new custom activityDominik Schürmann2015-10-265-26/+108
|
* Version 3.6.1Dominik Schürmann2015-10-261-2/+2
|
* Pull from transifexDominik Schürmann2015-10-2633-127/+248
|
* 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-262-18/+12
|\
| * Commit Github tokensDominik Schürmann2015-10-261-15/+6
| |
* | fix FileHelper class for pre-lollipop devicesVincent Breitmoser2015-10-262-43/+86
|/
* https everywhereDominik Schürmann2015-10-251-4/+4
|
* linked: fix crash on <= lollipopVincent Breitmoser2015-10-251-3/+6
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 05:33:14 +0000