Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | instrument: update symmetric tests | Vincent Breitmoser | 2015-06-20 | 1 | -1/+0 |
| | |||||
* | fix overflow icon | Vincent Breitmoser | 2015-06-20 | 4 | -1/+1 |
| | |||||
* | drop clipboard backwards compatibility for api level < 11 | Vincent Breitmoser | 2015-06-20 | 10 | -10/+12 |
| | |||||
* | allow encrypting to clipboard in EncryptFileFragment | Vincent Breitmoser | 2015-06-20 | 1 | -0/+5 |
| | |||||
* | more work on decrypt fragment ux | Vincent Breitmoser | 2015-06-20 | 1 | -0/+4 |
| | |||||
* | working DisplayTextActivity, more input support in DecryptActivity | Vincent Breitmoser | 2015-06-20 | 1 | -4/+6 |
| | |||||
* | handle empty filename in decrypt list | Vincent Breitmoser | 2015-06-19 | 1 | -0/+1 |
| | |||||
* | handle EXTRA_TEXT in decrypt activity | Vincent Breitmoser | 2015-06-19 | 1 | -2/+3 |
| | |||||
* | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-18 | 1 | -0/+1 |
|\ | |||||
| * | more stable nullable behavior in OperationLog | Vincent Breitmoser | 2015-06-18 | 1 | -0/+1 |
| | | |||||
* | | handle multiple input URIs and Intent.SEND_MULTIPLE | Vincent Breitmoser | 2015-06-18 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 1 | -0/+1 |
|\| | |||||
| * | fix rest of resource leaks (#1351) | Vincent Breitmoser | 2015-06-17 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'v/instrument' into v/multi-decrypt | Vincent Breitmoser | 2015-06-17 | 5 | -58/+43 |
|\| | | | | | | | | | | | | | Conflicts: .travis.yml OpenKeychain/src/androidTest/java/org/sufficientlysecure/keychain/CreateKeyActivityTest.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | ||||
| * | nicer preview of decrypt_text_fragment layout | Vincent Breitmoser | 2015-06-17 | 1 | -0/+3 |
| | | |||||
| * | use KeyAdapter in KeySpinner | Vincent Breitmoser | 2015-06-17 | 2 | -57/+19 |
| | | |||||
| * | improve preview of ViewKeyActivity layout | Vincent Breitmoser | 2015-06-17 | 1 | -1/+10 |
| | | |||||
| * | (minor) layout changes | Vincent Breitmoser | 2015-06-17 | 1 | -1/+2 |
| | | |||||
| * | add ToolableViewAnimator | Vincent Breitmoser | 2015-06-17 | 1 | -0/+4 |
| | | |||||
| * | Merge pull request #1338 from josecastillo/development | Vincent | 2015-06-12 | 1 | -0/+11 |
| |\ | | | | | | | Improved smart card error handling | ||||
| | * | Replace AssertionErrors with snackbar notifications, fix style issues. | Joey Castillo | 2015-06-11 | 1 | -8/+11 |
| | | | |||||
| | * | Improved smart card error handling | Joey Castillo | 2015-06-10 | 1 | -0/+8 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/master' into v/eventbus | Vincent Breitmoser | 2015-06-11 | 2 | -2/+2 |
| |\| | |||||
* | | | fix status icon alignment | Vincent Breitmoser | 2015-06-14 | 1 | -0/+2 |
| | | | |||||
* | | | (minor) layout changes | Vincent Breitmoser | 2015-06-13 | 2 | -3/+2 |
| | | | |||||
* | | | add ToolableViewAnimator | Vincent Breitmoser | 2015-06-11 | 2 | -9/+16 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-11 | 2 | -2/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | Allow debug build besides release build | Dominik Schürmann | 2015-06-10 | 2 | -2/+2 |
| | | | |||||
* | | | multi-decrypt: switch to cardview | Vincent Breitmoser | 2015-06-10 | 1 | -9/+15 |
| | | | |||||
* | | | Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-10 | 1 | -1/+4 |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/CryptoOperationFragment.java | ||||
| * | | Merge remote-tracking branch 'origin/master' into v/eventbus | Vincent Breitmoser | 2015-06-10 | 1 | -1/+4 |
| |\| | |||||
| | * | Improve FAQ entry for file manager | Dominik Schürmann | 2015-06-08 | 1 | -1/+1 |
| | | | |||||
| | * | Improve FAQ entry for file manager | Dominik Schürmann | 2015-06-08 | 1 | -1/+1 |
| | | | |||||
| | * | Explicit mention of dependency on 3rd party tool | Stéphane Lavergne | 2015-06-08 | 1 | -1/+4 |
| | | | | | | | | | I had the darnest time remembering my old APG days where something was said in passing about, unlike any other application I know, the need here for OI File Manager (or others, later on) to be able to select local files. I'm sure I'm not the only person who could benefit from this reminder. :) | ||||
* | | | WIP! Merge branch 'v/eventbus' into v/multi-decrypt | Vincent Breitmoser | 2015-06-07 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java | ||||
| * | | eventbus: initial attempt, replace messenger hack with eventbus communication | Vincent Breitmoser | 2015-06-06 | 1 | -0/+1 |
| |/ | |||||
* | | Merge branch 'master' into v/multi-decrypt | Vincent Breitmoser | 2015-06-06 | 1 | -0/+10 |
|\| | | | | | | | | | | | | | | | | | this also fixes weird-bug Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | Merge branch 'v/sticky-prefs' | Vincent Breitmoser | 2015-06-03 | 1 | -0/+8 |
| |\ | |||||
| | * | implement sticky preferences | Vincent Breitmoser | 2015-05-31 | 1 | -0/+8 |
| | | | |||||
| * | | prevent keybase key replacing keyserver key | Adithya Abraham Philip | 2015-05-31 | 1 | -0/+1 |
| |/ | |||||
* | | multi-decrypt: implement save operation (missing actual copy) | Vincent Breitmoser | 2015-06-03 | 1 | -3/+5 |
| | | |||||
* | | multi-decrypt: working context menu | Vincent Breitmoser | 2015-06-03 | 3 | -0/+24 |
| | | |||||
* | | multi-decrypt: working in principle | Vincent Breitmoser | 2015-06-02 | 1 | -15/+17 |
| | | |||||
* | | multi-decrypt: working recyclerview which decrypt files sequentially, ui in ↵ | Vincent Breitmoser | 2015-06-02 | 2 | -0/+233 |
| | | | | | | | | progress | ||||
* | | multi-decrypt: first steps, split up DecryptFilesFragment | Vincent Breitmoser | 2015-06-01 | 2 | -129/+114 |
| | | |||||
* | | introduce CachingDataDecryptorFactory towards cached session keys | Vincent Breitmoser | 2015-06-01 | 1 | -0/+0 |
|/ | | | | | | | | this commit introduces the CachingDataDecryptorFactory, which wraps a DataDecryptorFactory but supports caching of decrypted session keys. this change also gets rid of runtimeexception based control flow in PgpDecryptVerify. | ||||
* | prevent NaN dialog on import with no selected keys | Adithya Abraham Philip | 2015-05-31 | 1 | -0/+1 |
| | |||||
* | better error handling for bad encrypted data checksum | Vincent Breitmoser | 2015-05-30 | 1 | -0/+1 |
| | |||||
* | show status indicators in EncryptFragment | Vincent Breitmoser | 2015-05-30 | 3 | -17/+96 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into development | Vincent Breitmoser | 2015-05-28 | 1 | -2/+1 |
|\ | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/NfcOperationActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java OpenKeychain/src/main/res/values/strings.xml |