aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Add missing and curly brackets and fix othersThialfihar2014-04-027-60/+61
| | | | | | | | | | | | | | | Style guide demands them even for single-line blocks, and opening curly brackets never appear on a line on their own.
| * | Rearrange too long linesThialfihar2014-04-0228-145/+228
| | |
| * | Adjust variable/member naming to conform to style guideThialfihar2014-04-0211-79/+82
| | | | | | | | | | | | | | | In some cases change member accessibility, so the naming matches. Also, some key words were reordered to comply with JLS suggestions.
| * | Trivial spacing changes to conform to style guideThialfihar2014-04-0229-85/+87
| | |
| * | Adjust copyright headersThialfihar2014-04-026-12/+20
| | |
| * | Adjust import orderThialfihar2014-04-0224-81/+46
|/ /
* | always askAshley Hughes2014-04-021-1/+1
| |
* | confirm that empty IDs are really wantedAshley Hughes2014-04-022-1/+47
| |
* | 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-014-28/+47
| |
* | 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
| |
* | Add API imageDominik Schürmann2014-04-011-0/+0
| |
* | 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
| |
| * Break a lot of stuff. Also, database redesign.Vincent Breitmoser2014-04-0325-1367/+598
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change entire database design. This introduces a lot of changes, notably all URIs and almost all projections. Some features (like key deletion) have been simply commented out for now since they need serious reconsideration. There are a couple of new TODOs marking places where more work is needed. The migration path works fine from what I tested. The old database is not deleted for now, ie, it is reimported at every start of the application making all intermediate changes transient. Tested and working (for me): - All activities in the main drawer - Multiselect and Search - ViewKeyActivity, with and without secret key available - CertifyKeyActivity - SelectSecretKeyActivity (from CertifyKeyActivity) - SelectPublicKeyActivity (from encrypt activity) What doesn't work: - Actually certifying keys (pending a TODO in ProviderHelper) - Importing keys doesn't preserve secret keys - "Encrypt to this contact" doesn't pass key - Editing keys. All controls are disabled, I'm not sure why... (is this even my fault?) - Deleting keys What I didn't test: - Key export - API stuff - Creating keys (since editing doesn't even work)
* Remove DECRYPT_ASSUME_SYMMETRICDominik Schürmann2014-04-012-6/+0
|
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-04-019-117/+347
|\
| * Merge pull request #501 from Valodim/masterDominik Schürmann2014-04-019-117/+347
| |\ | | | | | | factor out android dependencies from PgpKeyOperation, and add JUnit/Robolectric testing stubs
| | * test: add junit+robolectric to buildfiles and stub test fileVincent Breitmoser2014-04-014-1/+112
| | |
| | * 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
|
* languageDominik Schürmann2014-04-011-2/+2
|
* More layout fixesDominik Schürmann2014-04-011-56/+62
|
* More layout fixesDominik Schürmann2014-04-012-97/+108
|
* Language clarificationsDominik Schürmann2014-04-013-9/+11
|
* Fix layoutsDominik Schürmann2014-04-0111-97/+100
|
* 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-014-26/+40
|\
| * don't disable save button, show message if nothing needs to be doneAshley Hughes2014-04-012-3/+5
| |
| * 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
| |
* | Small layout fix (more to come)Dominik Schürmann2014-04-011-1/+1
| |
* | Experimental work on a fragment-based encrypt activityDominik Schürmann2014-04-0115-1176/+1302
| |
* | Layouts for new encrypt designDominik Schürmann2014-03-316-12/+263
|/
* Include signature result in fragmentsDominik Schürmann2014-03-308-290/+242
|
* Decrypt mostly works againDominik Schürmann2014-03-307-700/+255
|
* compiles againDominik Schürmann2014-03-302-7/+9
|
* More experimental work on decrypt fragmentsDominik Schürmann2014-03-3014-516/+831
|
* Experiments with fragments in decrypt activityDominik Schürmann2014-03-309-251/+603
|
* Remove cancel from app menuDominik Schürmann2014-03-302-7/+0
|
* Revert "Remove cancel from app menu"Dominik Schürmann2014-03-302-0/+7
| | | | This reverts commit 3c0b97f280f11d553d93df9bc93ce47098af35d4.