aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
Commit message (Collapse)AuthorAgeFilesLines
* Fix license headerDominik Schürmann2016-05-251-3/+0
|
* Replace spongycastle with bouncycastleDominik Schürmann2016-02-091-8/+8
|
* linked-ids: rename RawLinkedIdentity to UriAttributeVincent Breitmoser2015-05-091-1/+1
|
* remove notiion of nonce/identifierVincent Breitmoser2015-03-131-2/+3
|
* do a TON of UI workVincent Breitmoser2015-03-051-0/+9
|
* NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-021-1/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * rewrite PgpSignEncrypt data flowVincent Breitmoser2015-02-011-1/+0
| | | | | | | | | | | | | | - 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
| * small fixes to user attribute handlingVincent Breitmoser2015-01-141-3/+22
| |
| * actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-141-3/+18
| |
| * hack to make WrappedUserAttribute serializableVincent Breitmoser2015-01-131-0/+90
| | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
* affirmation -> linked identityVincent Breitmoser2015-01-151-0/+1
|
* small fixes to user attribute handlingVincent Breitmoser2015-01-141-3/+22
|
* actually import user attributes (though they are not shown anywhere yet)Vincent Breitmoser2015-01-141-4/+18
|
* hack to make WrappedUserAttribute serializableVincent Breitmoser2015-01-131-2/+47
|
* forgot to commit WrappedUserAttributeVincent Breitmoser2015-01-121-0/+47
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 00:21:57 +0000