aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org
Commit message (Collapse)AuthorAgeFilesLines
* don't show key spinner for a single entryVincent Breitmoser2015-04-242-1/+10
|
* use CryptoOperationFragment for linked id fragments, and some warning cleanupVincent Breitmoser2015-04-244-76/+30
|
* Merge branch 'development' into linked-identitiesVincent Breitmoser2015-04-2499-3465/+4785
|\ | | | | | | | | | | | | | | | | | | | | 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
| * Use portrait mode for qr code scanningDominik Schürmann2015-04-151-10/+8
| |
| * More cleanupDominik Schürmann2015-04-159-324/+28
| |
| * Fix YubiKey naming, cleanupDominik Schürmann2015-04-1510-62/+54
| |
| * Clean up NfcOperationActivityDominik Schürmann2015-04-151-8/+6
| |
| * Reformat nfcVerifyPINDominik Schürmann2015-04-151-6/+6
| |
| * Consolidate PIN verify operation in nfcVerifyPIN method.Joey Castillo2015-04-141-44/+28
| |
| * Move PIN verify inside sign/decrypt operation and set correct mode.Joey Castillo2015-04-141-19/+45
| |
| * Reformat comment in PassphraseCacheServiceDominik Schürmann2015-04-131-4/+5
| |
| * Buffer ascii armored encryption/signaturesDominik Schürmann2015-04-132-3/+4
| |
| * Merge pull request #1193 from adithyaphilip/auto-refresh-contactsDominik Schürmann2015-04-132-39/+118
| |\ | | | | | | Immediate display of contact card, fixed contact picture display issue, hides card if no contact
| | * hide linked system contact card if no contact presentAdithya Abraham Philip2015-04-082-12/+24
| | |
| | * linked system contact auto-refresh added, fixed contact image issueAdithya Abraham Philip2015-04-082-38/+105
| | |
| * | IMplement CryptoInputParcelCacheServiceDominik Schürmann2015-04-136-100/+321
| | |
| * | 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
| | |
| * | Cache CryptoInputParcel in OpenPgpServiceDominik Schürmann2015-04-104-24/+69
| | |
| * | Remove unused AlgorithmNamesDominik Schürmann2015-04-101-93/+0
| | |
| * | Add license headersDominik Schürmann2015-04-103-0/+51
| | |
| * | Externalize Parcelable cachingDominik Schürmann2015-04-102-59/+106
| | |
| * | Fix signing subkey selection in remote serviceDominik Schürmann2015-04-072-20/+52
| | |
| * | Fix nullpointer with Intent API, fix clearing of encrypt file list, notify ↵Dominik Schürmann2015-04-042-6/+7
| | | | | | | | | | | | when adding a range of input uris
| * | fix Decrypt*Fragment for RequiredInputParcel (except decryptOriginalFilename)Vincent Breitmoser2015-04-0115-276/+150
| | |
| * | Prepare decrypt UI for input parcelDominik Schürmann2015-03-313-129/+79
| | |
| * | Better check if file is already addedDominik Schürmann2015-03-311-19/+42
| | |
| * | Merge branch 'v/crypto-input-parcel' of ↵Dominik Schürmann2015-03-314-12/+50
| |\ \ | | | | | | | | | | | | github.com:open-keychain/open-keychain into v/crypto-input-parcel
| | * | work on passphrase data flowVincent Breitmoser2015-03-314-12/+50
| | | |
| * | | Simplify passphrase dialog designDominik Schürmann2015-03-311-2/+3
| |/ /
| * | update OpenPgpApi, re-add EXTRA_PASSPHRASEVincent Breitmoser2015-03-301-0/+13
| | |
| * | Merge branch 'v/crypto-input-parcel' of ↵Vincent Breitmoser2015-03-306-120/+332
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | github.com:open-keychain/open-keychain into v/crypto-input-parcel Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
| | * | Dont show slinger button in spinnerDominik Schürmann2015-03-301-0/+2
| | | |
| | * | Use RecyclerView in EncryptFilesFragmentDominik Schürmann2015-03-305-121/+331
| | | |
| * | | remove unused NfcActivityVincent Breitmoser2015-03-302-574/+5
| | | |
| * | | fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-3020-559/+185
| | | |
| * | | pass CryptoInputParcel independently for SignEncryptOperationVincent Breitmoser2015-03-3010-90/+35
| |/ /
| * | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-304-392/+400
| |\| | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java
| * | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-292-14/+41
| |\ \
| * | | Fixing crashes with new encrypt uiDominik Schürmann2015-03-295-41/+69
| | | |
| * | | Start reworking decrypt ui classesDominik Schürmann2015-03-273-172/+197
| | | |
| * | | Refactoring of EncryptTextActivityDominik Schürmann2015-03-278-400/+415
| | | |
| * | | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-261-14/+76
| |\ \ \
| * | | | Start refactoring encrypt ui, EncryptFileActivity no longer crashingDominik Schürmann2015-03-266-506/+531
| | | | |
| * | | | Fix certify with CryptoInputParcelDominik Schürmann2015-03-253-10/+6
| | | | |
| * | | | Remove backward compat in CertifyKeyFragmentDominik Schürmann2015-03-251-17/+1
| | | | |
| * | | | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-2432-186/+753
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-234-24/+77
| | | | | |
| * | | | | nicer handling of nfc errorsVincent Breitmoser2015-03-231-5/+8
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 18:59:16 +0000