aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/main/java
Commit message (Expand)AuthorAgeFilesLines
* Accounts API, user interfaceDominik Schürmann2014-03-264-91/+194
* 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 checkSreeram Boyapati2014-03-231-1/+11
* | Merge pull request #479 from AlexanderS/subkey-expiryDominik Schürmann2014-03-261-0/+22
|\ \
| * | Display expiry of subkeys in single key view.Alexander Sulfrian2014-03-251-0/+22
* | | Fix constraints and insertDominik Schürmann2014-03-264-19/+26
* | | Temporary fix for inserting by content providerDominik Schürmann2014-03-251-4/+4
* | | Return account creation intent if account does not exists in dbDominik Schürmann2014-03-255-46/+60
* | | Fix update and insert for new api content providerDominik Schürmann2014-03-251-18/+14
* | | More experimental work on api accountsDominik Schürmann2014-03-255-81/+97
* | | Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychainDominik Schürmann2014-03-2511-33/+26
|\| |
| * | Rename old mentionings of APG-named thingsThialfihar2014-03-2311-23/+23
| * | Fix file decryption interfaceThialfihar2014-03-231-10/+3
* | | More experimental work on API accountsDominik Schürmann2014-03-2516-391/+743
* | | Extend provider for new api tablesDominik Schürmann2014-03-234-41/+222
* | | Move classes for OpenPGP API into remote packageDominik Schürmann2014-03-2311-15/+20
* | | New db table for api accountsDominik Schürmann2014-03-232-6/+25
|/ /
* | 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
| |\