Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-26 | 23 | -197/+460 |
|\ | |||||
| * | instrument: first couple of tests for OpenPGP API | Vincent Breitmoser | 2015-06-26 | 3 | -1/+188 |
| | | |||||
| * | use KeyAdapter for AllowedKeysListFragment | Vincent Breitmoser | 2015-06-26 | 4 | -135/+135 |
| | | |||||
| * | fix warnings in PassphraseCacheService | Vincent Breitmoser | 2015-06-26 | 1 | -13/+25 |
| | | |||||
| * | Merge pull request #1367 from open-keychain/fingerprint-mismatch | Dominik Schürmann | 2015-06-25 | 1 | -1/+1 |
| |\ | | | | | | | Fixed fingerprint mismatch on web download of keys | ||||
| | * | fixed fingerprint mismatch issue | Adithya Abraham Philip | 2015-06-25 | 1 | -1/+1 |
| |/ | |||||
| * | Notification: follow design guidelines, fix #1313 | Dominik Schürmann | 2015-06-24 | 2 | -51/+37 |
| | | |||||
| * | New notify icon | Dominik Schürmann | 2015-06-24 | 14 | -35/+40 |
| | | |||||
| * | Merge pull request #1360 from moparisthebest/master | Dominik Schürmann | 2015-06-24 | 13 | -5/+78 |
| |\ | | | | | | | New all-white status bar icon to fix issue #1356 | ||||
| | * | New all-white status bar icon to fix issue #1356 | moparisthebest | 2015-06-22 | 13 | -5/+78 |
| |/ | |||||
* | | fix: save file | Vincent Breitmoser | 2015-06-23 | 1 | -5/+5 |
| | | |||||
* | | instrument: save file | Vincent Breitmoser | 2015-06-23 | 1 | -2/+43 |
| | | |||||
* | | fix original file deletion (and instrumentation) | Vincent Breitmoser | 2015-06-23 | 4 | -11/+29 |
| | | |||||
* | | instrument: delete file and inline preference tests | Vincent Breitmoser | 2015-06-23 | 5 | -50/+180 |
| | | |||||
* | | implement deletion of files | Vincent Breitmoser | 2015-06-23 | 21 | -28/+45 |
| | | |||||
* | | implement saving of files | Vincent Breitmoser | 2015-06-23 | 3 | -2/+56 |
| | | |||||
* | | instrument: adapt to new decrypt file dialog, and some minor fixes | Vincent Breitmoser | 2015-06-23 | 6 | -14/+35 |
| | | |||||
* | | move select file logic into EncryptDecryptOverviewFragment | Vincent Breitmoser | 2015-06-22 | 6 | -227/+63 |
| | | |||||
* | | small fix and some cleanup in ServiceProgressFragment | Vincent Breitmoser | 2015-06-22 | 1 | -12/+32 |
| | | |||||
* | | instrument: some cleanup | Vincent Breitmoser | 2015-06-22 | 4 | -91/+14 |
| | | |||||
* | | update instrumentation coverage file | Vincent Breitmoser | 2015-06-22 | 1 | -0/+0 |
| | | |||||
* | | instrument: test error handling in asymmetric operations | Vincent Breitmoser | 2015-06-22 | 1 | -0/+45 |
| | | |||||
* | | don't expose dataset for FileAdapter in encrypt view, small improvements to ↵ | Vincent Breitmoser | 2015-06-22 | 20 | -45/+54 |
| | | | | | | | | error handling | ||||
* | | order menu items for encrypt operations | Vincent Breitmoser | 2015-06-22 | 3 | -6/+18 |
| | | |||||
* | | multi-decrypt: use indeterminate progress only | Vincent Breitmoser | 2015-06-22 | 3 | -54/+49 |
| | | |||||
* | | instrument: restructure some tests, add bad clipboard data test | Vincent Breitmoser | 2015-06-22 | 7 | -41/+45 |
| | | |||||
* | | instrument: some updates to asymmetric decrypt tests | Vincent Breitmoser | 2015-06-22 | 10 | -14/+624 |
| | | |||||
* | | add failure state to DecryptListFragment | Vincent Breitmoser | 2015-06-22 | 2 | -57/+140 |
| | | |||||
* | | add extra for initial fragment in MainActivity | Vincent Breitmoser | 2015-06-22 | 1 | -6/+20 |
| | | |||||
* | | update keychain intents submodule (for travis) | Vincent Breitmoser | 2015-06-20 | 2 | -1/+1 |
| | | |||||
* | | update instrumentation coverage file | Vincent Breitmoser | 2015-06-20 | 1 | -0/+0 |
| | | |||||
* | | instrument: fix DrawableMatcher for varying contexts | Vincent Breitmoser | 2015-06-20 | 1 | -1/+1 |
| | | |||||
* | | don't show "delete original file" for non-file input uris | Vincent Breitmoser | 2015-06-20 | 1 | -6/+4 |
| | | |||||
* | | instrument: check for encrypt/sign status icons | Vincent Breitmoser | 2015-06-20 | 2 | -18/+37 |
| | | |||||
* | | fix display of signed-only content | Vincent Breitmoser | 2015-06-20 | 1 | -4/+7 |
| | | |||||
* | | instrument: update asymmetric tests | Vincent Breitmoser | 2015-06-20 | 2 | -61/+19 |
| | | |||||
* | | instrument: update symmetric tests | Vincent Breitmoser | 2015-06-20 | 6 | -24/+161 |
| | | |||||
* | | fix overflow icon | Vincent Breitmoser | 2015-06-20 | 4 | -1/+1 |
| | | |||||
* | | fix decrypt view intents, save mimetype in storage provider, and thumbnail ↵ | Vincent Breitmoser | 2015-06-20 | 3 | -59/+87 |
| | | | | | | | | loading in decrypt list | ||||
* | | use uris for clipboard data if available in DecryptActivity | Vincent Breitmoser | 2015-06-20 | 2 | -9/+23 |
| | | |||||
* | | drop clipboard backwards compatibility for api level < 11 | Vincent Breitmoser | 2015-06-20 | 12 | -96/+78 |
| | | |||||
* | | add mimetype and streamtype support in TemporaryStorageProvider | Vincent Breitmoser | 2015-06-20 | 1 | -4/+52 |
| | | |||||
* | | allow encrypting to clipboard in EncryptFileFragment | Vincent Breitmoser | 2015-06-20 | 2 | -16/+44 |
| | | |||||
* | | extract readTextFromUri into FileHelper | Vincent Breitmoser | 2015-06-20 | 2 | -32/+40 |
| | | |||||
* | | more work on decrypt fragment ux | Vincent Breitmoser | 2015-06-20 | 5 | -104/+128 |
| | | |||||
* | | working DisplayTextActivity, more input support in DecryptActivity | Vincent Breitmoser | 2015-06-20 | 10 | -238/+229 |
| | | |||||
* | | handle empty filename in decrypt list | Vincent Breitmoser | 2015-06-19 | 2 | -1/+6 |
| | | |||||
* | | handle EXTRA_TEXT in decrypt activity | Vincent Breitmoser | 2015-06-19 | 2 | -23/+61 |
| | | |||||
* | | save instance state in DecryptListFragment | Vincent Breitmoser | 2015-06-19 | 2 | -26/+146 |
| | | |||||
* | | rename activities to match new purpose | Vincent Breitmoser | 2015-06-18 | 7 | -25/+31 |
| | |