aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Move permission check to createOperationInputDominik Schürmann2015-11-131-91/+96
|/ / /
* | | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-11-137-15/+45
|\ \ \
| * \ \ 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
| | |/ / / | |/| | |
* / | | | 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-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
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | 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 http://stackoverflow...Dominik Schürmann2015-11-023-10/+17
|/ / /
* | | 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-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-263-8/+9
* | | Update tokenautocompleteDominik Schürmann2015-10-261-15/+13
* | | Update android-patternview, materialtabstrip, floatingactionbuttonDominik Schürmann2015-10-261-1/+1
* | | Update zxing-android-embedded with new custom activityDominik Schürmann2015-10-264-7/+90
* | | 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-261-3/+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
|/ /
* | inputdataoperation: guess filetype from filename for generic application/ mim...Vincent Breitmoser2015-10-233-3/+19
* | import: use filesize from content provider on input uriVincent Breitmoser2015-10-231-3/+3
* | decryptlist: use generic file icon for application/octet-streamVincent Breitmoser2015-10-231-0/+4
* | More space for backup codeDominik Schürmann2015-10-221-11/+10
* | Sync changelog with transifexDominik Schürmann2015-10-2219-0/+228