Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | return key ids from PassphraseDialogActivity, accept null userids | Vincent Breitmoser | 2015-03-08 | 1 | -2/+2 |
| | |||||
* | minor changes, add convertFingerprintToKeyId method | Vincent Breitmoser | 2015-03-08 | 1 | -10/+5 |
| | |||||
* | Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-08 | 1 | -3/+11 |
|\ | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | ||||
| * | add support for certification of user attributes | Vincent Breitmoser | 2015-03-08 | 1 | -3/+11 |
| | | |||||
* | | NON-WORKING Merge branch 'development' into linked-identities | Vincent Breitmoser | 2015-03-02 | 6 | -306/+384 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedPublicKey.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ContactHelper.java OpenKeychain/src/main/res/layout/view_key_main_fragment.xml OpenKeychain/src/main/res/values/strings.xml extern/spongycastle | ||||
| * | show refresh key progress inline | Vincent Breitmoser | 2015-02-27 | 1 | -1/+6 |
| | | |||||
| * | Merge keybase-proof branch | Dominik Schürmann | 2015-02-27 | 2 | -9/+151 |
| |\ | |||||
| | * | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-12-05 | 1 | -1/+1 |
| | |\ | |||||
| | * | | Add check that proof & database fingerprints are the same | Tim Bray | 2014-11-21 | 1 | -3/+6 |
| | | | | |||||
| | * | | Dont accept signatures by expired or revoked subkeys | Dominik Schürmann | 2014-11-22 | 1 | -0/+1 |
| | | | | |||||
| | * | | Merge branch 'development' into keybase-proofs | Dominik Schürmann | 2014-11-21 | 1 | -15/+10 |
| | |\ \ | |||||
| | * | | | Prevent multiple cloud-trust-search launches. Handle DNS query failure ↵ | Tim Bray | 2014-11-19 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | gracefully. Fixes #1007 & #1008. | ||||
| | * | | | All keybase proofs now in place | Tim Bray | 2014-11-11 | 2 | -5/+38 |
| | | | | | |||||
| | * | | | Moved from WebView to Spannables, some proof cleanup too | Tim Bray | 2014-11-07 | 1 | -20/+113 |
| | | | | | |||||
| * | | | | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 5 | -154/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService | ||||
| * | | | | prevent recursive consolidate | Vincent Breitmoser | 2015-01-31 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Fix cleartext signatures internally | Dominik Schürmann | 2015-01-27 | 1 | -5/+4 |
| | | | | | |||||
| * | | | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-27 | 1 | -38/+17 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | ||||
| | * | | | | move last parts of import logic from kis into operation | Vincent Breitmoser | 2015-01-26 | 1 | -38/+17 |
| | | | | | | |||||
| * | | | | | Merge branch 'development' into detached-sigs-api | Dominik Schürmann | 2015-01-26 | 4 | -229/+306 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java | ||||
| | * | | | | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 4 | -235/+251 |
| | | | | | | |||||
| | * | | | | introduce PromoteKeyOperation to create dummy secret from public keys | Vincent Breitmoser | 2015-01-25 | 1 | -0/+20 |
| | | | | | | |||||
| | * | | | | work on divert-to-key and other keyring stuff | Vincent Breitmoser | 2015-01-25 | 1 | -6/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - allow modifySecretKeyRing operation without passphrase, but a only restricted subset of operations (ie, s2k strip/divert) - pass byte array with serial number to key edit operation to initialize divert-to-card key - update spongycastle to support serial numbers in iv for divert-to-card | ||||
| | * | | | | allow explicit re-certification in SaveKeyringParcel | Vincent Breitmoser | 2015-01-24 | 1 | -0/+7 |
| | | | | | | |||||
| | * | | | | move key stripping into ChangeSubkey, support divert-to-card | Vincent Breitmoser | 2015-01-24 | 1 | -8/+21 |
| | | | | | | |||||
| | * | | | | support addition of user attributes | Vincent Breitmoser | 2015-01-13 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java OpenKeychain/src/main/res/values/strings.xml | ||||
| * | | | | | Experimental API support for detached signatures (not tested) | Dominik Schürmann | 2015-01-08 | 1 | -2/+1 |
| |/ / / / | |||||
* | | | | | affirmation -> linked identity | Vincent Breitmoser | 2015-01-15 | 2 | -2/+0 |
| | | | | | |||||
* | | | | | support addition of user attributes | Vincent Breitmoser | 2015-01-12 | 1 | -5/+6 |
| | | | | | |||||
* | | | | | work on affirmations (begin rename to LinkedIdentity | Vincent Breitmoser | 2015-01-12 | 1 | -1/+6 |
| | | | | | |||||
* | | | | | even more intermediate result | Vincent Breitmoser | 2015-01-12 | 1 | -0/+2 |
|/ / / / | |||||
* | | | | encapsulate high level edit key into new operation class | Vincent Breitmoser | 2015-01-03 | 1 | -85/+11 |
| | | | | |||||
* | | | | fix unit tests for ChangeUnlockParcel | Vincent Breitmoser | 2014-12-30 | 1 | -0/+3 |
| | | | | |||||
* | | | | introduce new ChangeUnlockParcel packet for extended passphrase changing ↵ | Vincent Breitmoser | 2014-12-29 | 2 | -8/+74 |
| |_|/ |/| | | | | | | | | capabilities | ||||
* | | | Update target and support libs to SDK 21, fixing compile issues | Dominik Schürmann | 2014-12-04 | 1 | -1/+1 |
| |/ |/| | |||||
* | | more cleanup | Dominik Schürmann | 2014-11-21 | 1 | -14/+9 |
| | | |||||
* | | Minor code cleanup | Dominik Schürmann | 2014-11-21 | 1 | -1/+1 |
|/ | |||||
* | prevent cancel dring consolidate, move logic into progressable | Vincent Breitmoser | 2014-10-26 | 1 | -2/+6 |
| | |||||
* | implement upload of keyring after certification, check that option by default | Vincent Breitmoser | 2014-10-26 | 1 | -1/+2 |
| | |||||
* | integrate download from keyserver into key import operation | Vincent Breitmoser | 2014-10-23 | 1 | -77/+8 |
| | |||||
* | some cleanup and documentation of *Operation classes | Vincent Breitmoser | 2014-10-15 | 1 | -3/+0 |
| | |||||
* | fix test for new PgpDecryptVerify | Vincent Breitmoser | 2014-10-14 | 1 | -1/+3 |
| | |||||
* | make PgpEncryptSign and PgpDecryptVerify subclasses of BaseOperation | Vincent Breitmoser | 2014-10-13 | 1 | -35/+7 |
| | |||||
* | remove DELETE_FILE_SECURELY | Vincent Breitmoser | 2014-10-13 | 1 | -23/+0 |
| | | | | closes #961 | ||||
* | rewrite export with new operation style | Vincent Breitmoser | 2014-10-13 | 1 | -61/+20 |
| | |||||
* | CertifyOperation is not a Pgp- operation | Vincent Breitmoser | 2014-10-12 | 1 | -23/+13 |
| | |||||
* | move delete into operation class | Vincent Breitmoser | 2014-10-11 | 1 | -32/+7 |
| | |||||
* | move around package structure a bit | Vincent Breitmoser | 2014-10-10 | 11 | -1672/+12 |
| | |||||
* | move operations into ops package, introduce BaseOperation class | Vincent Breitmoser | 2014-10-10 | 1 | -9/+9 |
| | |||||
* | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2014-10-09 | 2 | -4/+5 |
|\ |