Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | More cleanup | Dominik Schürmann | 2015-04-15 | 9 | -324/+28 | |
| | | | ||||||
| * | | Fix YubiKey naming, cleanup | Dominik Schürmann | 2015-04-15 | 10 | -62/+54 | |
| | | | ||||||
| * | | Clean up NfcOperationActivity | Dominik Schürmann | 2015-04-15 | 1 | -8/+6 | |
| | | | ||||||
| * | | Reformat nfcVerifyPIN | Dominik Schürmann | 2015-04-15 | 1 | -6/+6 | |
| | | | ||||||
| * | | Consolidate PIN verify operation in nfcVerifyPIN method. | Joey Castillo | 2015-04-14 | 1 | -44/+28 | |
| | | | ||||||
| * | | Move PIN verify inside sign/decrypt operation and set correct mode. | Joey Castillo | 2015-04-14 | 1 | -19/+45 | |
| |/ | ||||||
| * | Reformat comment in PassphraseCacheService | Dominik Schürmann | 2015-04-13 | 1 | -4/+5 | |
| | | ||||||
| * | Buffer ascii armored encryption/signatures | Dominik Schürmann | 2015-04-13 | 2 | -3/+4 | |
| | | ||||||
| * | Merge pull request #1193 from adithyaphilip/auto-refresh-contacts | Dominik Schürmann | 2015-04-13 | 2 | -39/+118 | |
| |\ | | | | | | | Immediate display of contact card, fixed contact picture display issue, hides card if no contact | |||||
| | * | hide linked system contact card if no contact present | Adithya Abraham Philip | 2015-04-08 | 2 | -12/+24 | |
| | | | ||||||
| | * | linked system contact auto-refresh added, fixed contact image issue | Adithya Abraham Philip | 2015-04-08 | 2 | -38/+105 | |
| | | | ||||||
| * | | IMplement CryptoInputParcelCacheService | Dominik Schürmann | 2015-04-13 | 6 | -100/+321 | |
| | | | ||||||
| * | | Clearer var naming | Dominik Schürmann | 2015-04-12 | 1 | -8/+8 | |
| | | | ||||||
| * | | More simplifications to PassphraseCacheService | Dominik Schürmann | 2015-04-12 | 1 | -27/+21 | |
| | | | ||||||
| * | | Simplify PassphraseCacheService | Dominik Schürmann | 2015-04-12 | 1 | -16/+12 | |
| | | | ||||||
| * | | Cache CryptoInputParcel in OpenPgpService | Dominik Schürmann | 2015-04-10 | 4 | -24/+69 | |
| | | | ||||||
| * | | Remove unused AlgorithmNames | Dominik Schürmann | 2015-04-10 | 1 | -93/+0 | |
| | | | ||||||
| * | | Add license headers | Dominik Schürmann | 2015-04-10 | 3 | -0/+51 | |
| | | | ||||||
| * | | Externalize Parcelable caching | Dominik Schürmann | 2015-04-10 | 2 | -59/+106 | |
| | | | ||||||
| * | | Fix signing subkey selection in remote service | Dominik Schürmann | 2015-04-07 | 2 | -20/+52 | |
| | | | ||||||
| * | | Fix nullpointer with Intent API, fix clearing of encrypt file list, notify ↵ | Dominik Schürmann | 2015-04-04 | 2 | -6/+7 | |
| | | | | | | | | | | | | when adding a range of input uris | |||||
| * | | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename) | Vincent Breitmoser | 2015-04-01 | 15 | -276/+150 | |
| | | | ||||||
| * | | Prepare decrypt UI for input parcel | Dominik Schürmann | 2015-03-31 | 3 | -129/+79 | |
| | | | ||||||
| * | | Better check if file is already added | Dominik Schürmann | 2015-03-31 | 1 | -19/+42 | |
| | | | ||||||
| * | | Merge branch 'v/crypto-input-parcel' of ↵ | Dominik Schürmann | 2015-03-31 | 4 | -12/+50 | |
| |\ \ | | | | | | | | | | | | | github.com:open-keychain/open-keychain into v/crypto-input-parcel | |||||
| | * | | work on passphrase data flow | Vincent Breitmoser | 2015-03-31 | 4 | -12/+50 | |
| | | | | ||||||
| * | | | Simplify passphrase dialog design | Dominik Schürmann | 2015-03-31 | 1 | -2/+3 | |
| |/ / | ||||||
| * | | update OpenPgpApi, re-add EXTRA_PASSPHRASE | Vincent Breitmoser | 2015-03-30 | 1 | -0/+13 | |
| | | | ||||||
| * | | Merge branch 'v/crypto-input-parcel' of ↵ | Vincent Breitmoser | 2015-03-30 | 6 | -120/+332 | |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | github.com:open-keychain/open-keychain into v/crypto-input-parcel Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java | |||||
| | * | | Dont show slinger button in spinner | Dominik Schürmann | 2015-03-30 | 1 | -0/+2 | |
| | | | | ||||||
| | * | | Use RecyclerView in EncryptFilesFragment | Dominik Schürmann | 2015-03-30 | 5 | -121/+331 | |
| | | | | ||||||
| * | | | remove unused NfcActivity | Vincent Breitmoser | 2015-03-30 | 2 | -574/+5 | |
| | | | | ||||||
| * | | | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 20 | -559/+185 | |
| | | | | ||||||
| * | | | pass CryptoInputParcel independently for SignEncryptOperation | Vincent Breitmoser | 2015-03-30 | 10 | -90/+35 | |
| |/ / | ||||||
| * | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-30 | 4 | -392/+400 | |
| |\| | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java | |||||
| * | | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-29 | 2 | -14/+41 | |
| |\ \ | ||||||
| * | | | Fixing crashes with new encrypt ui | Dominik Schürmann | 2015-03-29 | 5 | -41/+69 | |
| | | | | ||||||
| * | | | Start reworking decrypt ui classes | Dominik Schürmann | 2015-03-27 | 3 | -172/+197 | |
| | | | | ||||||
| * | | | Refactoring of EncryptTextActivity | Dominik Schürmann | 2015-03-27 | 8 | -400/+415 | |
| | | | | ||||||
| * | | | 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 | 6 | -506/+531 | |
| | | | | | ||||||
| * | | | | 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 | 32 | -186/+753 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -24/+77 | |
| | | | | | | ||||||
| * | | | | | nicer handling of nfc errors | Vincent Breitmoser | 2015-03-23 | 1 | -5/+8 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-22 | 1 | -14/+23 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | fix unit test and add new for divert-to-card promotion | Vincent Breitmoser | 2015-03-22 | 1 | -0/+4 | |
| | | | | | | | ||||||
| * | | | | | | enable nfc in import dialog as well | Vincent Breitmoser | 2015-03-22 | 3 | -5/+49 | |
| | | | | | | | ||||||
| * | | | | | | finish ui flow for yubikey import | Vincent Breitmoser | 2015-03-22 | 7 | -198/+330 | |
| | | | | | | |