Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix Encrypt* with RequiredInputParcel | Vincent Breitmoser | 2015-03-30 | 1 | -1/+1 |
| | |||||
* | Refactoring of EncryptTextActivity | Dominik Schürmann | 2015-03-27 | 1 | -301/+69 |
| | |||||
* | Start refactoring encrypt ui, EncryptFileActivity no longer crashing | Dominik Schürmann | 2015-03-26 | 1 | -45/+2 |
| | |||||
* | Merge branch 'development' into v/crypto-input-parcel | Dominik Schürmann | 2015-03-24 | 1 | -1/+3 |
|\ | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Fixed issue where setting a passphrase to null later causes a ↵ | JesperBK | 2015-03-23 | 1 | -1/+3 |
| | | | | | | | | NullPointerException. | ||||
* | | Merge remote-tracking branch 'origin/development' into v/crypto-input-parcel | Vincent Breitmoser | 2015-03-21 | 1 | -6/+11 |
|\| | | | | | | | | | | | 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 | -6/+11 |
| | | |||||
* | | Merge remote-tracking branch 'origin/development' into development | Vincent Breitmoser | 2015-03-20 | 1 | -4/+6 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -4/+6 |
| | | |||||
* | | generalize nfc crypto input structure | Vincent Breitmoser | 2015-03-18 | 1 | -1/+0 |
|/ | |||||
* | File extensions into Constants | Dominik Schürmann | 2015-03-17 | 1 | -5/+5 |
| | |||||
* | Allow for hidden recipients in encrypt methods | Dominik Schürmann | 2015-03-16 | 1 | -2/+16 |
| | |||||
* | Allow encrypt of filenames via overflow menu | Dominik Schürmann | 2015-03-16 | 1 | -0/+5 |
| | |||||
* | object oriented split user id | Dominik Schürmann | 2015-03-16 | 1 | -4/+3 |
| | |||||
* | Clarify MIME usage | Dominik Schürmann | 2015-03-15 | 1 | -1/+1 |
| | |||||
* | Fix compression check in activities | Dominik Schürmann | 2015-03-09 | 1 | -1/+1 |
| | |||||
* | Use ArrayList instead of LinkedList | Dominik Schürmann | 2015-03-05 | 1 | -1/+1 |
| | |||||
* | Use static linked lists instead of arrays | Dominik Schürmann | 2015-03-05 | 1 | -1/+1 |
| | |||||
* | Remove advanced preferences, move compression as menu item in encrypt ↵ | Dominik Schürmann | 2015-03-05 | 1 | -5/+24 |
| | | | | activites, select hash and encryption algo based on hardcoded preferred lists | ||||
* | Better selection of preferred algorithm | Dominik Schürmann | 2015-03-05 | 1 | -0/+2 |
| | |||||
* | rewrite PgpSignEncrypt data flow | Vincent Breitmoser | 2015-02-01 | 1 | -29/+26 |
| | | | | | | | - 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 | ||||
* | Temporary nav drawer fixes | Dominik Schürmann | 2015-01-27 | 1 | -4/+4 |
| | |||||
* | Material Design Drawer | Dominik Schürmann | 2015-01-26 | 1 | -6/+6 |
| | |||||
* | lift language level to java 7, and some code cleanup | Vincent Breitmoser | 2015-01-25 | 1 | -3/+3 |
| | |||||
* | Disable sharing chooser blacklisting for lollipop | Dominik Schürmann | 2015-01-19 | 1 | -0/+1 |
| | |||||
* | Refactor BaseActivity | Dominik Schürmann | 2015-01-13 | 1 | -2/+2 |
| | |||||
* | Start working on Material Design | Dominik Schürmann | 2015-01-13 | 1 | -2/+5 |
| | |||||
* | move around package structure a bit | Vincent Breitmoser | 2014-10-10 | 1 | -1/+1 |
| | |||||
* | Fixes for share to decrypt | Dominik Schürmann | 2014-09-29 | 1 | -2/+3 |
| | |||||
* | move more stuff into EncryptActivity superclass | Vincent Breitmoser | 2014-09-24 | 1 | -135/+13 |
| | |||||
* | use correct pin for nfc in EncryptActivity | Vincent Breitmoser | 2014-09-24 | 1 | -1/+1 |
| | |||||
* | fix signing in OK with yubikeys | Vincent Breitmoser | 2014-09-24 | 1 | -14/+23 |
| | |||||
* | package reordering: merge util and helper, there were no real difference; ↵ | Dominik Schürmann | 2014-09-17 | 1 | -4/+3 |
| | | | | created ui.util for everything related to formatting | ||||
* | Passphrase handling in encrypt | Dominik Schürmann | 2014-09-17 | 1 | -0/+34 |
| | |||||
* | Result parcel refactorings (WIP) | Dominik Schürmann | 2014-09-17 | 1 | -44/+10 |
| | |||||
* | Work on new result handling (WIP) | Dominik Schürmann | 2014-09-17 | 1 | -49/+88 |
| | |||||
* | add SignEncryptResult parcel (probably break stuff) | Vincent Breitmoser | 2014-09-14 | 1 | -3/+16 |
| | |||||
* | Fix share to encrypt text | Dominik Schürmann | 2014-09-13 | 1 | -5/+18 |
| | |||||
* | add some comments to previous commit | Vincent Breitmoser | 2014-09-10 | 1 | -0/+4 |
| | |||||
* | jury-rig broken sign mechanism | Vincent Breitmoser | 2014-09-09 | 1 | -12/+22 |
| | | | | Should improve situation on #811 | ||||
* | Update and fix Intent API | Dominik Schürmann | 2014-09-07 | 1 | -2/+3 |
| | |||||
* | Make Intent API as recommended in ↵ | Dominik Schürmann | 2014-09-07 | 1 | -7/+7 |
| | | | | http://developer.android.com/guide/components/intents-filters.html | ||||
* | Two buttons to encrypt files and text, some fixes | Dominik Schürmann | 2014-09-07 | 1 | -4/+4 |
| | |||||
* | Remove file menu items from text activity | Dominik Schürmann | 2014-09-06 | 1 | -1/+1 |
| | |||||
* | No inception with APG | Dominik Schürmann | 2014-09-06 | 1 | -1/+6 |
| | |||||
* | Fix AndroidManifest for new encrypt activities | Dominik Schürmann | 2014-09-06 | 1 | -1/+1 |
| | |||||
* | Share helper | Dominik Schürmann | 2014-09-06 | 1 | -64/+5 |
| | |||||
* | Drawer nav method cleanup | Dominik Schürmann | 2014-09-06 | 1 | -3/+2 |
| | |||||
* | Lock drawer in EncryptFileActivity if called from intent | Vincent Breitmoser | 2014-09-01 | 1 | -0/+3 |
| | | | | Closes #810 | ||||
* | split EncryptActivity into Encrypt{Text,File}Activity | Vincent Breitmoser | 2014-09-01 | 1 | -0/+477 |