aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'certify' into certsVincent Breitmoser2014-03-172-2/+10
|\ | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java OpenPGP-Keychain/src/main/res/values/strings.xml
| * certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-174-7/+73
| |
* | certs: more filters, better initial uid selection, code cosmeticsVincent Breitmoser2014-03-176-55/+87
| | | | | | | | | | | | | | - add three types of filters for certificate list (ui looks like crap there, need to work on that) - select uncertified uids by default in CertifyKeyActivity - move some code around in KeychainProvider, 's slightly less hacky now
* | certs: green dots for verified status \o/Vincent Breitmoser2014-03-152-3/+21
| |
* | certs: provider cleanup and bugfixingVincent Breitmoser2014-03-156-83/+74
| |
* | Merge branch 'certify' into certsVincent Breitmoser2014-03-1512-225/+662
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: 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/values/strings.xml
| * | certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-153-6/+64
| |/
| * certify: sign individual UIDsVincent Breitmoser2014-03-153-12/+31
| | | | | | | | | | | | direct signing of pubkeys is out for now. not sure how this should be handled, but it's trivial to re-add so leaving this up for discussion for now.
| * certify: add some subscopes in PgpKeyOperation for readabilityVincent Breitmoser2014-03-151-112/+128
| | | | | | | | note this commit introduces NO semantical changes whatsoever!
| * certify: revamp certifykeyactivityVincent Breitmoser2014-03-154-1/+186
| | | | | | | | | | | | show info on the key to be certified, along with a list of (selectable) user ids. user ids are handed through to the signing service, but not yet handled.
| * certify: support PUBLIC_KEY_RING_BY_MASTER_KEY_ID_USER_ID uri (haha)Vincent Breitmoser2014-03-151-0/+36
| |
| * certify: viewkeyuseridsadapter cosmetics and checkbox capabilityVincent Breitmoser2014-03-153-17/+116
| |
| * certify: selectsecretkeyfragment cosmeticsVincent Breitmoser2014-03-152-6/+22
| |
| * certify: add certify action button to viewkeymainfragmentVincent Breitmoser2014-03-152-0/+32
| |
| * move fingerprint coloring into helperVincent Breitmoser2014-03-153-61/+64
| |
* | Merge branch 'master' into certsVincent Breitmoser2014-03-15122-2413/+2419
|\| | | | | | | | | | | | | | | | | | | Conflicts: 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/ViewKeyCertsFragment.java OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
| * Fix two bugs in ImportKeys screen (issue #416)uberspot2014-03-142-0/+2
| |
| * Make email address less restrictive and add icon to show when it's correctuberspot2014-03-142-11/+28
| |
| * final code style changesuberspot2014-03-1312-106/+132
| |
| * fix code style in /pgpuberspot2014-03-1311-491/+436
| |
| * final ui code style changesuberspot2014-03-1312-53/+54
| |
| * more code style changes in /ui and /utiluberspot2014-03-1324-323/+345
| |
| * more UI code style fixesuberspot2014-03-139-70/+77
| |
| * More code style fixes for /uiuberspot2014-03-1316-53/+91
| |
| * Fix colors in item viewDominik Schürmann2014-03-132-2/+2
| |
| * remove unused colorDominik Schürmann2014-03-131-1/+0
| |
| * Improve list item view, borderless button for API < 11Dominik Schürmann2014-03-134-55/+78
| |
| * First code style changes in uiuberspot2014-03-1356-634/+486
| |
| * Fix code style in /helperuberspot2014-03-135-71/+64
| |
| * Fix code style in keychain/service/uberspot2014-03-1311-87/+129
| |
| * Optimize imports in all files, remove useless whitespace in some and fix ↵uberspot2014-03-1311-128/+80
| | | | | | | | indentation
| * Merge pull request #407 from uberspot/masterDominik Schürmann2014-03-131-15/+31
| |\ | | | | | | Add apg's change to colorizing, no more background changes needed
| | * add apg's change to colorizing, no more background changes neededuberspot2014-03-131-15/+31
| | |
| * | Forgot faq fileDominik Schürmann2014-03-131-0/+12
| | |
| * | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-131-23/+29
| |\ \
| | * \ Merge pull request #408 from gogowitczak/masterDominik Schürmann2014-03-131-23/+29
| | |\ \ | | | | | | | | | | Specifying connection port in KeyServer
| | | * | Added possibility to specify port for KeyServer.gogowitczak2014-03-131-1/+1
| | | | |
| | | * | Added possibility to specify port for KeyServer.gogowitczak2014-03-131-24/+30
| | | |/
| * | / Add FAQ tab to helpDominik Schürmann2014-03-132-8/+12
| |/ /
| * | Readd create key menu itemsDominik Schürmann2014-03-133-16/+61
| | |
| * | XML cleanup and bigger filename EditTextDominik Schürmann2014-03-133-161/+173
| | |
| * | Cleanup and simplificationDominik Schürmann2014-03-132-61/+24
| | |
| * | drop unified uri in favor of generic /key_ringsVincent Breitmoser2014-03-132-15/+10
| | | | | | | | | | | | | | | | | | | | | this works well in the uri schema, and we get notifications back with no effort. ....also remove a line I committed accidentally oO
| * | Merge remote-tracking branch 'origin/master'Vincent Breitmoser2014-03-1314-44/+128
| |\| | | | | | | | | | | | | Conflicts: OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml
| | * Export cancellable - minor changesgrait2014-03-133-6/+10
| | |
| | * Export is cancellable nowgrait2014-03-133-16/+52
| | |
| | * Merge pull request #396 from bhargavgolla/Lint-error-fixDominik Schürmann2014-03-129-17/+13
| | |\ | | | | | | | | Lint error fix after testing
| | | * Removing tabBhargav Golla2014-03-101-1/+1
| | | |
| | | * Removing unused stringBhargav Golla2014-03-101-1/+1
| | | |
| | | * Merge remote-tracking branch 'upstream/master' into Lint-error-fixBhargav Golla2014-03-1049-481/+1293
| | | |\
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-26 19:46:22 +0000