Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | deleted KeychainService | Adithya Abraham Philip | 2015-06-27 | 1 | -7/+0 |
| | |||||
* | eventbus: initial attempt, replace messenger hack with eventbus communication | Vincent Breitmoser | 2015-06-06 | 1 | -87/+25 |
| | |||||
* | renamed KeychainIntentService to KeychainService | Adithya Abraham Philip | 2015-06-01 | 1 | -12/+11 |
| | |||||
* | merged services | Adithya Abraham Philip | 2015-06-01 | 1 | -2/+3 |
| | |||||
* | externalize caching functionality from CertifyKeyFragment | Vincent Breitmoser | 2015-05-30 | 1 | -20/+11 |
| | |||||
* | preserve state in CertifyKeyFragment | Vincent Breitmoser | 2015-05-29 | 1 | -25/+65 |
| | |||||
* | preserve state in KeySpinner, and some lint fixes | Vincent Breitmoser | 2015-05-27 | 1 | -2/+1 |
| | |||||
* | rewrite EncryptActivity data flow | Vincent Breitmoser | 2015-05-27 | 1 | -11/+5 |
| | |||||
* | More cleanup | Dominik Schürmann | 2015-04-15 | 1 | -0/+1 |
| | |||||
* | Fix certify with CryptoInputParcel | Dominik Schürmann | 2015-03-25 | 1 | -1/+1 |
| | |||||
* | 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 | 1 | -4/+9 |
|\ | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | shifted multi-threading to own service | Adithya Abraham Philip | 2015-03-23 | 1 | -3/+8 |
| | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import | ||||
* | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-21 | 1 | -4/+4 |
|\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | ||||
| * | Reworked Notify class | Manoj Khanna | 2015-03-20 | 1 | -4/+4 |
| | | |||||
* | | fix more unit tests (syntax) | Vincent Breitmoser | 2015-03-20 | 1 | -1/+2 |
| | | |||||
* | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 1 | -0/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | New Passphrase class for safer passphrase handling in memory | Dominik Schürmann | 2015-03-19 | 1 | -2/+2 |
| | | |||||
* | | generalize NfcOperationParcel to RequiredInputParcel, including passphrases | Vincent Breitmoser | 2015-03-19 | 1 | -10/+1 |
| | | |||||
* | | yubikey certifications! | Vincent Breitmoser | 2015-03-18 | 1 | -57/+23 |
| | | |||||
* | | introduce CryptoOperationParcel for nfc data | Vincent Breitmoser | 2015-03-18 | 1 | -1/+3 |
|/ | |||||
* | object oriented split user id | Dominik Schürmann | 2015-03-16 | 1 | -4/+3 |
| | |||||
* | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOType | danielnelz | 2015-03-09 | 1 | -1/+1 |
| | | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos. | ||||
* | pass through messenger to certify service from ViewKeyActivity | Vincent Breitmoser | 2015-02-28 | 1 | -35/+51 |
| | | | | | | the idea here is to handle progress and result of the CertifyActivity directly in ViewKeyActivity by passing a messenger through to it. this allows smoother transition from an uncertified to certified state. | ||||
* | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 1 | -1/+1 |
| | |||||
* | make user_ids table typed, with attribute_data support | Vincent Breitmoser | 2015-01-14 | 1 | -11/+11 |
| | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java | ||||
* | retrofit getBlob method of matrixcursor for android 2.3 | Vincent Breitmoser | 2014-10-27 | 1 | -1/+20 |
| | |||||
* | Rename multi certify files to certify | Dominik Schürmann | 2014-10-26 | 1 | -0/+393 |
| | |||||
* | Remove old certify activity | Dominik Schürmann | 2014-10-25 | 1 | -422/+0 |
| | |||||
* | move around package structure a bit | Vincent Breitmoser | 2014-10-10 | 1 | -3/+3 |
| | |||||
* | certify: get rid of fingerprint check | Vincent Breitmoser | 2014-10-04 | 1 | -4/+3 |
| | | | | | | Master key ids are unambiguous by database design, and only keys which are in the database are signed. There is no reason to check the fingerprint again during the certify operation. | ||||
* | redesign certify action to work with parcel input and result | Vincent Breitmoser | 2014-10-04 | 1 | -13/+16 |
| | |||||
* | DecryptTextActivity rework | Dominik Schürmann | 2014-09-23 | 1 | -2/+2 |
| | |||||
* | passphrasecache: cache by master key, introduce preference for cache by subkey | Vincent Breitmoser | 2014-09-23 | 1 | -1/+1 |
| | |||||
* | key spinner fixes | Dominik Schürmann | 2014-09-21 | 1 | -1/+1 |
| | |||||
* | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 1 | -7/+6 |
| | | | | created ui.util for everything related to formatting | ||||
* | work on OperationResultParcel | Vincent Breitmoser | 2014-09-14 | 1 | -11/+10 |
| | |||||
* | promote all result parcels to top level classes in their own package | Vincent Breitmoser | 2014-09-13 | 1 | -1/+1 |
| | |||||
* | fix key upload after certification (hopefully?) | Vincent Breitmoser | 2014-09-12 | 1 | -4/+1 |
| | |||||
* | use LoaderFragment for CertifyActivity | Vincent Breitmoser | 2014-08-31 | 1 | -0/+425 |