aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Introduce ProviderHelper.NotFoundException, remove dead codeDominik Schürmann2014-04-0812-128/+152
|
* Merge pull request #537 from thi/change-license-to-gplDominik Schürmann2014-04-0845-444/+480
|\ | | | | Change license to gpl
| * Change license from ASLv2 to GPLv3 where possibleThialfihar2014-04-0843-403/+439
| |
| * Update copyright timespan for ThialfiharThialfihar2014-04-0841-49/+49
|/
* Merge pull request #536 from gogowitczak/custom-key-lengthDominik Schürmann2014-04-084-22/+152
|\ | | | | Added possibility to enter custom key length.
| * Fixed coding style.gogowitczak2014-04-081-3/+6
| |
| * Added possibility to enter custom key length. Added key length limitations, ↵gogowitczak2014-04-074-22/+149
| | | | | | | | according to issue #102 and SpongyCastle specification.
* | Merge pull request #531 from danielhass/toast_replacementDominik Schürmann2014-04-071-8/+9
|\ \ | |/ |/| Futher Toast replacements
| * Futher Toast replacements in CertifyKeyActivityDaniel Haß2014-04-071-8/+9
|/
* Merge pull request #529 from gogowitczak/gradlebug-branchDominik Schürmann2014-04-061-13/+13
|\ | | | | Fixed gradle localTest bug on Windows.
| * Fixed gradle localTest bug on Windows.gogowitczak2014-04-061-13/+13
|/
* Comment out localTest due to bug on windowsDominik Schürmann2014-04-061-13/+13
|
* Merge branch 'master' of github.com:open-keychain/open-keychainDominik Schürmann2014-04-063-13/+13
|\
| * Merge pull request #522 from Valodim/masterDominik Schürmann2014-04-063-13/+13
| |\ | | | | | | show key expiry status similar to revocation
| | * show key expiry status similar to revocationVincent Breitmoser2014-04-063-13/+13
| |/
* / License clarification in READMEDominik Schürmann2014-04-061-2/+3
|/
* Update READMEDominik Schürmann2014-04-061-1/+1
|
* Update travis linkDominik Schürmann2014-04-061-1/+1
|
* Update transifex configDominik Schürmann2014-04-061-18/+18
|
* Update READMEDominik Schürmann2014-04-061-10/+10
|
* Rename folder structure from OpenPGP Keychain to OpenKeychainDominik Schürmann2014-04-06532-7/+7
|
* Pull from transifexDominik Schürmann2014-04-0638-106/+124
|
* Optimize comments, remove dead codeDominik Schürmann2014-04-066-47/+5
|
* Use dark icon in warning dialogs in edit keyDominik Schürmann2014-04-061-2/+2
|
* code styleDominik Schürmann2014-04-063-14/+12
|
* copyright header correction, style fixesDominik Schürmann2014-04-062-48/+49
|
* Merge pull request #520 from Valodim/certsDominik Schürmann2014-04-0623-146/+1331
|\ | | | | Certificate support
| * certs: remove unused menu itemVincent Breitmoser2014-04-062-7/+0
| |
| * certs: change migration routine so certifications workVincent Breitmoser2014-04-061-3/+27
| |
| * certs: display green dot for certified keys in KeyListFragmentVincent Breitmoser2014-04-064-4/+35
| |
| * certs: forgot to add ids fileVincent Breitmoser2014-04-061-0/+6
| |
| * Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-0622-195/+130
| |\ | |/ |/| | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
* | Use AppMsg in edit keyDominik Schürmann2014-04-051-8/+6
| |
* | Remove import activity from drawer, make it reachable from key list onlyDominik Schürmann2014-04-058-35/+32
| |
* | Use PgpKeyHelper.splitUserId in EncryptAsymmetricFragmentDominik Schürmann2014-04-051-12/+11
| |
* | Rework menu itemsDominik Schürmann2014-04-058-10/+14
| |
* | Fix nfc, make edit activity like a modal dialog, move all menu actions into ↵Dominik Schürmann2014-04-057-141/+66
| | | | | | | | view activity
| * certs: ditch expiry, re-add data blob, improve ViewCertActivityVincent Breitmoser2014-04-066-41/+101
| | | | | | | | | | | | | | | | | | GnuPG doesn't support expiry of user id certifications. The number of rings with an expiration subpacket in a cert out there is likely negligible. ViewCertActivity now verifies the key and displays a status. For revocation certs, the revocation reason is also shown.
| * certs: fix ViewCertActivityVincent Breitmoser2014-04-065-36/+58
| |
| * certs: fix CertifyKeyActivity and improve user id listVincent Breitmoser2014-04-065-37/+39
| |
| * certs: ditch selection spinner from certs viewVincent Breitmoser2014-04-062-50/+1
| |
| * certs: display cert type in cert viewVincent Breitmoser2014-04-062-11/+24
| |
| * certs: display uid status in uid listVincent Breitmoser2014-04-065-12/+28
| |
| * certs: properly handle primary flag and revocation of uidsVincent Breitmoser2014-04-065-66/+109
| |
| * certs: various improvementsVincent Breitmoser2014-04-056-30/+55
| | | | | | | | | | | | | | * recognize self-certifications * save signature type * save expiry time * drop encoded data blob from db
| * certs: more fixes, almost working nowVincent Breitmoser2014-04-055-38/+52
| |
| * Merge remote-tracking branch 'origin/master' into certsVincent Breitmoser2014-04-05288-7191/+26952
| |\ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of things are completely broken, but it compiles and doesn't crash right away. Good enough for me. 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/KeychainProvider.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml
* | Change headers in encrypt activity to be more descriptiveDominik Schürmann2014-04-041-2/+2
| |
* | Merge pull request #513 from Valodim/db-overhaulDominik Schürmann2014-04-0425-896/+708
|\ \ | | | | | | Get everything working again after db overhaul
| * \ Merge remote-tracking branch 'origin/master' into db-overhaulVincent Breitmoser2014-04-047-153/+89
| |\ \ | |/ / |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 12:53:03 +0000