aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | preserve keys that we don\'t use in the appAshley Hughes2014-02-041-11/+9
| | | | |
| * | | | fix certify keys without sign flagAshley Hughes2014-02-042-2/+1
| | | | |
| * | | | save flags from checkboxesAshley Hughes2014-02-031-14/+12
| | | | |
| * | | | include authentication keysAshley Hughes2014-02-031-0/+1
| | | | |
| * | | | set checkboxes from key propertiesAshley Hughes2014-02-021-37/+37
| | | | |
| * | | | replace spinner with non-functioning checkboxesAshley Hughes2014-02-021-22/+22
| | | | |
* | | | | Actually use fixBadCharactersForGmailDominik Schürmann2014-03-301-1/+1
| | | | |
* | | | | Enable importing of fingerprints from clipboard.Miroojin Bakshi2014-03-281-0/+9
| |_|_|/ |/| | |
* | | | Show divider only when usedDominik Schürmann2014-03-261-0/+6
| | | |
* | | | fix capability icons and remove red text for revoked keysuberspot2014-03-261-4/+0
| | | |
* | | | add strike through text for revoked or expired keys and disable views for ↵uberspot2014-03-261-4/+19
| | | | | | | | | | | | | | | | revoked keys as well
* | | | Simplify can encrypt checkDominik Schürmann2014-03-261-19/+24
| | | |
* | | | Merge pull request #471 from sreeram-boyapati/encryptionDominik Schürmann2014-03-261-1/+11
|\ \ \ \ | | | | | | | | | | Added can_encrypt check
| * | | | Added can_encrypt checkSreeram Boyapati2014-03-231-1/+11
| | | | |
* | | | | Display expiry of subkeys in single key view.Alexander Sulfrian2014-03-251-0/+22
| | | | |
* | | | | Rename old mentionings of APG-named thingsThialfihar2014-03-238-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | Mostly in comments, most importantly: STORE_PATH now ends in /KeychainBlobs instead of /ApgBlobs
* | | | | Fix file decryption interfaceThialfihar2014-03-231-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Actually use mAssumeSymmetricEncryption and set it to false as default. Don't close the file input stream, so we can actually look for PGP encrypted data in the next step.
* | | | | Merge pull request #467 from uberspot/masterDominik Schürmann2014-03-222-47/+203
|\ \ \ \ \ | | | | | | | | | | | | Make foldable settings in EncryptActivity into a separate widget
| * | | | | Make foldable settings in EncryptActivity a separate widgetuberspot2014-03-212-47/+203
| | | | | |
* | | | | | Because of an unknown reason toast messages were commented out.Daniel Hammann2014-03-211-10/+7
|/ / / / /
* | | | | Fix nfc help buttonDominik Schürmann2014-03-211-1/+1
| | | | |
* | | | | reformat mergeDominik Schürmann2014-03-212-59/+64
| | | | |
* | | | | Merge pull request #458 from hav3n/branch-delete-fixDominik Schürmann2014-03-214-132/+128
|\ \ \ \ \ | | | | | | | | | | | | New Fix for #410
| * | | | | Fix GPL HeadersNikhil Peter Raj2014-03-212-2/+2
| | | | | |
| * | | | | Fix for #410Nikhil Peter Raj2014-03-214-133/+129
| | | | | |
* | | | | | URI is transported in intents data not extra.Daniel Hammann2014-03-201-2/+2
| | | | | |
* | | | | | Merge pull request #457 from hav3n/branch-fix-certifyDominik Schürmann2014-03-202-72/+94
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix for #451
| * | | | | | Update fix for #451Nikhil Peter Raj2014-03-211-3/+2
| | | | | | |
| * | | | | | Cleanup for #451Nikhil Peter Raj2014-03-202-5/+0
| | | | | | |
| * | | | | | Fix for #451Nikhil Peter Raj2014-03-201-68/+96
| |/ / / / /
* / / / / / Fix fingerprint handlingDominik Schürmann2014-03-205-5/+7
|/ / / / /
* | | | | put colorize method into key helperDominik Schürmann2014-03-203-3/+3
| | | | |
* | | | | colorize fingerprint in importDominik Schürmann2014-03-201-1/+3
| | | | |
* | | | | Use getter and setterDominik Schürmann2014-03-202-28/+94
| | | | |
* | | | | Dont try to parse key/fingerprint result from keyserver queryDominik Schürmann2014-03-202-23/+26
| | | | |
* | | | | Fix key list views in main key viewThialfihar2014-03-201-1/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Since the views are being reused, a revoked key might set the text color of a view and when the view is being reused for a non-revoked key it is still red. So grab the default text colour and set it explicitly when the key is not revoked.
* | | | add apg's fix for Key id displayuberspot2014-03-194-4/+4
| | | |
* | | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-191-16/+23
|\ \ \ \
| * \ \ \ Merge pull request #445 from gogowitczak/rwrsa-branchDominik Schürmann2014-03-191-16/+23
| |\ \ \ \ | | | | | | | | | | | | Disabled possibility to generate weak RSA keys (512 and 1024 bit)
| | * | | | Blocked ok button for generating weak (<1024) RSA key.gogowitczak2014-03-181-16/+23
| | | | | |
* | | | | | 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
|/ / / /
* | | | Merge pull request #434 from honnel/revocation-statusDominik Schürmann2014-03-182-6/+18
|\ \ \ \ | | | | | | | | | | Show revocation status in ViewKeyKeysAdapter #375
| * | | | Show revocation status in SelectPublicKeyFragment #375Daniel Hammann2014-03-182-6/+18
| | | | | | | | | | | | | | | | | | | | 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