aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain
Commit message (Collapse)AuthorAgeFilesLines
* add apg's fix for Key id displayuberspot2014-03-195-5/+9
|
* Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-194-17/+32
|\
| * Merge pull request #448 from AlexanderS/lint-fixesDominik Schürmann2014-03-191-1/+1
| |\ | | | | | | use correct LongSparseArray for minimum api level
| | * use correct LongSparseArray for minimum api levelAlexander Sulfrian2014-03-191-1/+1
| | |
| * | Merge pull request #445 from gogowitczak/rwrsa-branchDominik Schürmann2014-03-193-16/+31
| |\ \ | | |/ | |/| Disabled possibility to generate weak RSA keys (512 and 1024 bit)
| | * Note about blocked possibility to generate weak (<1024) RSA key.gogowitczak2014-03-182-0/+8
| | |
| | * Blocked ok button for generating weak (<1024) RSA key.gogowitczak2014-03-181-16/+23
| | |
* | | Remove oxygen text from iconDominik Schürmann2014-03-196-0/+0
| | |
* | | CleanupDominik Schürmann2014-03-191-2/+1
|/ /
* | Cleanup SelectSecretKeyActivity and also return UriDominik Schürmann2014-03-182-75/+26
| |
* | CertifyKeyActivity sets error if no key is selecteduberspot2014-03-181-2/+2
| |
* | revert ca_necrypt patchDominik Schürmann2014-03-181-4/+0
| |
* | fix emails not showing up in import keyserver searchuberspot2014-03-181-2/+1
|/
* Merge pull request #434 from honnel/revocation-statusDominik Schürmann2014-03-185-6/+22
|\ | | | | Show revocation status in ViewKeyKeysAdapter #375
| * Show revocation status in SelectPublicKeyFragment #375Daniel Hammann2014-03-185-6/+22
| | | | | | | | Added revocation status in Key List View (graphical symbol and red coloring)
* | Merge pull request #437 from sreeram-boyapati/encryptDominik Schürmann2014-03-181-1/+4
|\ \ | | | | | | Can_Encrypt Check added to hide Button
| * | Code Style fixSreeram Boyapati2014-03-181-2/+2
| | |
| * | Can_Encrypt Check added to hide ButtonSreeram Boyapati2014-03-181-1/+4
| | |
* | | Merge pull request #435 from sreeram-boyapati/change_passphraseDominik Schürmann2014-03-181-3/+5
|\ \ \ | | | | | | | | Button Text changes to Change Passphrase if Passphrase is set
| * | | Button Text changes to Change Passphrase if Passphrase is setSreeram Boyapati2014-03-181-3/+5
| |/ /
* | | add mr option in keyserver class before query (code simplification)Dominik Schürmann2014-03-181-3/+3
| | |
* | | Merge pull request #424 from gogowitczak/mro-branchDominik Schürmann2014-03-183-59/+117
|\ \ \ | | | | | | | | Machine readable output for Keyserver query
| * | | Fixed coding style.gogowitczak2014-03-182-146/+153
| | | |
| * | | removed TODO commentgogowitczak2014-03-151-7/+0
| | | |
| * | | Keyserver query now uses machine readable output for search and get. Added ↵gogowitczak2014-03-153-92/+150
| |/ / | | | | | | | | | separate function for converting algorithm integer ID to String.
* | | Merge pull request #431 from honnel/ui-modificationDominik Schürmann2014-03-183-4/+5
|\ \ \ | | |/ | |/| Ui modification
| * | #429 4)Daniel Hammann2014-03-173-4/+5
| |/ | | | | | | | | In the clicking for a particular contact , two icon in the actionbar show the same hint ('Share'). Second icon hint can be 'Keyserver' or just only 'server'
* | Merge pull request #430 from Valodim/certifyDominik Schürmann2014-03-1814-216/+688
|\ \ | | | | | | Revamp certify dialogue
| * | certify: preserve user id certificates when saving secret keysVincent Breitmoser2014-03-174-7/+73
| | |
| * | 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 pull request #420 from gogowitczak/masterDominik Schürmann2014-03-181-2/+3
|\ \ | | | | | | Added FAQ: specifying connection port for Keyserver.
| * | Added FAQ: specifying connection port for Keyserver.gogowitczak2014-03-141-2/+3
| |/
* | make loading of drawer items a bit more dynamicuberspot2014-03-173-19/+28
| |
* | Lock drawer as open in tabletsuberspot2014-03-1621-692/+863
| |
* | Fix export for new unified key list #409uberspot2014-03-159-79/+112
|/
* 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
|