aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org
Commit message (Collapse)AuthorAgeFilesLines
* title for ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURNDominik Schürmann2014-04-031-2/+2
|
* Merge branch 'db-overhaul' of git://github.com/Valodim/openpgp-keychain into ↵Dominik Schürmann2014-04-0326-1407/+635
|\ | | | | | | Valodim-db-overhaul
| * Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-0370-702/+1021
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
| * | 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)
* | | ChangelogDominik Schürmann2014-04-031-1/+1
| | |
* | | Key lookup for APIDominik Schürmann2014-04-031-5/+7
| | |
* | | Key lookup for APIDominik Schürmann2014-04-032-7/+16
| | |
* | | Implement ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURNDominik Schürmann2014-04-038-132/+141
| |/ |/|
* | Cleanup DrawerActivityDominik Schürmann2014-04-031-31/+4
| |
* | Rename "canEdit" to "canBeEdited"Thialfihar2014-04-024-13/+13
| |
* | Rename "armour" to "armor"Thialfihar2014-04-024-16/+16
| |
* | Rename "pass phrase" to "passphrase"Thialfihar2014-04-0210-73/+73
| |
* | Fix buildDominik Schürmann2014-04-021-0/+2
| |
* | Replace wildcard imports with explicit importsThialfihar2014-04-0213-21/+126
| |
* | Spacing correctionsThialfihar2014-04-021-3/+2
| |
* | 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-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
|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 16:14:32 +0000