Commit Graph
346 Commits
Author SHA1 Message Date
Dominik Schürmann 7111a4265d Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-25 19:11:32 +01:00
Dominik Schürmann aa35b1f4b5 More experimental work on API accounts 2014-03-25 19:11:20 +01:00
Thialfihar c9053b97a8 Rename old mentionings of APG-named things
Mostly in comments, most importantly: STORE_PATH now ends in
/KeychainBlobs instead of /ApgBlobs
2014-03-23 21:58:18 +01:00
Thialfihar a2048773ee Fix file decryption interface
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.
2014-03-23 19:40:09 +01:00
Dominik Schürmann f082b53118 Extend provider for new api tables 2014-03-23 02:17:39 +01:00
Dominik Schürmann 9555ae3bc1 Move classes for OpenPGP API into remote package 2014-03-23 01:26:49 +01:00
Dominik Schürmann 12402d9a51 New db table for api accounts 2014-03-23 01:16:56 +01:00
Dominik Schürmann ff67ddc5f4 Merge pull request #469 from honnel/save-key-workaround
Can't save key after key generation
2014-03-23 00:13:18 +01:00
Dominik Schürmann 153b99a186 Use new FoldableLinearLayout in API settings 2014-03-23 00:03:49 +01:00
Dominik Schürmann 14dab821b7 Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-22 23:46:15 +01:00
Dominik Schürmann 90efc7f2a0 Merge pull request #467 from uberspot/master
Make foldable settings in EncryptActivity into a separate widget
2014-03-22 23:44:50 +01:00
Daniel Hammann 9c18062951 The current implementation of saving new generated key doesn't save the key due to the public key of master key id can not be resolved by ProviderHelper.getPGPPublicKeyByKeyId (via URI/Cursor). Workaround uses local keys-arraylist for resoving the pubkey of master key id. 2014-03-22 15:42:50 +01:00
Daniel Hammann 0f6dc253a4 Because of an unknown reason toast messages were commented out. 2014-03-21 23:01:24 +01:00
uberspot 8f37569967 Make foldable settings in EncryptActivity a separate widget 2014-03-21 19:09:17 +02:00
Dominik Schürmann b7bc8faee6 raname to mKeychainDatabase 2014-03-21 11:43:30 +01:00
Dominik Schürmann 1b57a10bb6 Fix nfc help button 2014-03-21 11:26:18 +01:00
Dominik Schürmann 620c67f441 reformat merge 2014-03-21 10:05:59 +01:00
Dominik Schürmann 8fead6fddb Merge pull request #458 from hav3n/branch-delete-fix
New Fix for #410
2014-03-21 09:59:19 +01:00
Daniel Hammann 2f0075e043 URI is transported in intents data not extra. 2014-03-20 22:35:05 +01:00
Nikhil Peter Raj 4e6325a140 Fix GPL Headers 2014-03-21 01:56:33 +05:30
Nikhil Peter Raj 2816461283 Fix for #410 2014-03-21 01:50:20 +05:30
Dominik Schürmann 58b22d1213 Merge pull request #457 from hav3n/branch-fix-certify
Fix for #451
2014-03-20 20:12:43 +01:00
Nikhil Peter Raj d9b909a24f Update fix for #451 2014-03-21 00:27:03 +05:30
Dominik Schürmann 59d51fe68e Fix fingerprint handling 2014-03-20 19:48:18 +01:00
Nikhil Peter Raj 016641a422 Cleanup for #451 2014-03-20 23:46:26 +05:30
Dominik Schürmann df6fff93f0 Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-20 19:11:59 +01:00
Dominik Schürmann 0510e0e217 verify downloaded key by comparing fingerprints 2014-03-20 19:11:51 +01:00
Nikhil Peter Raj 0a8b45ee88 Fix for #451 2014-03-20 23:37:29 +05:30
Thialfihar a17481b80a Group fingerprint again to make it visually consistent 2014-03-20 18:40:29 +01:00
Dominik Schürmann 77365202e0 put colorize method into key helper 2014-03-20 16:10:42 +01:00
Dominik Schürmann 81e0d04230 colorize fingerprint in import 2014-03-20 16:09:05 +01:00
Dominik Schürmann 36815b9185 Use getter and setter 2014-03-20 16:04:05 +01:00
Dominik Schürmann 2b77489932 Dont try to parse key/fingerprint result from keyserver query 2014-03-20 15:54:49 +01:00
Thialfihar 3fa3fc444b Add debug logging for hkp keyserver actions 2014-03-20 14:21:21 +01:00
Thialfihar 16ae9c8999 Let convertKeyIdToHex handle short key IDs
If a short key ID is given, then it should only be displayed as such.
2014-03-20 14:19:33 +01:00
Thialfihar 62fb1fb579 Fix key list views in main key view
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.
2014-03-20 00:37:03 +01:00
uberspot 977e76e7e4 add apg's fix for Key id display 2014-03-19 18:28:34 +02:00
Dominik Schürmann 52838a50c1 Merge branch 'master' of github.com:openpgp-keychain/openpgp-keychain 2014-03-19 16:22:26 +01:00
Dominik Schürmann 12b97d251a Cleanup 2014-03-19 16:22:10 +01:00
Dominik Schürmann 41fda151dc Merge pull request #448 from AlexanderS/lint-fixes
use correct LongSparseArray for minimum api level
2014-03-19 15:41:15 +01:00
Alexander SulfrianandAlexander Sulfrian 69d26496a2 use correct LongSparseArray for minimum api level 2014-03-19 14:26:00 +01:00
Dominik Schürmann 3416e51f84 Merge pull request #445 from gogowitczak/rwrsa-branch
Disabled possibility to generate weak RSA keys (512 and 1024 bit)
2014-03-19 09:40:28 +01:00
gogowitczak 2435794279 Blocked ok button for generating weak (<1024) RSA key. 2014-03-18 21:52:44 +01:00
Dominik Schürmann 9d60224980 Cleanup SelectSecretKeyActivity and also return Uri 2014-03-18 19:36:59 +01:00
uberspot 654c302961 CertifyKeyActivity sets error if no key is selected 2014-03-18 20:13:39 +02:00
Dominik Schürmann 4aa24413de revert ca_necrypt patch 2014-03-18 18:35:59 +01:00
uberspot ea648e5a43 fix emails not showing up in import keyserver search 2014-03-18 19:24:04 +02:00
Dominik Schürmann 9badff0b5b Merge pull request #434 from honnel/revocation-status
Show revocation status in ViewKeyKeysAdapter #375
2014-03-18 16:45:44 +01:00
Dominik Schürmann b97097d8d9 Merge pull request #437 from sreeram-boyapati/encrypt
Can_Encrypt Check added to hide Button
2014-03-18 16:45:38 +01:00
Sreeram Boyapati 163e9fddb9 Code Style fix 2014-03-18 21:10:09 +05:30