Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | 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 | 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 | 2 | -86/+66 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | 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 | 1 | -16/+39 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | extract readTextFromUri into FileHelper | Vincent Breitmoser | 2015-06-20 | 2 | -32/+40 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | more work on decrypt fragment ux | Vincent Breitmoser | 2015-06-20 | 4 | -104/+124 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | working DisplayTextActivity, more input support in DecryptActivity | Vincent Breitmoser | 2015-06-20 | 9 | -234/+223 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | 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 | 2 | -26/+146 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | rename activities to match new purpose | Vincent Breitmoser | 2015-06-18 | 6 | -16/+21 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-18 | 1 | -9/+21 | |
|\| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | more stable nullable behavior in OperationLog | Vincent Breitmoser | 2015-06-18 | 1 | -9/+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 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | minor code style fixes | Vincent Breitmoser | 2015-06-18 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | 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 | 8 | -80/+101 | |
|\| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | fix rest of resource leaks (#1351) | Vincent Breitmoser | 2015-06-17 | 6 | -65/+78 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | fix a couple of resource leaks (#1351) | Vincent Breitmoser | 2015-06-17 | 2 | -15/+23 | |
| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | Merge branch 'v/instrument' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 24 | -415/+355 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | |||||
| * | | | | | | | | | | | | | | fix filesize reporting in decrypt operation | Vincent Breitmoser | 2015-06-17 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | instrument: use contrib drawer methods, respect passphrase cache | Vincent Breitmoser | 2015-06-17 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | fix nullpointer in ViewKeyFragment | Vincent Breitmoser | 2015-06-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | fix returned text of cleartext verify | Vincent Breitmoser | 2015-06-17 | 1 | -4/+5 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | use KeyAdapter in KeySpinner | Vincent Breitmoser | 2015-06-17 | 8 | -202/+127 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | fix symmetric text decryption | Vincent Breitmoser | 2015-06-17 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | preliminary EditKeyTest | Vincent Breitmoser | 2015-06-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | return actual last log entry, including from sublogentryparcels | Vincent Breitmoser | 2015-06-17 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | fix recursive log in modifySecretKeyRing | Vincent Breitmoser | 2015-06-17 | 2 | -8/+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 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into v/eventbus | Vincent Breitmoser | 2015-06-11 | 4 | -8/+10 | |
| |\| | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | add ToolableViewAnimator | Vincent Breitmoser | 2015-06-11 | 2 | -0/+62 | |
| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-11 | 4 | -8/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Fix debug/release build separation | Dominik Schürmann | 2015-06-11 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | Allow debug build besides release build | Dominik Schürmann | 2015-06-10 | 4 | -8/+10 | |
| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | fix progress for decrypt | Vincent Breitmoser | 2015-06-10 | 3 | -14/+37 | |
| | | | | | | | | | | | | | | | |