aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Fix YubiKey naming, cleanupDominik Schürmann2015-04-151-4/+4
| |
| * Reformat comment in PassphraseCacheServiceDominik Schürmann2015-04-131-4/+5
| |
| * IMplement CryptoInputParcelCacheServiceDominik Schürmann2015-04-131-9/+20
| |
| * Clearer var namingDominik Schürmann2015-04-121-8/+8
| |
| * More simplifications to PassphraseCacheServiceDominik Schürmann2015-04-121-27/+21
| |
| * Simplify PassphraseCacheServiceDominik Schürmann2015-04-121-16/+12
| |
| * fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)Vincent Breitmoser2015-04-012-37/+49
| |
| * Prepare decrypt UI for input parcelDominik Schürmann2015-03-311-5/+21
| |
| * fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-301-6/+6
| |
| * pass CryptoInputParcel independently for SignEncryptOperationVincent Breitmoser2015-03-301-5/+4
| |
| * Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-244-23/+416
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | further improve yubikey error handlingVincent Breitmoser2015-03-232-6/+38
| | |
| * | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-221-2/+3
| | |
| * | work on ad-hoc yubikey import supportVincent Breitmoser2015-03-211-1/+1
| | |
| * | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-211-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
| * | | more data in RequiredInputParcel, OperationResult notificationsVincent Breitmoser2015-03-211-9/+30
| | | | | | | | | | | | | | | | | | | | - pass both masterkeyid and subkeyid though RequiredInputParcel parcel - fix numeric vales in OperationResult.createNotify()
| * | | add edit key unit test for no-opVincent Breitmoser2015-03-201-0/+4
| | | |
| * | | fix unit tests (for real)Vincent Breitmoser2015-03-202-2/+2
| | | |
| * | | fix more unit tests (syntax)Vincent Breitmoser2015-03-202-10/+3
| | | |
| * | | fix unit tests (syntax)Vincent Breitmoser2015-03-201-0/+10
| | | |
| * | | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-204-34/+41
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | support yubikeys in (some) edit key operationsVincent Breitmoser2015-03-204-8/+25
| | | | |
| * | | | generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-192-30/+73
| | | | |
| * | | | yubikey certifications!Vincent Breitmoser2015-03-183-17/+80
| | | | |
| * | | | generalize nfc crypto input structureVincent Breitmoser2015-03-184-59/+172
| | | | |
| * | | | introduce CryptoOperationParcel for nfc dataVincent Breitmoser2015-03-182-2/+61
| | | | |
* | | | | 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 pull request #1166 from adithyaphilip/multi-threadedDominik Schürmann2015-03-233-21/+414
| |\ \ \ \ | | | | | | | | | | | | Multi-threaded key import, update all feature
| | * | | | shifted multi-threading to own serviceAdithya Abraham Philip2015-03-233-228/+438
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import
| | * | | | introduced multi-threadingAdithya Abraham Philip2015-03-231-26/+209
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactored oldKeys to updatedKeys added update all keys, ThreadPoolExecutor used modified CachedThreadPoolExecutor
| * / | | Fix passphrase cache not clearing all passphrasesDominik Schürmann2015-03-231-2/+2
| |/ / /
* | | | Merge branch 'development' into linked-identitiesVincent Breitmoser2015-03-244-31/+36
|\| | | | | | | | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | | Reworked Notify classManoj Khanna2015-03-201-2/+2
| | |/ | |/|
| * | New Passphrase class for safer passphrase handling in memoryDominik Schürmann2015-03-193-29/+34
| |/
* | 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
| * Fixed possible ArrayIndexOutOfBoundsException.danielnelz2015-03-112-2/+2
| |
| * Added braces to if else.danielnelz2015-03-092-4/+6
| |
| * Created enum MessageStatus in KeychainIntentServiceHandler and enum IOTypedanielnelz2015-03-092-48/+78
| | | | | | | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos.
* | 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
| * add support for certification of user attributesVincent Breitmoser2015-03-081-3/+11
| |
* | 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
| * show refresh key progress inlineVincent Breitmoser2015-02-271-1/+6
| |
| * Merge keybase-proof branchDominik Schürmann2015-02-272-9/+151
| |\
| | * Merge branch 'development' into keybase-proofsDominik Schürmann2014-12-051-1/+1
| | |\
| | * | Add check that proof & database fingerprints are the sameTim Bray2014-11-211-3/+6
| | | |
| | * | Dont accept signatures by expired or revoked subkeysDominik Schürmann2014-11-221-0/+1
| | | |
| | * | Merge branch 'development' into keybase-proofsDominik Schürmann2014-11-211-15/+10
| | |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-25 14:44:29 +0000