aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Rename old mentionings of APG-named thingsThialfihar2014-03-2311-23/+23
* Fix file decryption interfaceThialfihar2014-03-231-10/+3
* Merge pull request #469 from honnel/save-key-workaroundDominik Schürmann2014-03-231-1/+9
|\
| * The current implementation of saving new generated key doesn't save the key d...Daniel Hammann2014-03-221-1/+9
* | Use new FoldableLinearLayout in API settingsDominik Schürmann2014-03-231-41/+5
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-223-57/+210
|\ \
| * \ Merge pull request #467 from uberspot/masterDominik Schürmann2014-03-222-47/+203
| |\ \
| | * | 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
| |/
* / raname to mKeychainDatabaseDominik Schürmann2014-03-211-6/+6
|/
* 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-216-140/+145
|\
| * Fix GPL HeadersNikhil Peter Raj2014-03-213-3/+3
| * Fix for #410Nikhil Peter Raj2014-03-216-142/+147
* | 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
|\ \
| * | 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-208-18/+15
* | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-201-0/+5
|\ \
| * | Group fingerprint again to make it visually consistentThialfihar2014-03-201-0/+5
| |/
* / verify downloaded key by comparing fingerprintsDominik Schürmann2014-03-201-35/+45
|/
* put colorize method into key helperDominik Schürmann2014-03-205-80/+89
* colorize fingerprint in importDominik Schürmann2014-03-201-1/+3
* Use getter and setterDominik Schürmann2014-03-203-40/+111
* Dont try to parse key/fingerprint result from keyserver queryDominik Schürmann2014-03-206-85/+87
* Add debug logging for hkp keyserver actionsThialfihar2014-03-201-5/+10
* Let convertKeyIdToHex handle short key IDsThialfihar2014-03-201-0/+5
* Fix key list views in main key viewThialfihar2014-03-201-1/+11
* 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-192-17/+24
|\
| * Merge pull request #448 from AlexanderS/lint-fixesDominik Schürmann2014-03-191-1/+1
| |\
| | * use correct LongSparseArray for minimum api levelAlexander Sulfrian2014-03-191-1/+1
| * | Merge pull request #445 from gogowitczak/rwrsa-branchDominik Schürmann2014-03-191-16/+23
| |\ \ | | |/ | |/|
| | * 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
* | fix emails not showing up in import keyserver searchuberspot2014-03-181-2/+1
|/
* Merge pull request #434 from honnel/revocation-statusDominik Schürmann2014-03-182-6/+18
|\
| * Show revocation status in SelectPublicKeyFragment #375Daniel Hammann2014-03-182-6/+18
* | Merge pull request #437 from sreeram-boyapati/encryptDominik Schürmann2014-03-181-1/+4
|\ \
| * | 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 setSreeram Boyapati2014-03-181-3/+5
| |/
* | add mr option in keyserver class before query (code simplification)Dominik Schürmann2014-03-181-3/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 10:28:25 +0000