aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fixes open-keychain/open-keychain#1515Kaladin Light2015-09-032-3/+3
| | | | | | | | Move launcher icons to mipmap
| * Merge branch 'linked-identities' (and fix OperationHelper ids)Vincent Breitmoser2015-08-291-10/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge Linked Identities. Also includes an important fix for OperationHelper ids, which had an error in the bit mask logic. Conflicts: Graphics/update-drawables.sh OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.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/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateYubiKeyImportFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeySpinner.java OpenKeychain/src/main/res/anim/fade_in.xml OpenKeychain/src/main/res/anim/fade_out.xml OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/layout/encrypt_decrypt_overview_fragment.xml OpenKeychain/src/main/res/layout/view_key_fragment.xml OpenKeychain/src/main/res/menu/key_view.xml OpenKeychain/src/main/res/values/strings.xml OpenKeychain/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java README.md
| | * Merge tag 'v3.2.1' into linked-identitiesVincent Breitmoser2015-05-111-11/+8
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Version 3.2.1 Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml OpenKeychain/src/main/res/values/strings.xml
| | * \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-247-88/+475
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Graphics/update-drawables.sh OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/operations/CertifyOperationTest.java OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/CertifyActionsParcel.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| | * \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-094-23/+416
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/build.gradle OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-244-31/+36
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * \ \ \ \ Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-152-48/+80
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyFragment.java
| | * | | | | | return key ids from PassphraseDialogActivity, accept null useridsVincent Breitmoser2015-03-081-2/+2
| | | | | | | |
| | * | | | | | minor changes, add convertFingerprintToKeyId methodVincent Breitmoser2015-03-081-10/+5
| | | | | | | |
| | * | | | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-081-3/+11
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| | * \ \ \ \ \ \ NON-WORKING Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-026-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
| | * | | | | | | | affirmation -> linked identityVincent Breitmoser2015-01-152-2/+0
| | | | | | | | | |
| | * | | | | | | | support addition of user attributesVincent Breitmoser2015-01-121-5/+6
| | | | | | | | | |
| | * | | | | | | | work on affirmations (begin rename to LinkedIdentityVincent Breitmoser2015-01-121-1/+6
| | | | | | | | | |
| | * | | | | | | | even more intermediate resultVincent Breitmoser2015-01-121-0/+2
| | | | | | | | | |
| * | | | | | | | | Remove dead codeDominik Schürmann2015-08-271-2/+2
| | | | | | | | | |
| * | | | | | | | | introduced constants for keyserver sync, fixed sync issueAdithya Abraham Philip2015-08-202-30/+54
| | | | | | | | | |
| * | | | | | | | | added sync preferencesAdithya Abraham Philip2015-08-201-1/+9
| | | | | | | | | |
| * | | | | | | | | changed orbot notification iconsAdithya Abraham Philip2015-08-201-6/+8
| | | | | | | | | |
| * | | | | | | | | reworked keyserversyncadapterservice flowAdithya Abraham Philip2015-08-201-96/+272
| | | | | | | | | |
| * | | | | | | | | improved orbot notify, added periodic syncAdithya Abraham Philip2015-08-201-8/+80
| | | | | | | | | |
| * | | | | | | | | introduced keyserver sync adapterAdithya Abraham Philip2015-08-202-3/+235
| | | | | | | | | |
* | | | | | | | | | WIP mime parsingDominik Schürmann2015-08-172-0/+77
|/ / / / / / / / /
* | | | | | | | | Add privacy information to account screenDominik Schürmann2015-08-031-1/+1
| | | | | | | | |
* | | | | | | | | made mSignatureTime optional in CryptoOperationHelperAdithya Abraham Philip2015-07-151-7/+25
| | | | | | | | |
* | | | | | | | | added licenses, cleaned up code, fixed warningsAdithya Abraham Philip2015-07-135-2/+21
| | | | | | | | |
* | | | | | | | | added retry on upload failureAdithya Abraham Philip2015-07-132-0/+7
| | | | | | | | |
* | | | | | | | | prevented passphrase caching on revocationAdithya Abraham Philip2015-07-131-1/+16
| | | | | | | | |
* | | | | | | | | implemented revocation on deletionAdithya Abraham Philip2015-07-136-8/+100
| | | | | | | | |
* | | | | | | | | fix symmetric passphrase caching (fixes #1401)Vincent Breitmoser2015-07-081-8/+8
| | | | | | | | |
* | | | | | | | | reformatted codeAdithya Abraham Philip2015-07-031-6/+5
| | | | | | | | |
* | | | | | | | | added proxy support to OperationHelperAdithya Abraham Philip2015-07-033-4/+28
| | | | | | | | |
* | | | | | | | | ensuring code style is preservedAdithya Abraham Philip2015-07-031-5/+1
| | | | | | | | |
* | | | | | | | | added keyserver/proxy support to certify operationAdithya Abraham Philip2015-07-031-0/+6
| | | | | | | | |
* | | | | | | | | Change PIN and Admin PIN after move to key operationDominik Schürmann2015-07-022-27/+64
| | | | | | | | |
* | | | | | | | | Merge branch 'master' of github.com:open-keychain/open-keychainAdithya Abraham Philip2015-06-302-7/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | make timeout method in PassphraseCacheService more robust against nullpointersVincent Breitmoser2015-06-301-4/+9
| | | | | | | | | |
| * | | | | | | | | Create key wizard for blank YubiKeyDominik Schürmann2015-06-291-3/+3
| | | | | | | | | |
* | | | | | | | | | split import and export opsAdithya Abraham Philip2015-06-274-45/+10
| | | | | | | | | |
* | | | | | | | | | renamed KeychainNewService to KeychainServiceAdithya Abraham Philip2015-06-271-2/+2
| | | | | | | | | |
* | | | | | | | | | removed debug logs, added licensesAdithya Abraham Philip2015-06-277-7/+126
| | | | | | | | | |
* | | | | | | | | | fixed Certify opAdithya Abraham Philip2015-06-271-2/+2
| | | | | | | | | |
* | | | | | | | | | deleted KeychainServiceAdithya Abraham Philip2015-06-272-184/+7
| | | | | | | | | |
* | | | | | | | | | migrated Keybase verificationAdithya Abraham Philip2015-06-273-181/+50
| | | | | | | | | |
* | | | | | | | | | migrated consolidationAdithya Abraham Philip2015-06-273-19/+43
| | | | | | | | | |
* | | | | | | | | | migrated promote op to KeychainNewServiceAdithya Abraham Philip2015-06-273-29/+51
| | | | | | | | | |
* | | | | | | | | | migrated delete op to KeychainNewServiceAdithya Abraham Philip2015-06-273-25/+50
| | | | | | | | | |
* | | | | | | | | | migrated key creation to KeychainNewServiceAdithya Abraham Philip2015-06-271-21/+0
| | | | | | | | | |
* | | | | | | | | | added export and upload to KeychainNewServiceAdithya Abraham Philip2015-06-275-91/+102
| | | | | | | | | |
* | | | | | | | | | introduced CryptoOperationHelper in ImportKeysActivityAdithya Abraham Philip2015-06-274-273/+113
|/ / / / / / / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 22:10:10 +0000