aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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
| |\ \ \ \ | | |/ / / | |/| | | 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-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
| | | | | | | | | | | | (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-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
|\ \ \
* | | | fix FileHelper class for pre-lollipop devicesVincent Breitmoser2015-10-262-43/+86
|/ / /
* / / linked: fix crash on <= lollipopVincent Breitmoser2015-10-251-3/+6
|/ /
* | inputdataoperation: guess filetype from filename for generic application/ ↵Vincent Breitmoser2015-10-232-3/+18
| | | | | | | | mime types
* | 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
| |
* | fix argument order screwup in FileHelperVincent Breitmoser2015-10-223-3/+3
| |
* | Fix keybase verificationDominik Schürmann2015-10-211-20/+17
| |
* | Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2015-10-216-8/+75
|\ \
| * | decrypt: special case single encrypted text -> directly display text, if not ↵Vincent Breitmoser2015-10-211-0/+23
| | | | | | | | | | | | too large
| * | Merge branch 'master' of github.com:open-keychain/open-keychainVincent Breitmoser2015-10-211-2/+2
| |\ \
| * | | encrypttext: localization, and truncate overlong inputVincent Breitmoser2015-10-211-2/+6
| | | |
| * | | encrypttext: handle input via Intent.EXTRA_STREAM in addition to ↵Vincent Breitmoser2015-10-211-6/+34
| | | | | | | | | | | | | | | | Intent.EXTRA_TEXT
| * | | displaytextactivity: truncate displayed text if too longVincent Breitmoser2015-10-212-0/+11
| | | |
| * | | fix crash due to malformed log entryVincent Breitmoser2015-10-211-1/+1
| | | |
| * | | re-add accidentally deleted stringVincent Breitmoser2015-10-211-1/+2
| | | |
* | | | Improve file handling in TemporaryFileProviderDominik Schürmann2015-10-211-16/+21
| |/ / |/| |
* | | SHA1 and RIPEMD160 are not declared insecure until widely deployedDominik Schürmann2015-10-211-2/+2
|/ /
* | Integrate yubikey reset methodDominik Schürmann2015-10-163-6/+38
| |
* | UI preparations for yubikey resetDominik Schürmann2015-10-162-31/+68
| |
* | Remove default PIN settingDominik Schürmann2015-10-166-53/+0
| |