Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Connect YubiKey URL to OpenKeychain | Dominik Schürmann | 2015-06-29 | 2 | -6/+26 |
| | |||||
* | Create key wizard for blank YubiKey | Dominik Schürmann | 2015-06-29 | 8 | -50/+202 |
| | |||||
* | cleanup share fragment, fix sharing of fingerprint | Vincent Breitmoser | 2015-06-29 | 2 | -166/+120 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-26 | 2 | -2/+94 |
|\ | |||||
| * | use KeyAdapter for AllowedKeysListFragment | Vincent Breitmoser | 2015-06-26 | 2 | -2/+94 |
| | | |||||
* | | fix: save file | Vincent Breitmoser | 2015-06-23 | 1 | -5/+5 |
| | | |||||
* | | fix original file deletion (and instrumentation) | Vincent Breitmoser | 2015-06-23 | 1 | -6/+21 |
| | | |||||
* | | implement deletion of files | Vincent Breitmoser | 2015-06-23 | 1 | -4/+17 |
| | | |||||
* | | implement saving of files | Vincent Breitmoser | 2015-06-23 | 1 | -2/+23 |
| | | |||||
* | | instrument: adapt to new decrypt file dialog, and some minor fixes | Vincent Breitmoser | 2015-06-23 | 3 | -8/+6 |
| | | |||||
* | | move select file logic into EncryptDecryptOverviewFragment | Vincent Breitmoser | 2015-06-22 | 3 | -195/+50 |
| | | |||||
* | | don't expose dataset for FileAdapter in encrypt view, small improvements to ↵ | Vincent Breitmoser | 2015-06-22 | 2 | -27/+35 |
| | | | | | | | | error handling | ||||
* | | multi-decrypt: use indeterminate progress only | Vincent Breitmoser | 2015-06-22 | 1 | -4/+3 |
| | | |||||
* | | instrument: some updates to asymmetric decrypt tests | Vincent Breitmoser | 2015-06-22 | 2 | -7/+7 |
| | | |||||
* | | add failure state to DecryptListFragment | Vincent Breitmoser | 2015-06-22 | 1 | -56/+91 |
| | | |||||
* | | 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 | 1 | -1/+1 |
| | | |||||
* | | don't show "delete original file" for non-file input uris | Vincent Breitmoser | 2015-06-20 | 1 | -6/+4 |
| | | |||||
* | | fix display of signed-only content | Vincent Breitmoser | 2015-06-20 | 1 | -4/+7 |
| | | |||||
* | | instrument: update symmetric tests | Vincent Breitmoser | 2015-06-20 | 2 | -2/+3 |
| | | |||||
* | | fix decrypt view intents, save mimetype in storage provider, and thumbnail ↵ | Vincent Breitmoser | 2015-06-20 | 2 | -48/+73 |
| | | | | | | | | 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 | 1 | -26/+52 |
| | | |||||
* | | allow encrypting to clipboard in EncryptFileFragment | Vincent Breitmoser | 2015-06-20 | 1 | -16/+39 |
| | | |||||
* | | extract readTextFromUri into FileHelper | Vincent Breitmoser | 2015-06-20 | 1 | -32/+3 |
| | | |||||
* | | more work on decrypt fragment ux | Vincent Breitmoser | 2015-06-20 | 3 | -104/+123 |
| | | |||||
* | | working DisplayTextActivity, more input support in DecryptActivity | Vincent Breitmoser | 2015-06-20 | 8 | -231/+153 |
| | | |||||
* | | handle empty filename in decrypt list | Vincent Breitmoser | 2015-06-19 | 1 | -1/+5 |
| | | |||||
* | | handle EXTRA_TEXT in decrypt activity | Vincent Breitmoser | 2015-06-19 | 1 | -21/+58 |
| | | |||||
* | | save instance state in DecryptListFragment | Vincent Breitmoser | 2015-06-19 | 1 | -26/+83 |
| | | |||||
* | | rename activities to match new purpose | Vincent Breitmoser | 2015-06-18 | 6 | -16/+21 |
| | | |||||
* | | fix ToolableViewAnimator (againl) | Vincent Breitmoser | 2015-06-18 | 1 | -1/+8 |
| | | |||||
* | | handle multiple input URIs and Intent.SEND_MULTIPLE | Vincent Breitmoser | 2015-06-18 | 4 | -42/+91 |
| | | |||||
* | | fix typo in excluder activity name | Vincent Breitmoser | 2015-06-18 | 1 | -1/+1 |
| | | |||||
* | | fix small oversight in ToolableViewAnimator | Vincent Breitmoser | 2015-06-18 | 1 | -0/+8 |
| | | |||||
* | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 3 | -54/+56 |
|\| | |||||
| * | fix rest of resource leaks (#1351) | Vincent Breitmoser | 2015-06-17 | 3 | -54/+56 |
| | | |||||
* | | Merge branch 'v/instrument' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 17 | -391/+328 |
|\| | | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | ||||
| * | fix nullpointer in ViewKeyFragment | Vincent Breitmoser | 2015-06-17 | 1 | -1/+1 |
| | | |||||
| * | use KeyAdapter in KeySpinner | Vincent Breitmoser | 2015-06-17 | 7 | -202/+123 |
| | | |||||
| * | fix symmetric text decryption | Vincent Breitmoser | 2015-06-17 | 1 | -1/+3 |
| | | |||||
| * | instrument: change handling in PassphraseDialogActivity to work with espresso | Vincent Breitmoser | 2015-06-17 | 1 | -76/+32 |
| | | |||||
| * | instrument: work on instrumentation tests | Vincent Breitmoser | 2015-06-17 | 1 | -1/+0 |
| | | |||||
| * | add extra to disregard first-time dialog to main activity | Vincent Breitmoser | 2015-06-17 | 1 | -1/+3 |
| | | |||||
| * | instrument: add helper method for snackbar checking | Vincent Breitmoser | 2015-06-17 | 1 | -16/+7 |
| | | |||||
| * | add ToolableViewAnimator | Vincent Breitmoser | 2015-06-17 | 1 | -0/+61 |
| | | |||||
| * | Merge pull request #1338 from josecastillo/development | Vincent | 2015-06-12 | 2 | -23/+158 |
| |\ | | | | | | | Improved smart card error handling | ||||
| | * | Replace AssertionErrors with snackbar notifications, fix style issues. | Joey Castillo | 2015-06-11 | 1 | -42/+40 |
| | | | |||||
| | * | Improved smart card error handling | Joey Castillo | 2015-06-10 | 2 | -23/+160 |
| | | | |||||
| * | | some bugfixes for new CryptoOperationFragment | Vincent Breitmoser | 2015-06-11 | 3 | -70/+1 |
| | | |