| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | backport CryptoOperationFragment changes without eventbus | Vincent Breitmoser | 2015-06-10 | 1 | -7/+3 | |
| | | ||||||
| * | Partially revert "switch to native DialogFragment, fix some nullpointers", ↵ | Vincent Breitmoser | 2015-06-03 | 1 | -1/+2 | |
| | | | | | | | | | | but keep nullpointer fixes This reverts commit 403f74f55830dcc5eaa027ccebb888a1122992d1. Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java | |||||
| * | renamed KeychainIntentService to KeychainService | Adithya Abraham Philip | 2015-06-01 | 2 | -12/+12 | |
| | | ||||||
| * | merged services | Adithya Abraham Philip | 2015-06-01 | 2 | -30/+7 | |
| | | ||||||
| * | switch to native DialogFragment, fix some nullpointers | Vincent Breitmoser | 2015-05-31 | 1 | -18/+24 | |
| | | ||||||
| * | Improve strings | Dominik Schürmann | 2015-05-19 | 1 | -5/+2 | |
| | | ||||||
| * | Adding NFC Key to Card operation, accessible from Edit Key activity. | Joey Castillo | 2015-05-12 | 1 | -0/+4 | |
| | | ||||||
| * | 3.2.1 | Dominik Schürmann | 2015-05-10 | 1 | -1/+1 | |
| | | ||||||
| * | Fixing rotate crashes in create key | Dominik Schürmann | 2015-05-10 | 1 | -4/+4 | |
| | | ||||||
| * | Merge branch 'localdev' of https://github.com/Hiperzone/open-keychain into ↵ | Daniel Ramos | 2015-04-24 | 1 | -3/+5 | |
| |\ | | | | | | | | | | | | | development Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseNfcActivity.java | |||||
| | * | -Improved email sanity verifications when adding emails when creating a new Key | Daniel Ramos | 2015-04-14 | 1 | -3/+5 | |
| | | | | | | | | | | | | | -fixed a few NFC crashes -fixed a few instances when showing the keyboard would crash the Activity -fixed a case where adding new emails would crash the app if the user went back and forth between the Add Email fragment and the Add Name fragment. | |||||
| * | | keyserver verification on addition | Adithya Abraham Philip | 2015-04-22 | 1 | -0/+320 | |
| |/ | ||||||
| * | Use RecyclerView in EncryptFilesFragment | Dominik Schürmann | 2015-03-30 | 1 | -4/+17 | |
| | | ||||||
| * | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 2 | -9/+46 | |
| |\ | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | * | shifted multi-threading to own service | Adithya Abraham Philip | 2015-03-23 | 2 | -9/+46 | |
| | | | | | | | | | | | | | added multi-threaded cloud import, restored KeychainIntentService eliminated code duplication in multi-threaded import | |||||
| * | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-21 | 1 | -1/+1 | |
| |\| | | | | | | | | | | | Conflicts: OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |||||
| | * | Reworked Notify class | Manoj Khanna | 2015-03-20 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 1 | -6/+7 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | * | New Passphrase class for safer passphrase handling in memory | Dominik Schürmann | 2015-03-19 | 1 | -10/+11 | |
| | | | ||||||
| * | | support yubikeys in (some) edit key operations | Vincent Breitmoser | 2015-03-20 | 1 | -11/+1 | |
| |/ | ||||||
| * | object oriented split user id | Dominik Schürmann | 2015-03-16 | 2 | -5/+5 | |
| | | ||||||
| * | Clarify logs in DeleteFileDialog | Dominik Schürmann | 2015-03-12 | 1 | -2/+2 | |
| | | ||||||
| * | Merge pull request #1117 from danielnelz/development | Dominik Schürmann | 2015-03-12 | 1 | -1/+1 | |
| |\ | | | | | #1042: Replaced ints with enums | |||||
| | * | Merge remote-tracking branch 'upstream/development' into development | danielnelz | 2015-03-09 | 1 | -22/+27 | |
| | |\ | ||||||
| | * | | Created enum MessageStatus in KeychainIntentServiceHandler and enum IOType | danielnelz | 2015-03-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | in KeychainIntentService and replaced int constants with them. Fixed some typos. | |||||
| * | | | Improve file deletion strings | Dominik Schürmann | 2015-03-12 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | Updated fix for Issue #1116 | Manoj Khanna | 2015-03-11 | 1 | -33/+71 | |
| | | | | ||||||
| * | | | Add additional email addresses in create key | Dominik Schürmann | 2015-03-10 | 1 | -0/+215 | |
| | |/ |/| | ||||||
| * | | Some fixes for delete after encryption | Dominik Schürmann | 2015-03-09 | 1 | -22/+27 | |
| |/ | ||||||
| * | Implemented NameEditText | chipset95 | 2015-03-09 | 1 | -22/+3 | |
| | | ||||||
| * | minor code style correction | Adithya Abraham Philip | 2015-03-07 | 1 | -1/+7 | |
| | | ||||||
| * | cleaned up code | Adithya Abraham Philip | 2015-03-06 | 1 | -9/+1 | |
| | | ||||||
| * | added PassphraseEditText to SetPassphraseDialogFragment | Adithya Abraham Philip | 2015-03-06 | 1 | -5/+3 | |
| | | ||||||
| * | Created EmailEditText, PasswordEditText and implemented wherever required | chipset95 | 2015-03-06 | 2 | -35/+11 | |
| | | ||||||
| * | Simplify dialogs according to Material Design | Dominik Schürmann | 2015-03-04 | 2 | -13/+9 | |
| | | ||||||
| * | Show name only in passphrase dialog | Dominik Schürmann | 2015-03-03 | 1 | -0/+17 | |
| | | ||||||
| * | Fix expiry dialog, reorder layouts | Dominik Schürmann | 2015-03-03 | 3 | -44/+47 | |
| | | ||||||
| * | Remove old min sdk check | Dominik Schürmann | 2015-03-03 | 1 | -3/+1 | |
| | | ||||||
| * | Uncluttering advanced key view | Dominik Schürmann | 2015-02-27 | 1 | -97/+0 | |
| | | ||||||
| * | Simplify delete key dialog | Dominik Schürmann | 2015-02-27 | 1 | -2/+9 | |
| | | ||||||
| * | Remove unused BadImportKeyDialogFragment | Dominik Schürmann | 2015-02-27 | 1 | -67/+0 | |
| | | ||||||
| * | Uncluttering App Settings: Move advanced info in dialog | Dominik Schürmann | 2015-02-23 | 1 | -0/+72 | |
| | | ||||||
| * | Fix multi select and more colors | Dominik Schürmann | 2015-02-22 | 1 | -2/+2 | |
| | | ||||||
| * | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 2 | -2/+2 | |
| | | | | | | | | - introduce high-level SignEncryptOperation for uri to uri signing/encryption - use SignEncryptParcel for high-level operation parameters - use PgpSignEncryptInput plus streams for low-level operation parameters - get rid of all sign/encrypt logic in KeychainIntentService | |||||
| * | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 3 | -16/+15 | |
| | | ||||||
| * | fixed crash when file scheme is passed, broadened deletion scope | Abraham Philip | 2015-01-09 | 1 | -7/+28 | |
| | | ||||||
| * | disable cancel button instead of hiding it on cancel prevention | Vincent Breitmoser | 2014-10-26 | 1 | -1/+1 | |
| | | ||||||
| * | Remove PassphraseDialogFragment | Dominik Schürmann | 2014-10-25 | 1 | -431/+0 | |
| | | ||||||
| * | Added option for num keypad for YubiKey | Jerzy Kołosowski | 2014-10-13 | 1 | -1/+12 | |
| | | ||||||
| * | DeleteResult: add custom createNotify | Vincent Breitmoser | 2014-10-11 | 1 | -10/+12 | |
| | | ||||||
 |
index : connectbot-yubikey/open-keychain | |
| open-keychain with patches to support ssh authentication | James |
| aboutsummaryrefslogtreecommitdiffstats |