moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-30 20:42:17 -05:00
Code Issues Releases Wiki Activity
2,270 Commits 12 Branches 24 Tags 116 MiB
9320d2d8a2
Commit Graph

515 Commits

Author SHA1 Message Date
Vincent Breitmoser
b5647b2062 wrapped-key-ring: no more pgp imports in PassphraseDialogFragment 2014-05-04 03:38:58 +02:00
Vincent Breitmoser
f524fa692c wrapped-key-ring: more refactoring - no more pgp imports in KeychainIntentService! 2014-05-03 22:29:09 +02:00
Vincent Breitmoser
32baf42515 wrapped-key-ring: small fix to make it work again 2014-05-03 19:14:30 +02:00
Vincent Breitmoser
ef6211e0bd wrapped-key-ring: forgot to add UncachedKeyRing class 2014-05-03 19:05:03 +02:00
Vincent Breitmoser
2176e1ef1c wrapped-key-ring: move more helper methods into keys 2014-05-03 19:04:23 +02:00
Vincent Breitmoser
1f8210f743 wrapped-key-ring: move certification logic into secretkey 2014-05-03 18:32:20 +02:00
Vincent Breitmoser
c2c6a90991 certification is always done with the master key 2014-05-03 15:59:25 +02:00
Vincent Breitmoser
4b3cfd4fa4 wrapped-key-ring: first steps, get rid of key imports in decryptverify and signencrypt 2014-05-03 15:55:28 +02:00
Dominik Schürmann
4053e1ebd7 Update from transifex 2014-05-02 19:57:16 +02:00
Vadim Lebedev
9726ac7a96 Avoid displaying double 0x before keyid in ViewCertActivity 2014-05-02 19:05:43 +02:00
Tim Bray
5b0f19fceb stupid identation stuff 2014-04-30 13:56:56 -07:00
Tim Bray
18ed828608 tidy up IntentService 2014-04-30 13:49:48 -07:00
Tim Bray
4c693b4509 Changes should now be in sync with dominik 2014-04-30 13:46:35 -07:00
Tim Bray
b5fb311c61 keybase ID stuff 2014-04-29 15:04:05 -07:00
Tim Bray
ea1032dbfd Clean up debug crud 2014-04-29 15:04:05 -07:00
Tim Bray
e663dadc32 can search openkeychain, retrieve & install & use keys from there 2014-04-29 15:04:05 -07:00
Dominik Schürmann
e0a0bf04ee Merge pull request #601 from thi/rename-builder-methods 
Rename builder methods
 2014-04-29 19:51:21 +02:00
Dominik Schürmann
5c145cf44d Merge pull request #600 from thi/rename-progressdialogupdater 
Rename progressdialogupdater
 2014-04-29 19:50:30 +02:00
Thialfihar
1f7c61a331 Rename setter methods for PgpDecryptVerify.Builder 2014-04-29 19:01:11 +02:00
Thialfihar
324971e448 Rename setter methods for PgpSignEncrypt.Builder 2014-04-29 18:57:43 +02:00
Thialfihar
9e6bf2abbb Rename ProgressDialogUpdater to Progressable 
Also fix some inconsistent usages of "progress", now using
"progressable" in all builders.
 2014-04-29 18:44:44 +02:00
Thialfihar
6a1832ebad Move util.ProgressDialogUpdater to pgp.Progressable 2014-04-29 18:32:13 +02:00
Dominik Schürmann
30d3c33be9 Formatting KeychainDatabase 2014-04-29 14:02:22 +02:00
Dominik Schürmann
bb0fe2a237 Clarify sqlite datatypes 2014-04-29 10:19:10 +02:00
Dominik Schürmann
1bd357cf55 API: Fix GET_KEY, closes #599 2014-04-28 20:20:23 +02:00
Dominik Schürmann
0963efc78b Many API fixes for GET_KEY and GET_KEY_IDS 2014-04-28 20:13:46 +02:00
Dominik Schürmann
3538bf8202 Version 2.6.1 2014-04-22 11:42:12 +02:00
Dominik Schürmann
e76a8aaedf Merge branch 'master' of github.com:open-keychain/open-keychain 2014-04-22 11:38:45 +02:00
Dominik Schürmann
4469b84e2c add has_secret for all who are upgrading from a beta version 2014-04-22 11:38:39 +02:00
Vincent Breitmoser
90324fc10e Merge commit '9cdb2ec4e270a572520d5bcdbee55867e3c37003' 2014-04-22 11:30:43 +02:00
Vincent Breitmoser
30207ee11f Merge commit '0b7fb70' 
Conflicts:
	OpenKeychain/src/main/res/values/strings.xml
 2014-04-22 11:30:14 +02:00
Dominik Schürmann
adea9df714 Workaround for nullpointer bug in support lib, close #591 2014-04-22 08:15:55 +02:00
Vincent Breitmoser
283e3c3365 Fix a nullptr in KeychainProvider 
Fixes #589
 2014-04-20 20:54:40 +02:00
Vincent Breitmoser
9cdb2ec4e2 fix nullpointer on missing s2k 
Fixes #590
 2014-04-20 20:50:26 +02:00
Vincent Breitmoser
0b7fb70781 split up filterSign and filterCertify in SelectSecretKeyFragment 
Closes #588
 2014-04-20 19:38:42 +02:00
Dominik Schürmann
7017a01bdb More code cleanup 2014-04-19 21:56:15 +02:00
Dominik Schürmann
0383822585 version 2.6 2014-04-19 16:02:40 +02:00
Dominik Schürmann
b7147564dc Update from transifex 2014-04-19 15:12:38 +02:00
Dominik Schürmann
3389ee56e4 better error string for too many responses 2014-04-19 15:06:54 +02:00
Dominik Schürmann
b22cf763c4 Trying a fix for #585 2014-04-19 14:47:19 +02:00
Dominik Schürmann
7ee4a44afa Fix some smaller annoyances, closes #583, #582 2014-04-19 14:21:34 +02:00
Dominik Schürmann
71d8bcc8f4 Fix more strings 2014-04-19 14:13:50 +02:00
Dominik Schürmann
8822f6574d certify keys 2014-04-19 02:25:53 +02:00
Dominik Schürmann
ea7726c378 Update from transifex 2014-04-19 02:16:11 +02:00
Vincent Breitmoser
dd8a7c93ad fix unified query columns for select*fragment 2014-04-18 22:18:13 +02:00
Dominik Schürmann
19d3fcec7a Remove unused strings, fix some lint errors, fix some language confusions 2014-04-18 20:41:39 +02:00
Dominik Schürmann
4a21428e07 Translations from transifex 2014-04-18 19:58:17 +02:00
Dominik Schürmann
b3badac0ee Do not show lookup button in decrypt activity for decryption-only 2014-04-18 19:03:31 +02:00
Dominik Schürmann
cc91369825 Small language corrections (thanks to yahoe.001) 2014-04-18 18:58:02 +02:00
Dominik Schürmann
e044d03d7f FIx nfc button 2014-04-18 17:21:32 +02:00
Dominik Schürmann
a25a5f4d56 Fix upload of keys, closes #581 2014-04-18 01:26:25 +02:00
Dominik Schürmann
a4ae8a72ee OK 2.6 RC1 2014-04-17 18:09:42 +02:00
Dominik Schürmann
2627b08c81 changelog 2.6 2014-04-17 18:07:19 +02:00
Dominik Schürmann
95d25cb6a9 Remove kill hack in KeychainDatabase 2014-04-17 18:00:52 +02:00
Dominik Schürmann
f0e3bb408c Remove dev hack in KeychainDatabase 2014-04-17 17:57:16 +02:00
Dominik Schürmann
a67854ca6a Merge branch 'master' of github.com:open-keychain/open-keychain 2014-04-17 17:55:52 +02:00
Dominik Schürmann
15b9789b97 Add faq entry for keyserver bug, closes #552 2014-04-17 17:55:41 +02:00
Vincent Breitmoser
8714f56cdc get rid of PgpKeyHelper.getMasterKeyId 
Closes #575
 2014-04-17 16:34:20 +02:00
Vincent Breitmoser
86d9266a44 NotFoundExceptions for all getGeneric-type methods 2014-04-17 16:19:49 +02:00
Vincent Breitmoser
f6e7b92ced load data only once in ImportKeysListLoader 
Fixes #571
 2014-04-17 15:50:18 +02:00
Vincent Breitmoser
2a34d0e0e4 add up navigation in ViewCertActivity 
Fixes #567
 2014-04-17 15:30:16 +02:00
Vincent Breitmoser
fda9bd1386 use project icons for certification status 
Closes #573
 2014-04-17 14:42:24 +02:00
Dominik Schürmann
0be4f69860 Update comments in AndroidManifest 2014-04-17 13:55:46 +02:00
Dominik Schürmann
42fe6c3056 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-04-17 13:55:34 +02:00
Dominik Schürmann
7879599fd7 Rename provider types following http://developer.android.com/guide/topics/providers/content-provider-creating.html 2014-04-17 13:51:54 +02:00
Vincent Breitmoser
52ad83e345 secret keys can only be deleted individually from multi selection 2014-04-17 12:09:09 +02:00
Dominik Schürmann
d19830cd1c essential instead of integral 2014-04-16 21:54:46 +02:00
Dominik Schürmann
f7c243564f Use git submodules for libs, fix compilation, remove library sourcecode 2014-04-16 21:49:29 +02:00
Dominik Schürmann
b0c65729a9 Merge pull request #576 from Valodim/stripped-secretkeys 
Support stripped secretkeys
 2014-04-16 19:40:36 +02:00
Vincent
8b4700d521 Fix even more whitespace 2014-04-16 19:20:42 +02:00
Vincent
1e64f6b846 Fix more whitespace 2014-04-16 19:20:03 +02:00
Vincent
adb20689fe Fix whitespace 2014-04-16 19:19:17 +02:00
Dominik Schürmann
676262b052 Translations from transifex, fix some strings references 2014-04-16 19:00:06 +02:00
Dominik Schürmann
b8b6fc5f6f Fix help_start 2014-04-16 18:49:17 +02:00
Vincent Breitmoser
c7eb40b814 stripped support: implement has_secret support, in ui and impot of secret keys 
Closes #570
 2014-04-16 18:14:44 +02:00
Vincent Breitmoser
66b8b86695 stripped support: add has_secret column to keys table 2014-04-16 17:29:36 +02:00
Dominik Schürmann
cd8458f34d Clarify comments 2014-04-16 14:43:06 +02:00
Dominik Schürmann
ab66b40883 Version 2.6 beta1 2014-04-16 12:30:37 +02:00
Dominik Schürmann
cb9c106878 Start changelog for 2.6 2014-04-16 01:00:19 +02:00
Dominik Schürmann
eb9d8c5c3f comments 2014-04-16 00:38:03 +02:00
Dominik Schürmann
004d4d5a97 Handle new exceptions in remote service 2014-04-16 00:32:00 +02:00
Dominik Schürmann
ad6ac28782 Fix SIGNATURE_UNKNOWN_PUB_KEY 2014-04-16 00:18:00 +02:00
Dominik Schürmann
08399dec4b Fix PgpDecryptVerify signature verification: search for right signature subkey instead of using first subkey for verification 2014-04-15 23:54:05 +02:00
Dominik Schürmann
9df498b714 Fix ViewHolder in ImportKeysAdapter 2014-04-15 23:08:41 +02:00
Dominik Schürmann
1e22b28c2e Optimize imports 2014-04-15 22:52:21 +02:00
Dominik Schürmann
fdcc4c1d3d Fix nullpointer in ImportKeysListEntry 2014-04-15 22:48:28 +02:00
Dominik Schürmann
362a30c502 center empty-info of cert fragment, closes #566 2014-04-15 22:41:47 +02:00
Dominik Schürmann
14a8586e8c Improve verification result display, close #568 2014-04-15 22:37:36 +02:00
Dominik Schürmann
fcb73f4e24 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-04-15 21:29:01 +02:00
Dominik Schürmann
8440693c51 Add OpenPgpSignatureResultBuilder 2014-04-15 21:28:52 +02:00
Dominik Schürmann
a57fc8a47a encapsulate creation of OpenPgpSignatureResult objects inside OpenPgpSignatureResultBuilder to better constraint its output when processing with PgpDecryptVerify 2014-04-15 21:28:38 +02:00
Vincent Breitmoser
71fb0f85bf add web of trust help entry 2014-04-15 13:52:31 +02:00
Dominik Schürmann
e80d070aa9 Some comments to Constants 2014-04-14 13:52:09 +02:00
Dominik Schürmann
b04e6816f4 Removing remaining uses of Id, closing one of the oldest bugs #9 2014-04-14 13:48:20 +02:00
Dominik Schürmann
59220fbe04 KeychainDatabase cleanup 2014-04-14 13:32:10 +02:00
Vincent Breitmoser
57b264639f move old apg.db to apg_old.db (half measure~) 2014-04-14 13:06:49 +02:00
Vincent Breitmoser
227155d484 add debug backup/restore options to main menu 
Closes #543
 2014-04-14 13:06:49 +02:00
Dominik Schürmann
e02e9e6707 Translations from transifex 2014-04-14 11:37:57 +02:00
Dominik Schürmann
4a2c3385d6 Fix SIGNATURE_SUCCESS_CERTIFIED 2014-04-14 01:19:05 +02:00
Dominik Schürmann
13ffd2038d key edit: fix crash when create date was after expiry date, change from gregorian calendar to calendar with creation from instance, experimental result status for decrypt activity 2014-04-14 01:11:08 +02:00
Dominik Schürmann
55bad4cac7 Rework verifyCleartextSignature 2014-04-13 21:06:39 +02:00
Dominik Schürmann
e10b24e2ea Implement SIGNATURE_SUCCESS_CERTIFIED in PgpDecryptVerify (not tested) 2014-04-13 18:55:18 +02:00
Dominik Schürmann
9b1a4a456a Handle new exceptions in KeychainIntentService 2014-04-13 18:13:34 +02:00
Dominik Schürmann
194523303f Remove unused blob classes and other dead code 2014-04-13 17:46:39 +02:00
Dominik Schürmann
9daa2ae359 Update license header for 2014 2014-04-13 17:27:22 +02:00
Dominik Schürmann
44a7bda7dc More changes to PgpSignEncrypt 2014-04-12 20:33:25 +02:00
Dominik Schürmann
a65a9ac5f0 PgpSignEncrypt comment 2014-04-11 21:55:54 +02:00
Dominik Schürmann
2069f20f50 Clarify use of methods in PgpKeyHelper 2014-04-11 21:40:12 +02:00
Dominik Schürmann
12b8282d9b More ids removed 2014-04-11 20:23:46 +02:00
Dominik Schürmann
89cf46bbd7 More fixes for import item layout 2014-04-11 20:19:21 +02:00
Dominik Schürmann
d624d1c406 Remove some Ids... 2014-04-11 20:09:01 +02:00
Dominik Schürmann
305b8c1858 Simplify and fix delete key dialog 2014-04-11 19:52:59 +02:00
Dominik Schürmann
45b450e78a PgpDecryptVerify is now context-free 2014-04-11 19:43:46 +02:00
Dominik Schürmann
9b15482c41 put signatureType where it belongs 2014-04-11 19:23:29 +02:00
Dominik Schürmann
bd6aeea6db PgpSignEncrypt is now context-free 2014-04-11 19:14:39 +02:00
Dominik Schürmann
5346d2e878 PgpSignEncrypt: merge generateSignature() into main method 2014-04-11 18:53:24 +02:00
Dominik Schürmann
e39b081927 PgpSignEncrypt: get by master key id 2014-04-11 18:08:10 +02:00
Dominik Schürmann
c4d9fd88aa More cleanup in providerHelper 2014-04-11 17:58:32 +02:00
Dominik Schürmann
094fb698de Refactor ProviderHelper to be non-static using a constructor based on context (first commit to get context out of pgp classes) 2014-04-11 17:45:52 +02:00
Dominik Schürmann
bbd97cf800 Remove queries from PgpKeyHelper, introduce encrypt to signer mode (not tested) 2014-04-11 17:14:37 +02:00
Dominik Schürmann
a9281b129c Prettify view_key_userids_item 2014-04-11 16:09:51 +02:00
Dominik Schürmann
b5c16e2446 Prettify more layouts 2014-04-11 16:00:37 +02:00
Vincent Breitmoser
baa3c86e12 split getMasterKeyId for the remaining use cases 
Closes #549
 2014-04-11 03:44:17 +02:00
Vincent Breitmoser
b77fb2fcc0 get rid of more getMasterKeyId usage, work on getKeyRingsAsArmoredString 2014-04-11 03:44:13 +02:00
Vincent Breitmoser
9af532880c fix EditKeyActivity 2014-04-11 02:58:08 +02:00
Vincent Breitmoser
0f06b8a1d6 display correct primary user id in import dialogue MOSTLY 
This is an incomplete fix; due to use of machine readable output, there
is no way to know the primary user id for keys fetched from a key
server.

Pending https://bitbucket.org/skskeyserver/sks-keyserver/issue/28/primary-uid-in-machine-readable-index
 2014-04-10 20:33:54 +02:00
Vincent Breitmoser
4e408fae53 remove drawer layout remnants from import key dialogue 2014-04-10 20:33:22 +02:00
Vincent Breitmoser
0687f7f40e use view holder pattern in KeyListFragment 
Closes #551
 2014-04-10 19:25:46 +02:00
Vincent Breitmoser
593d6ad3f7 Select*KeyFragment rewrites 
- moved all specific Public/Secret logic from the Adapter class into
  inner subclasses in the Fragments
- more versatile status display ("revoked", "expired", "can certify"...)
- applied view holder pattern
- query logic, including subqueries, moved into provider classes

Closes #375
 2014-04-10 18:47:57 +02:00
Vincent Breitmoser
ce6a4041fd ViewCertActivity cleanup 
Closes #547
 2014-04-10 15:34:16 +02:00
Dominik Schürmann
a63488cce3 Disable selection of user ids and keys in view key 2014-04-10 14:14:32 +02:00
Dominik Schürmann
a85b217756 Minimize use of class variables in ViewKey 2014-04-10 13:58:19 +02:00
Dominik Schürmann
da4016d565 Cleanup AsyncTask code for NFC 2014-04-10 13:53:02 +02:00
Dominik Schürmann
b3a39d7c24 Cleanup imports 2014-04-10 13:48:44 +02:00
Dominik Schürmann
8ee7dbfdb0 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-04-10 13:48:05 +02:00
Dominik Schürmann
2ac8be2858 Integrate NFC functionality into ViewKeyActivity 2014-04-10 13:47:58 +02:00
Dominik Schürmann
8fcb0cf98d Merge pull request #545 from danielhass/toast_replacement 
Toast replacement
 2014-04-10 11:26:53 +02:00
Daniel Haß
8ff9b768a3 Deleted wrong AppMsg 2014-04-10 00:08:26 +02:00
Dominik Schürmann
eba0640d3e Prettify more layouts, fix edit and encrypt intents from key view 2014-04-09 20:10:23 +02:00
Dominik Schürmann
6d00ca7fdb Temporary disable of master key id extraction from uri 2014-04-09 19:57:57 +02:00
Dominik Schürmann
21e6110b6d Prettify some layouts 2014-04-09 19:42:27 +02:00
Vincent Breitmoser
35f9189a82 certs: fix verification in ViewKeyActivity (how embarassing) 
Fixes #541
 2014-04-09 18:34:19 +02:00
Dominik Schürmann
30652a470f Fix certification layout 2014-04-09 16:35:27 +02:00
Dominik Schürmann
19b62d67b3 Fix NFC 2014-04-09 16:05:47 +02:00
Dominik Schürmann
a0a51c9f92 Fix save keyring, improve signature verification 2014-04-09 15:39:50 +02:00
Daniel Haß
2a9eaaa1fb Replaced Toasts in ViewKeyActivity 2014-04-09 15:14:29 +02:00
Daniel Haß
01991aa127 Removed unused Toast import in ViewKeyActivityJB 2014-04-09 15:11:17 +02:00
Daniel Haß
6c8157152e Replaced Toasts in ImportKeysOrCodeFragment 2014-04-09 15:11:17 +02:00
Dominik Schürmann
27eb7c0f1b Cleanup in SelectKeyCursorAdapter 2014-04-09 01:11:33 +02:00
Dominik Schürmann
9fb493418e Hide keyboard after hiding custom key length field 2014-04-09 00:58:24 +02:00
Dominik Schürmann
e9efd0ec87 Merge pull request #539 from gogowitczak/custom-key-length-info 
Modified Spinner values for CreateKeyDialog. Added info for user about custom key length restrictions.
 2014-04-09 00:51:58 +02:00
Dominik Schürmann
b682cb2ae5 KeychainIntentService instead of APG 2014-04-09 00:09:47 +02:00
Dominik Schürmann
8680b5b08e Fix DECRYPT and SEND intent 2014-04-09 00:05:16 +02:00
gogowitczak
19cab919af Modified Spinner values for CreateKeyDialog. Added info for user about custom key length restrictions. 2014-04-08 23:59:41 +02:00
Dominik Schürmann
8ab9a0a2d0 Use NotFoundException in more places 2014-04-08 23:41:21 +02:00
Dominik Schürmann
d81de8509b Fix decryption of messages/files encrypted for multiple public keys 2014-04-08 23:01:38 +02:00
Dominik Schürmann
a1efb24228 Introduce ProviderHelper.NotFoundException, remove dead code 2014-04-08 22:25:42 +02:00
Thialfihar
f2d8378d81 Change license from ASLv2 to GPLv3 where possible 2014-04-08 11:59:35 +02:00
Thialfihar
42faf0eb07 Update copyright timespan for Thialfihar 2014-04-08 11:59:35 +02:00
Dominik Schürmann
02549bd439 Merge pull request #536 from gogowitczak/custom-key-length 
Added possibility to enter custom key length.
 2014-04-08 10:00:53 +02:00
gogowitczak
e76fc97dd6 Fixed coding style. 2014-04-08 00:59:59 +02:00
gogowitczak
fc0c084a62 Added possibility to enter custom key length. Added key length limitations, according to issue #102 and SpongyCastle specification. 2014-04-07 16:31:38 +02:00
Daniel Haß
ddd0111704 Futher Toast replacements in CertifyKeyActivity 2014-04-07 10:48:57 +02:00
Vincent Breitmoser
b4e7d69b35 show key expiry status similar to revocation 2014-04-06 16:09:39 +02:00
Dominik Schürmann
6d11371905 Rename folder structure from OpenPGP Keychain to OpenKeychain 2014-04-06 12:57:42 +02:00