aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
| | |
| * | Rename advanced to extendedDominik Schürmann2015-03-311-7/+7
| | |
| * | 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
| | | |
| * | | From passphrase to passwordDominik Schürmann2015-03-311-47/+47
| | | |
| * | | Simplify passphrase dialog designDominik Schürmann2015-03-313-4/+4
| |/ /
| * | update OpenPgpApi, re-add EXTRA_PASSPHRASEVincent Breitmoser2015-03-301-0/+13
| | |
| * | Merge branch 'v/crypto-input-parcel' of ↵Vincent Breitmoser2015-03-309-183/+392
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |
| | * | Fix scrollbarDominik Schürmann2015-03-301-0/+1
| | | |
| | * | Use RecyclerView in EncryptFilesFragmentDominik Schürmann2015-03-308-184/+390
| | | |
| * | | remove unused NfcActivityVincent Breitmoser2015-03-303-580/+5
| | | |
| * | | fix Encrypt* with RequiredInputParcelVincent Breitmoser2015-03-3021-560/+185
| | | |
| * | | pass CryptoInputParcel independently for SignEncryptOperationVincent Breitmoser2015-03-3010-90/+35
| |/ /
| * | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-307-405/+423
| |\| | | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptModeAsymmetricFragment.java
| * | Fix strings with email addressDominik Schürmann2015-03-291-2/+2
| | |
| * | Merge branch 'development' into v/crypto-input-parcelDominik Schürmann2015-03-293-14/+42
| |\ \
| * | | Fixing crashes with new encrypt uiDominik Schürmann2015-03-298-43/+70
| | | |
| * | | Start reworking decrypt ui classesDominik Schürmann2015-03-273-172/+197
| | | |
| * | | Refactoring of EncryptTextActivityDominik Schürmann2015-03-279-404/+418
| | | |
| * | | 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-269-516/+539
| | | | |
| * | | | 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-24224-8054/+10116
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-235-24/+78
| | | | | |
| * | | | | nicer handling of nfc errorsVincent Breitmoser2015-03-232-5/+9
| | | | | |
| * | | | | Merge branch 'development' into v/crypto-input-parcelVincent Breitmoser2015-03-221-14/+23
| |\ \ \ \ \
| * | | | | | fix unit test and add new for divert-to-card promotionVincent Breitmoser2015-03-221-0/+4
| | | | | | |
| * | | | | | enable nfc in import dialog as wellVincent Breitmoser2015-03-224-6/+51
| | | | | | |
| * | | | | | finish ui flow for yubikey importVincent Breitmoser2015-03-229-221/+396
| | | | | | |
| * | | | | | actually promote to divert, pass yubikey's AIDVincent Breitmoser2015-03-226-31/+24
| | | | | | |
| * | | | | | improve status reporting in yubikey dialogueVincent Breitmoser2015-03-223-14/+114
| | | | | | |
| * | | | | | move yubikey import into viewkeyfragmentVincent Breitmoser2015-03-229-228/+376
| | | | | | |
| * | | | | | split up wait/action yubikey fragmentsVincent Breitmoser2015-03-2117-86/+230
| | | | | | |
| * | | | | | work on ad-hoc yubikey import supportVincent Breitmoser2015-03-217-37/+365
| | | | | | |
| * | | | | | first steps toward yubikey activityVincent Breitmoser2015-03-2130-468/+689
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move BaseActivity into new package - extract BaseNfcActivity from NfcOperationsActivity
| * | | | | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcelVincent Breitmoser2015-03-2126-198/+215
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-217-36/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - pass both masterkeyid and subkeyid though RequiredInputParcel parcel - fix numeric vales in OperationResult.createNotify()
| * | | | | | | add edit key unit test for no-opVincent Breitmoser2015-03-204-0/+11
| | | | | | | |
| * | | | | | | fix unit tests (for real)Vincent Breitmoser2015-03-205-7/+19
| | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-05 21:58:15 +0000