| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | Remove DECRYPT_ASSUME_SYMMETRIC | Dominik Schürmann | 2014-04-01 | 2 | -6/+0 |
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-04-01 | 5 | -116/+235 |
|\ |
|
| * | PgpKeyOperation: factor out all android dependencies | Vincent Breitmoser | 2014-04-01 | 5 | -116/+235 |
* | | default to allow symmetric decryption | Dominik Schürmann | 2014-04-01 | 1 | -1/+1 |
|/ |
|
* | Fix symmetric decryption | Dominik Schürmann | 2014-04-01 | 5 | -117/+117 |
* | Fix pre-selection for encrypt | Dominik Schürmann | 2014-04-01 | 1 | -4/+2 |
* | Fix layouts | Dominik Schürmann | 2014-04-01 | 1 | -0/+1 |
* | Simplify encrypt and sign backend | Dominik Schürmann | 2014-04-01 | 3 | -115/+59 |
* | Fix symmetric encryption and cleanup | Dominik Schürmann | 2014-04-01 | 8 | -136/+91 |
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain | Dominik Schürmann | 2014-04-01 | 3 | -26/+39 |
|\ |
|
| * | don't disable save button, show message if nothing needs to be done | Ashley Hughes | 2014-04-01 | 1 | -3/+4 |
| * | create three keys by default | Ashley Hughes | 2014-03-31 | 1 | -1/+8 |
| * | change how new default keys are passed back, fix showing their usage flags | Ashley Hughes | 2014-03-31 | 3 | -24/+29 |
* | | Experimental work on a fragment-based encrypt activity | Dominik Schürmann | 2014-04-01 | 10 | -857/+1265 |
|/ |
|
* | Include signature result in fragments | Dominik Schürmann | 2014-03-30 | 5 | -245/+204 |
* | Decrypt mostly works again | Dominik Schürmann | 2014-03-30 | 5 | -569/+243 |
* | compiles again | Dominik Schürmann | 2014-03-30 | 2 | -7/+9 |
* | More experimental work on decrypt fragments | Dominik Schürmann | 2014-03-30 | 10 | -375/+623 |
* | Experiments with fragments in decrypt activity | Dominik Schürmann | 2014-03-30 | 5 | -155/+421 |
* | Remove cancel from app menu | Dominik Schürmann | 2014-03-30 | 1 | -3/+0 |
* | Revert "Remove cancel from app menu" | Dominik Schürmann | 2014-03-30 | 1 | -0/+3 |
* | Remove cancel from app menu | Dominik Schürmann | 2014-03-30 | 1 | -3/+0 |
* | Remove FLAG_ONE_SHOT from most PIs | Dominik Schürmann | 2014-03-30 | 2 | -6/+6 |
* | Merge pull request #491 from openpgp-keychain/edit-key | Dominik Schürmann | 2014-03-30 | 13 | -493/+1206 |
|\ |
|
| * | style changes | Ashley Hughes | 2014-03-30 | 1 | -27/+26 |
| * | revert mistake | Ashley Hughes | 2014-03-29 | 1 | -1/+1 |
| * | merge master | Ashley Hughes | 2014-03-29 | 123 | -4249/+5829 |
| |\ |
|
| * | | all editing cases I can think of now work | Ashley Hughes | 2014-03-27 | 1 | -1/+1 |
| * | | fix for editing master keys and IDs, case of change primary ID and modify mas... | Ashley Hughes | 2014-03-27 | 1 | -3/+29 |
| * | | pass through original primary ID | Ashley Hughes | 2014-03-27 | 3 | -0/+21 |
| * | | add original primary ID field to parcel | Ashley Hughes | 2014-03-26 | 1 | -0/+3 |
| * | | allow master key updates by removing old primary ID cert | Ashley Hughes | 2014-03-25 | 1 | -0/+8 |
| * | | delete IDs needs to update keyring, flag it | Ashley Hughes | 2014-03-25 | 1 | -1/+2 |
| * | | allow lists to be subkeys or keyrings | Ashley Hughes | 2014-03-25 | 1 | -6/+23 |
| * | | results of debugging, fix several bugs - more needed though... | Ashley Hughes | 2014-03-25 | 1 | -31/+45 |
| * | | comments, slight change to progress bar | Ashley Hughes | 2014-03-24 | 1 | -6/+10 |
| * | | make sure ID info is saved | Ashley Hughes | 2014-03-24 | 1 | -3/+10 |
| * | | work on saving | Ashley Hughes | 2014-03-24 | 1 | -22/+23 |
| * | | move stuff around, save work | Ashley Hughes | 2014-03-23 | 1 | -59/+61 |
| * | | unused imports | Ashley Hughes | 2014-03-11 | 1 | -4/+0 |
| * | | start modifying save code | Ashley Hughes | 2014-03-10 | 1 | -8/+26 |
| * | | uncomment, use Parcel. Builds, not functional | Ashley Hughes | 2014-03-07 | 1 | -25/+23 |
| * | | keep up with master | Ashley Hughes | 2014-03-07 | 39 | -770/+1402 |
| |\ \ |
|
| * | | | use parcel to save keys, but saving existing keys is disabled, pending a rewr... | Ashley Hughes | 2014-03-06 | 4 | -78/+49 |
| * | | | fix saving new key (tmp) | Ashley Hughes | 2014-03-06 | 3 | -3/+13 |
| * | | | a method, if not the best one, for each property | Ashley Hughes | 2014-03-06 | 1 | -2/+6 |
| * | | | begin adding parcel for save intent | Ashley Hughes | 2014-03-02 | 2 | -3/+97 |
| * | | | pass through which keys are new | Ashley Hughes | 2014-02-22 | 5 | -3/+29 |
| * | | | remove deleted keys | Ashley Hughes | 2014-02-22 | 1 | -0/+4 |
| * | | | first go at saving IDs correctly | Ashley Hughes | 2014-02-22 | 1 | -14/+64 |