aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
* Adjust import orderThialfihar2014-04-0224-81/+46
|
* always askAshley Hughes2014-04-021-1/+1
|
* confirm that empty IDs are really wantedAshley Hughes2014-04-021-1/+46
|
* new ID sigs already added, so do save themAshley Hughes2014-04-021-1/+1
|
* allow blank IDs, allow adding new IDs and let them be masterAshley Hughes2014-04-022-5/+8
|
* pass through info that keys are new without relying on new keys orginally ↵Ashley Hughes2014-04-015-2/+22
| | | | being empty
* sort out saving empty string IDsAshley Hughes2014-04-011-9/+3
|
* Menu cleanupDominik Schürmann2014-04-011-4/+5
|
* Dont show encrypted data before decryption from clipboardDominik Schürmann2014-04-011-7/+14
|
* Change path to OpenKeychainDominik Schürmann2014-04-011-3/+8
|
* Only allow private keys associated to accounts of an appDominik Schürmann2014-04-014-18/+39
|
* CleanupDominik Schürmann2014-04-012-79/+55
|
* Automatically select newly created key in api accountsDominik Schürmann2014-04-014-18/+47
|
* Fully qualified importsDominik Schürmann2014-04-017-19/+99
|
* Remove DECRYPT_ASSUME_SYMMETRICDominik Schürmann2014-04-012-6/+0
|
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-04-015-116/+235
|\
| * PgpKeyOperation: factor out all android dependenciesVincent Breitmoser2014-04-015-116/+235
| | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
* | default to allow symmetric decryptionDominik Schürmann2014-04-011-1/+1
|/
* Fix symmetric decryptionDominik Schürmann2014-04-015-117/+117
|
* Fix pre-selection for encryptDominik Schürmann2014-04-011-4/+2
|
* Fix layoutsDominik Schürmann2014-04-011-0/+1
|
* Simplify encrypt and sign backendDominik Schürmann2014-04-013-115/+59
|
* Fix symmetric encryption and cleanupDominik Schürmann2014-04-018-136/+91
|
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-04-013-26/+39
|\
| * don't disable save button, show message if nothing needs to be doneAshley Hughes2014-04-011-3/+4
| |
| * create three keys by defaultAshley Hughes2014-03-311-1/+8
| |
| * change how new default keys are passed back, fix showing their usage flagsAshley Hughes2014-03-313-24/+29
| |
* | Experimental work on a fragment-based encrypt activityDominik Schürmann2014-04-0110-857/+1265
|/
* Include signature result in fragmentsDominik Schürmann2014-03-305-245/+204
|
* Decrypt mostly works againDominik Schürmann2014-03-305-569/+243
|
* compiles againDominik Schürmann2014-03-302-7/+9
|
* More experimental work on decrypt fragmentsDominik Schürmann2014-03-3010-375/+623
|
* Experiments with fragments in decrypt activityDominik Schürmann2014-03-305-155/+421
|
* Remove cancel from app menuDominik Schürmann2014-03-301-3/+0
|
* Revert "Remove cancel from app menu"Dominik Schürmann2014-03-301-0/+3
| | | | This reverts commit 3c0b97f280f11d553d93df9bc93ce47098af35d4.
* Remove cancel from app menuDominik Schürmann2014-03-301-3/+0
|
* Remove FLAG_ONE_SHOT from most PIsDominik Schürmann2014-03-302-6/+6
|
* Merge pull request #491 from openpgp-keychain/edit-keyDominik Schürmann2014-03-3013-493/+1206
|\ | | | | Edit key changes
| * style changesAshley Hughes2014-03-301-27/+26
| |
| * revert mistakeAshley Hughes2014-03-291-1/+1
| |
| * merge masterAshley Hughes2014-03-29123-4249/+5829
| |\
| * | all editing cases I can think of now workAshley Hughes2014-03-271-1/+1
| | |
| * | fix for editing master keys and IDs, case of change primary ID and modify ↵Ashley Hughes2014-03-271-3/+29
| | | | | | | | | | | | master key props fails
| * | pass through original primary IDAshley Hughes2014-03-273-0/+21
| | |
| * | add original primary ID field to parcelAshley Hughes2014-03-261-0/+3
| | |
| * | allow master key updates by removing old primary ID certAshley Hughes2014-03-251-0/+8
| | |
| * | delete IDs needs to update keyring, flag itAshley Hughes2014-03-251-1/+2
| | |
| * | allow lists to be subkeys or keyringsAshley Hughes2014-03-251-6/+23
| | |
| * | results of debugging, fix several bugs - more needed though...Ashley Hughes2014-03-251-31/+45
| | |
| * | comments, slight change to progress barAshley Hughes2014-03-241-6/+10
| | |