Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 21 | -560/+185 | |
| | | | | ||||||
| * | | | pass CryptoInputParcel independently for SignEncryptOperation | Vincent Breitmoser | 2015-03-30 | 10 | -90/+35 | |
| |/ / | ||||||
| * | | Add TokenAutoComplete and StickyListHeaders as maven dependencies instead of ↵ | Dominik Schürmann | 2015-03-30 | 4 | -12/+4 | |
| | | | | | | | | | | | | git submodules | |||||
| * | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-30 | 7 | -405/+423 | |
| |\| | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java | |||||
| * | | Fix strings with email address | Dominik Schürmann | 2015-03-29 | 1 | -2/+2 | |
| | | | ||||||
| * | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-29 | 3 | -14/+42 | |
| |\ \ | ||||||
| * | | | Fixing crashes with new encrypt ui | Dominik Schürmann | 2015-03-29 | 8 | -43/+70 | |
| | | | | ||||||
| * | | | Start reworking decrypt ui classes | Dominik Schürmann | 2015-03-27 | 3 | -172/+197 | |
| | | | | ||||||
| * | | | Refactoring of EncryptTextActivity | Dominik Schürmann | 2015-03-27 | 9 | -404/+418 | |
| | | | | ||||||
| * | | | Update gradle plugin, update gradle test plugin | Dominik Schürmann | 2015-03-26 | 2 | -2/+2 | |
| | | | | ||||||
| * | | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-26 | 1 | -14/+76 | |
| |\ \ \ | ||||||
| * | | | | Start refactoring encrypt ui, EncryptFileActivity no longer crashing | Dominik Schürmann | 2015-03-26 | 9 | -516/+539 | |
| | | | | | ||||||
| * | | | | Fix certify with CryptoInputParcel | Dominik Schürmann | 2015-03-25 | 3 | -10/+6 | |
| | | | | | ||||||
| * | | | | Remove backward compat in CertifyKeyFragment | Dominik Schürmann | 2015-03-25 | 1 | -17/+1 | |
| | | | | | ||||||
| * | | | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 235 | -8380/+10180 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SafeSlingerActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java | |||||
| * | | | | | further improve yubikey error handling | Vincent Breitmoser | 2015-03-23 | 5 | -24/+78 | |
| | | | | | | ||||||
| * | | | | | nicer handling of nfc errors | Vincent Breitmoser | 2015-03-23 | 2 | -5/+9 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-22 | 5 | -16/+29 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | forgot spongycastle update | Vincent Breitmoser | 2015-03-22 | 1 | -0/+0 | |
| | | | | | | | ||||||
| * | | | | | | fix unit test and add new for divert-to-card promotion | Vincent Breitmoser | 2015-03-22 | 2 | -6/+33 | |
| | | | | | | | ||||||
| * | | | | | | enable nfc in import dialog as well | Vincent Breitmoser | 2015-03-22 | 4 | -6/+51 | |
| | | | | | | | ||||||
| * | | | | | | finish ui flow for yubikey import | Vincent Breitmoser | 2015-03-22 | 9 | -221/+396 | |
| | | | | | | | ||||||
| * | | | | | | actually promote to divert, pass yubikey's AID | Vincent Breitmoser | 2015-03-22 | 6 | -31/+24 | |
| | | | | | | | ||||||
| * | | | | | | improve status reporting in yubikey dialogue | Vincent Breitmoser | 2015-03-22 | 3 | -14/+114 | |
| | | | | | | | ||||||
| * | | | | | | move yubikey import into viewkeyfragment | Vincent Breitmoser | 2015-03-22 | 9 | -228/+376 | |
| | | | | | | | ||||||
| * | | | | | | split up wait/action yubikey fragments | Vincent Breitmoser | 2015-03-21 | 20 | -88/+264 | |
| | | | | | | | ||||||
| * | | | | | | work on ad-hoc yubikey import support | Vincent Breitmoser | 2015-03-21 | 7 | -37/+365 | |
| | | | | | | | ||||||
| * | | | | | | first steps toward yubikey activity | Vincent Breitmoser | 2015-03-21 | 30 | -468/+689 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity | |||||
| * | | | | | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-21 | 27 | -198/+215 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |||||
| * | | | | | | | more data in RequiredInputParcel, OperationResult notifications | Vincent Breitmoser | 2015-03-21 | 7 | -36/+110 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - pass both masterkeyid and subkeyid though RequiredInputParcel parcel - fix numeric vales in OperationResult.createNotify() | |||||
| * | | | | | | | add edit key unit test for no-op | Vincent Breitmoser | 2015-03-20 | 5 | -0/+17 | |
| | | | | | | | | ||||||
| * | | | | | | | fix unit tests (for real) | Vincent Breitmoser | 2015-03-20 | 7 | -20/+39 | |
| | | | | | | | | ||||||
| * | | | | | | | fix more unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 10 | -66/+56 | |
| | | | | | | | | ||||||
| * | | | | | | | inline mNfcSignOps variable | Vincent Breitmoser | 2015-03-20 | 1 | -17/+16 | |
| | | | | | | | | ||||||
| * | | | | | | | fix unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 4 | -21/+33 | |
| | | | | | | | | ||||||
| * | | | | | | | re-inline cryptoInput variable | Vincent Breitmoser | 2015-03-20 | 1 | -32/+34 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 86 | -819/+1217 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/CertifyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/EditKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/PgpSignEncryptResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptInputParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/SignEncryptParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java | |||||
| * | | | | | | | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 17 | -248/+296 | |
| | | | | | | | | | ||||||
| * | | | | | | | | generalize NfcOperationParcel to RequiredInputParcel, including passphrases | Vincent Breitmoser | 2015-03-19 | 12 | -95/+147 | |
| | | | | | | | | | ||||||
| * | | | | | | | | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 15 | -240/+475 | |
| | | | | | | | | | ||||||
| * | | | | | | | | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 18 | -235/+883 | |
| | | | | | | | | | ||||||
| * | | | | | | | | introduce CryptoOperationParcel for nfc data | Vincent Breitmoser | 2015-03-18 | 3 | -3/+64 | |
| | | | | | | | | | ||||||
* | | | | | | | | | minor ui and wording changes | Vincent Breitmoser | 2015-04-09 | 2 | -8/+20 | |
| | | | | | | | | | ||||||
* | | | | | | | | | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-04-09 | 236 | -8377/+10293 | |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | |||||
| * | | | | | | | | rewrite EncryptKeyCompletionView with generalized KeyAdapter | Vincent Breitmoser | 2015-03-30 | 7 | -405/+423 | |
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java | |||||
| * | | | | | | | Merge pull request #1188 from adithyaphilip/import-message-error | Dominik Schürmann | 2015-03-28 | 1 | -2/+5 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Corrected import error message, changed style to WARN | |||||
| | * | | | | | | | changed style to WARN, corrected error message | Adithya Abraham Philip | 2015-03-28 | 1 | -2/+5 | |
| | | |_|_|_|_|/ | | |/| | | | | | ||||||
| * | | | | | | | Merge pull request #1187 from Hiperzone/development | Dominik Schürmann | 2015-03-28 | 2 | -12/+37 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | -Fixed a situation where additional emails could be duplicated when crea... | |||||
| | * | | | | | | -Fixed a situation where additional emails could be duplicated when creating ↵ | Daniel Ramos | 2015-03-27 | 2 | -12/+37 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | a new key -If CreateKeyEmailFragment view is recreated, the array of additional emails won't be repopulated again if its not null, avoiding new reallocations. -if CreateKeyEmailFragment view is recreated, the email adapter wont be recreated if its not null, avoiding new reallocations. | |||||
| * | | | | | | Merge pull request #1182 from iseki-masaya/1045 | Dominik Schürmann | 2015-03-26 | 1 | -14/+76 | |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | #1045: Add a loop for multiple key export. |