aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Simplify passphrase dialog designDominik Schürmann2015-03-313-4/+4
| |/ /
| * | update OpenPgpApi, re-add EXTRA_PASSPHRASEVincent Breitmoser2015-03-302-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
| |/ /
| * | Add TokenAutoComplete and StickyListHeaders as maven dependencies instead of ↵Dominik Schürmann2015-03-304-12/+4
| | | | | | | | | | | | git submodules
| * | 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
| | | |
| * | | Update gradle plugin, update gradle test pluginDominik Schürmann2015-03-262-2/+2
| | | |
| * | | 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-24235-8380/+10180
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-225-16/+29
| |\ \ \ \ \
| * | | | | | forgot spongycastle updateVincent Breitmoser2015-03-221-0/+0
| | | | | | |
| * | | | | | fix unit test and add new for divert-to-card promotionVincent Breitmoser2015-03-222-6/+33
| | | | | | |
| * | | | | | 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-2120-88/+264
| | | | | | |
| * | | | | | 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-2127-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-205-0/+17
| | | | | | | |
| * | | | | | | fix unit tests (for real)Vincent Breitmoser2015-03-207-20/+39
| | | | | | | |
| * | | | | | | fix more unit tests (syntax)Vincent Breitmoser2015-03-2010-66/+56
| | | | | | | |
| * | | | | | | inline mNfcSignOps variableVincent Breitmoser2015-03-201-17/+16
| | | | | | | |
| * | | | | | | fix unit tests (syntax)Vincent Breitmoser2015-03-204-21/+33
| | | | | | | |
| * | | | | | | re-inline cryptoInput variableVincent Breitmoser2015-03-201-32/+34
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/development' into developmentVincent Breitmoser2015-03-2086-819/+1217
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2017-248/+296
| | | | | | | | |
| * | | | | | | | generalize NfcOperationParcel to RequiredInputParcel, including passphrasesVincent Breitmoser2015-03-1912-95/+147
| | | | | | | | |
| * | | | | | | | yubikey certifications!Vincent Breitmoser2015-03-1815-240/+475
| | | | | | | | |
| * | | | | | | | generalize nfc crypto input structureVincent Breitmoser2015-03-1818-235/+883
| | | | | | | | |
| * | | | | | | | introduce CryptoOperationParcel for nfc dataVincent Breitmoser2015-03-183-3/+64
| | | | | | | | |
* | | | | | | | | minor ui and wording changesVincent Breitmoser2015-04-092-8/+20
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-24 00:03:34 +0000