aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Collapse)AuthorAgeFilesLines
* remove unused bits from projectionVincent Breitmoser2015-03-021-15/+1
|
* nonce is 4 bytesVincent Breitmoser2015-03-021-9/+9
|
* add linked it to view key context menuVincent Breitmoser2015-03-022-0/+19
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-027-279/+323
|\ | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserAttributesAdapter.java
| * forgot to rename a methodVincent Breitmoser2015-03-022-4/+2
| |
| * some cleanup in ViewKey*Vincent Breitmoser2015-03-022-18/+20
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2015-03-021-7/+20
| |\ | | | | | | | | | development
| | * Use index constants in ContactHelperDominik Schürmann2015-03-021-7/+20
| | |
| * | don't reload qr code for identical fingerprintVincent Breitmoser2015-03-021-1/+5
| | |
| * | make userattributeadapter superclass of useridsadapterVincent Breitmoser2015-03-024-115/+143
| | |
* | | some fixes for compiling (still not working!)Vincent Breitmoser2015-03-024-25/+10
| | |
* | | NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-02160-5274/+7662
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | fix a couple lint errorsVincent Breitmoser2015-02-282-4/+5
| |/
| * some changes to qr scan logicVincent Breitmoser2015-02-284-37/+113
| |
| * pass through messenger to certify service from ViewKeyActivityVincent Breitmoser2015-02-284-49/+87
| | | | | | | | | | | | 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.
| * fab support for all notify typesVincent Breitmoser2015-02-281-23/+29
| |
| * small Notify cleanupVincent Breitmoser2015-02-281-24/+2
| |
| * clean up warnings in KeyListFragmentVincent Breitmoser2015-02-281-32/+10
| |
| * collapse fab on action selectedVincent Breitmoser2015-02-281-0/+3
| | | | | | | | closes #1057
| * animate FAB to move up and down when a snackbar appearsVincent Breitmoser2015-02-281-11/+10
| |
| * forgot to commit FabContainerVincent Breitmoser2015-02-281-0/+8
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-02-283-4/+85
| |\ | | | | | | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java
| | * control flow for moving the fab up with snackbarVincent Breitmoser2015-02-283-5/+85
| | |
| * | Update from transifexDominik Schürmann2015-02-281-2/+0
| |/
| * Simplify MainActivityDominik Schürmann2015-02-282-52/+23
| |
| * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-02-272-5/+32
| |\ | | | | | | | | | development
| | * Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Vincent Breitmoser2015-02-274-172/+9
| | |\ | | | | | | | | | | | | development
| | * | slightly longer color fade durationVincent Breitmoser2015-02-271-3/+3
| | | |
| | * | transition status color in key viewVincent Breitmoser2015-02-271-3/+30
| | | |
| | * | hand through result in CertifyFingerprintActivityVincent Breitmoser2015-02-271-2/+2
| | | |
| * | | Reorder advanced key viewDominik Schürmann2015-02-272-59/+7
| | |/ | |/|
| * | Enable multi line snackbar optionDominik Schürmann2015-02-271-1/+5
| | |
| * | Remove swipte to refresh src, fix padding in key listDominik Schürmann2015-02-272-167/+0
| | |
| * | Merge branch 'development' of github.com:open-keychain/open-keychain into ↵Dominik Schürmann2015-02-272-8/+131
| |\| | | | | | | | | | development
| | * show refresh key progress inlineVincent Breitmoser2015-02-272-8/+131
| | |
| * | Fix status images in user id adapterDominik Schürmann2015-02-271-4/+4
| |/
| * Keybase header textDominik Schürmann2015-02-271-2/+2
| |
| * go to directly to certify screen after nfc importVincent Breitmoser2015-02-274-85/+70
| |
| * Prettify qr code in advanced key viewDominik Schürmann2015-02-271-7/+23
| |
| * Uncluttering advanced key viewDominik Schürmann2015-02-273-250/+0
| |
| * Simplify delete key dialogDominik Schürmann2015-02-272-4/+9
| |
| * Remove unused BadImportKeyDialogFragmentDominik Schürmann2015-02-271-67/+0
| |
| * Merge keybase-proof branchDominik Schürmann2015-02-277-11/+805
| |\
| | * Merge branch 'development' into keybase-proofsDominik Schürmann2014-12-051-1/+1
| | |\
| | * \ Merge remote-tracking branch 'origin/keybase-proofs' into keybase-proofsTim Bray2014-11-211-2/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
| | | * | fix signature checkDominik Schürmann2014-11-221-2/+2
| | | | |
| | * | | Add check that proof & database fingerprints are the sameTim Bray2014-11-212-4/+8
| | |/ /
| | * | Dont accept signatures by expired or revoked subkeysDominik Schürmann2014-11-224-9/+13
| | | |
| | * | Use master key id for keybase proof verificationDominik Schürmann2014-11-221-10/+4
| | | |
| | * | Merge branch 'development' into keybase-proofsDominik Schürmann2014-11-214-25/+20
| | |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-30 05:36:09 +0000