Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | ensuring code style is preserved | Adithya Abraham Philip | 2015-07-03 | 4 | -13/+16 |
| | |||||
* | added proxy support to keyserver verification | Adithya Abraham Philip | 2015-07-03 | 1 | -1/+1 |
| | |||||
* | orbot dialog fragments added | Adithya Abraham Philip | 2015-07-03 | 3 | -0/+385 |
| | |||||
* | added placeholder proxy to AddKeyServer | Adithya Abraham Philip | 2015-07-03 | 1 | -5/+22 |
| | |||||
* | Disable move to card from edit screen | Dominik Schürmann | 2015-07-02 | 1 | -2/+2 |
| | |||||
* | reworked keyserver preferences with recyclerview | Adithya Abraham Philip | 2015-07-02 | 1 | -12/+77 |
| | |||||
* | changed to work with multi-decrypt | Adithya Abraham Philip | 2015-06-27 | 1 | -0/+5 |
| | |||||
* | fixed package import | Adithya Abraham Philip | 2015-06-27 | 1 | -1/+1 |
| | |||||
* | renamed KeychainNewService to KeychainService | Adithya Abraham Philip | 2015-06-27 | 1 | -3/+3 |
| | |||||
* | deleted KeychainService | Adithya Abraham Philip | 2015-06-27 | 2 | -6/+3 |
| | |||||
* | migrated delete op to KeychainNewService | Adithya Abraham Philip | 2015-06-27 | 1 | -42/+65 |
| | |||||
* | fix rest of resource leaks (#1351) | Vincent Breitmoser | 2015-06-17 | 1 | -32/+22 |
| | |||||
* | 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 |
| |