| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | 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 | |||||
| | * | preserve state in DecryptTextActivity | Vincent Breitmoser | 2015-05-28 | 1 | -2/+1 | |
| | | | ||||||
| | * | fix merge problems (derp) | Vincent Breitmoser | 2015-05-28 | 1 | -16/+0 | |
| | | | ||||||
| | * | warn on signature earlier than key creation, err on significantly earlier | Vincent Breitmoser | 2015-05-28 | 1 | -0/+1 | |
| | | | ||||||
| | * | don't show allowed key list if no key exists, and some minor ↵ | Vincent Breitmoser | 2015-05-28 | 8 | -8/+8 | |
| | | | | | | | | | PgpDecryptVerify changes | |||||
| | * | correctly preserve state in EncryptFilesFragment | Vincent Breitmoser | 2015-05-28 | 1 | -2/+0 | |
| | | | ||||||
| | * | move synchronous encryption into activity, and preserve checkbox state | Vincent Breitmoser | 2015-05-28 | 3 | -10/+9 | |
| | | | ||||||
| | * | Improve strings | Dominik Schürmann | 2015-05-28 | 2 | -28/+45 | |
| | | | ||||||
| | * | Fix language based on feedback from transifex | Dominik Schürmann | 2015-05-21 | 1 | -1/+1 | |
| | | | ||||||
| | * | check fingerprint length after scanning qr code | Vincent Breitmoser | 2015-05-17 | 1 | -1/+2 | |
| | | | | | | | | | Fixes #1281 | |||||
| | * | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 1 | -0/+3 | |
| | | | ||||||
| * | | warn on signature earlier than key creation, err on significantly earlier | Vincent Breitmoser | 2015-05-28 | 1 | -0/+1 | |
| | | | ||||||
| * | | don't show allowed key list if no key exists, and some minor ↵ | Vincent Breitmoser | 2015-05-28 | 8 | -8/+8 | |
| | | | | | | | | | PgpDecryptVerify changes | |||||
| * | | correctly preserve state in EncryptFilesFragment | Vincent Breitmoser | 2015-05-27 | 1 | -2/+0 | |
| | | | ||||||
| * | | move synchronous encryption into activity, and preserve checkbox state | Vincent Breitmoser | 2015-05-27 | 3 | -10/+9 | |
| | | | ||||||
| * | | Fix language based on feedback from transifex | Dominik Schürmann | 2015-05-21 | 1 | -1/+1 | |
| | | | ||||||
| * | | Improve strings | Dominik Schürmann | 2015-05-19 | 2 | -33/+34 | |
| | | | ||||||
| * | | check fingerprint length after scanning qr code | Vincent Breitmoser | 2015-05-17 | 1 | -1/+2 | |
| | | | | | | | | | Fixes #1281 | |||||
| * | | apply promote operation to specific subkeys present on yubikey only | Vincent Breitmoser | 2015-05-17 | 1 | -0/+3 | |
| | | | ||||||
| * | | Moving blank smart card messages to strings.xml | Joey Castillo | 2015-05-13 | 1 | -0/+2 | |
| | | | ||||||
| * | | Add check for exporting two keys to same smart card slot. | Joey Castillo | 2015-05-13 | 1 | -0/+2 | |
| | | | ||||||
| * | | Moving keytocard process into PgpKeyOperation. | Joey Castillo | 2015-05-13 | 1 | -0/+3 | |
| | | | ||||||
| * | | Adding NFC Key to Card operation, accessible from Edit Key activity. | Joey Castillo | 2015-05-12 | 13 | -0/+16 | |
| |/ | ||||||
| * | Version 3.2 | Dominik Schürmann | 2015-05-06 | 23 | -23/+23 | |
| | | ||||||
| * | Pull from transifex | Dominik Schürmann | 2015-05-06 | 10 | -141/+163 | |
| | | ||||||
| * | Renaming for consisitency | Dominik Schürmann | 2015-05-06 | 1 | -5/+5 | |
| | | ||||||
| * | Move error overlay into generalized DecryptFragment, better error handling ↵ | Dominik Schürmann | 2015-05-06 | 1 | -76/+126 | |
| | | | | | in DecryptTextActivity | |||||
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵ | Dominik Schürmann | 2015-05-05 | 1 | -0/+1 | |
| |\ | | | | | | | development | |||||
| | * | Fix Bluetooth share without breaking others | William Faulk | 2015-05-04 | 1 | -0/+1 | |
| | | | ||||||
| * | | Fix nullpointer in file decryption | Dominik Schürmann | 2015-05-05 | 1 | -1/+1 | |
| |/ | ||||||
| * | Fix revoked/expired state in decrypt activity | Dominik Schürmann | 2015-05-04 | 1 | -3/+3 | |
| | | ||||||
| * | Merge branch 'development' of https://github.com/Hiperzone/open-keychain ↵ | Dominik Schürmann | 2015-05-04 | 1 | -0/+1 | |
| |\ | | | | | | | | | | | | | into Hiperzone-development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java | |||||
| | * | -removed unneeded inputType attribute from xml files (+1 squashed commits) | Daniel Ramos | 2015-04-30 | 2 | -2/+0 | |
| | | | | | | | | | | | | | Squashed commits: [ef54e68] -code style fixing | |||||
| | * | Merge branch 'development' of https://github.com/open-keychain/open-keychain ↵ | Daniel Ramos | 2015-04-26 | 24 | -226/+237 | |
| | |\ | | | | | | | | | | into development | |||||
| | * \ | Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into ↵ | Daniel Ramos | 2015-04-24 | 3 | -0/+3 | |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java | |||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |