moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-23 23:48:51 -05:00
Code Issues Releases Wiki Activity
3,082 Commits 12 Branches 24 Tags 116 MiB
c0abae5cc3
Commit Graph

1026 Commits

Author SHA1 Message Date
Vincent Breitmoser
760b05273c (forgot a file for previous commit) 2014-09-14 00:43:07 +02:00
Vincent Breitmoser
f0e159a372 add SignEncryptResult parcel (probably break stuff) 2014-09-14 00:33:30 +02:00
Dominik Schürmann
db5d12800c Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-14 00:11:28 +02:00
Dominik Schürmann
179f48a4de First work on decrypt 2014-09-14 00:11:23 +02:00
Daniel Albert
0625a16cb5 Temporary fix for #848, fixed pull2refresh bugs 2014-09-13 23:57:54 +02:00
Dominik Schürmann
d5c9021b89 Hack to disable overscroll effect of swipe to update 2014-09-13 23:08:04 +02:00
Dominik Schürmann
efdfd2544d Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-13 22:55:32 +02:00
Dominik Schürmann
c9fee47fb3 Custom actionbar to indicate swipe down effect 2014-09-13 22:55:27 +02:00
Vincent Breitmoser
85d0f5b6d5 add key id to trailing asym data log msg 2014-09-13 22:27:22 +02:00
Vincent Breitmoser
e2675caf23 just skip foreign uid certifications during import for now 
Related to #836, fix still pending
 2014-09-13 22:16:35 +02:00
Vincent Breitmoser
9475c4d91a Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-13 22:09:12 +02:00
Vincent Breitmoser
ff65733ed3 move IS_REVOKED table prefix to the right places 
Fixes #849
 2014-09-13 22:08:53 +02:00
Dominik Schürmann
bcbf96e61b Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-13 22:02:11 +02:00
Dominik Schürmann
b67b6b7f87 Set literal data format tag to UTF8 when encrypting text 2014-09-13 21:59:47 +02:00
Vincent Breitmoser
3b8c171ecb very small fix, don't show name on encoding warning 2014-09-13 21:47:04 +02:00
Vincent Breitmoser
8a188a79dc log warning on bad uid encoding 2014-09-13 21:43:37 +02:00
Vincent Breitmoser
f8677a5f16 Merge branch 'result-parcels' 2014-09-13 21:32:17 +02:00
Vincent Breitmoser
7b08b18d25 some DecryptVerify log refinements 2014-09-13 21:29:29 +02:00
Dominik Schürmann
a1323a1a14 deactivate screenshots in new PassphraseDialogActivity 2014-09-13 21:17:19 +02:00
Vincent Breitmoser
efd9d1626e add a ton of logging to DecryptVerify 2014-09-13 21:14:06 +02:00
Dominik Schürmann
3bc3bc6d58 More smaller UI fixes 2014-09-13 21:01:47 +02:00
Dominik Schürmann
be4882f5c1 If expired/revoked, disable both encrypt buttons 2014-09-13 20:53:07 +02:00
Dominik Schürmann
143cd2bd13 Test for badly encoded user ids 2014-09-13 20:46:44 +02:00
Dominik Schürmann
a8a1f352a8 Add new PassphraseDialogActivity, a transparent activity that only holds the passphrase dialog 2014-09-13 20:29:08 +02:00
Dominik Schürmann
d73ea5f612 Fix share to encrypt text 2014-09-13 20:07:22 +02:00
Dominik Schürmann
7d41800e57 Use spannable directly instead of html conversion in SubkeysAdapter 2014-09-13 19:49:16 +02:00
Dominik Schürmann
cbed39c38c Remove unused method in KeyUpdateHelper 2014-09-13 19:35:01 +02:00
Vincent Breitmoser
dbbefe2f41 working version of DecryptVerifyResult 2014-09-13 19:30:10 +02:00
Dominik Schürmann
a41b9f08d0 Merge pull request #843 from da-kid/master 
Implemented Pull2Refresh
 2014-09-13 19:10:54 +02:00
Dominik Schürmann
9e37522bdd Get certificates by raw user ids, be more liberal about accepted user id encodings 2014-09-13 19:05:53 +02:00
Vincent Breitmoser
4c636a1471 introduce OperationResultParcel for PgpDecryptVerify operations (WIP) 2014-09-13 17:54:10 +02:00
Dominik Schürmann
974dc47d69 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-13 17:30:14 +02:00
Dominik Schürmann
aca9ecdb85 getSignaturesForID can return null, check this 2014-09-13 17:30:07 +02:00
Daniel Albert
a86ec573fa Removed unnecessary querying of keyservers, reimplemented the ListAwareSwipeRefreshLayout and implemented a pull-lock in case there are no keyservers 2014-09-13 17:02:10 +02:00
Vincent Breitmoser
19252380f1 promote all result parcels to top level classes in their own package 2014-09-13 14:36:23 +02:00
Daniel Albert
fd5e5afc9f Implemented Pull2Refresh in the KeyListFragment 
Added KeyUpdateHelper and extended ProviderHelper for better fingerprint collection
Added a class for handling the list in the swipe2refresh layout that prevents scrolling bugs
Added Pull2Refresh to the KeyListFragment
 2014-09-12 22:44:45 +02:00
Vincent Breitmoser
40c81c9429 fix key upload after certification (hopefully?) 2014-09-12 11:55:14 +02:00
Vincent Breitmoser
4e834d7833 add ui support for stripping subkeys 2014-09-11 22:50:44 +02:00
Vincent Breitmoser
f744488017 editKey: add support for sripping keys 2014-09-11 22:49:21 +02:00
Vincent Breitmoser
2a6774b221 merge: add support for s2k dummy generation 
if a public key gets merged into a secret one, and there are new
subkeys, the merge() routine now adds a newly generated, stripped secret
subkey instead.
 2014-09-11 22:45:35 +02:00
Dominik Schürmann
51d6ad4394 nullpointer check in KeychainProvider 2014-09-11 13:16:35 +02:00
Dominik Schürmann
6eb715a5d9 nullpointer check in KeychainProvider 2014-09-11 13:13:35 +02:00
Dominik Schürmann
f18a8a20ac Add newly discussed design decisions for passphrase cache service 2014-09-10 13:40:51 +02:00
Vincent Breitmoser
d61d846b72 add some comments to previous commit 2014-09-10 01:04:13 +02:00
Vincent Breitmoser
7dbb7cf1e1 jury-rig broken sign mechanism 
Should improve situation on #811
 2014-09-09 22:43:14 +02:00
Dominik Schürmann
5593d4cc78 Increase s2k count to 0x90 2014-09-09 09:35:18 +02:00
Dominik Schürmann
7c67f7a715 Consolidate on database upgrade 2014-09-09 09:26:03 +02:00
Dominik Schürmann
eecf4f655b Unify package name 2014-09-08 22:34:43 +02:00
Vincent Breitmoser
ceea2667e8 introduce SingletonResult for... singleton results 2014-09-08 14:50:16 +02:00
Vincent Breitmoser
055fb59ec3 Properly handle uneditable key types in EditKeyFragment 
More specifically, return an OperationResultParcel for stripped and
divert-to-card keys, with an appropriate error message in the log.

part of #828
 2014-09-08 14:35:15 +02:00
Dominik Schürmann
9eb65601c4 Revert changes in DecryptFileFragment 2014-09-08 14:10:45 +02:00
Dominik Schürmann
518d7116e2 Work on Yubikey decryption 2014-09-08 14:04:46 +02:00
Dominik Schürmann
8ab2491645 Make preferences safe across multiple processes 2014-09-08 11:30:31 +02:00
Dominik Schürmann
f4592c8b95 Yubikey: use PIN 2014-09-08 00:40:50 +02:00
Dominik Schürmann
7ccd30b78e Fix signature timestamp in API 2014-09-08 00:17:13 +02:00
Dominik Schürmann
83af19de20 Prepare Yubikey decryption 2014-09-08 00:01:29 +02:00
Dominik Schürmann
fd7f187364 Fix yubikey for signAndEncrypt via API 2014-09-07 23:19:55 +02:00
Dominik Schürmann
605e37f089 Dont show key_unavailable on pub keys 2014-09-07 22:06:37 +02:00
Dominik Schürmann
bb0d04de82 Fix for user ids in API 2014-09-07 20:09:36 +02:00
Dominik Schürmann
4c2419642b Remove SelectSecretKey, not used anymore 2014-09-07 19:18:19 +02:00
Dominik Schürmann
6c3f6dc74a Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-07 19:01:28 +02:00
Dominik Schürmann
ef30d842d8 API fixes 2014-09-07 18:59:56 +02:00
Dominik Schürmann
857fc43873 Update and fix Intent API 2014-09-07 18:50:58 +02:00
Vincent Breitmoser
0b091aa642 flag revoked, epired and unavailable keys in selection spinner 2014-09-07 18:49:29 +02:00
Dominik Schürmann
65a0a0e34f Make Intent API as recommended in http://developer.android.com/guide/components/intents-filters.html 2014-09-07 18:26:43 +02:00
Dominik Schürmann
d172058150 Due to compatiblity switch from SHA512 to SHA256 2014-09-07 17:58:28 +02:00
Vincent Breitmoser
597eb268f4 add error text on bad passphrase 2014-09-07 17:04:13 +02:00
Dominik Schürmann
3ba2e0b0c1 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-07 17:01:07 +02:00
Dominik Schürmann
d1e08f9305 Two buttons to encrypt files and text, some fixes 2014-09-07 17:00:58 +02:00
Vincent Breitmoser
31cc004fe1 make EditKeyFragment work with new PassphraseDialog 2014-09-07 16:55:07 +02:00
Vincent Breitmoser
fd7bdbf54f add proper async check for correct passphrase to passphrasedialog 2014-09-07 16:54:39 +02:00
Dominik Schürmann
27772d401c Save account on back press and with notify 2014-09-07 16:10:28 +02:00
Dominik Schürmann
0e83df21cf More UI rework 2014-09-07 15:30:32 +02:00
Dominik Schürmann
0d1c9f7745 Remove file menu items from text activity 2014-09-06 18:06:48 +02:00
Dominik Schürmann
05a29a1f8f No inception with APG 2014-09-06 18:05:06 +02:00
Dominik Schürmann
cc14119425 Fix AndroidManifest for new encrypt activities 2014-09-06 17:55:19 +02:00
Dominik Schürmann
f2f1a9516d Share helper 2014-09-06 17:39:00 +02:00
Dominik Schürmann
59f32c4fca Drawer nav method cleanup 2014-09-06 16:36:58 +02:00
Dominik Schürmann
30978384af Remove unused gmail clearup method 2014-09-06 16:28:31 +02:00
Dominik Schürmann
6e3973e26a Add experimental support for yubikey PINs, remove caching of empty passphrases 2014-09-05 20:04:07 +02:00
Dominik Schürmann
fa9bbdd60c Add yubikey default PIN preference 2014-09-05 19:40:04 +02:00
Dominik Schürmann
8cf4e25320 Safeslinger: more simplification 2014-09-04 14:59:39 +02:00
Dominik Schürmann
7b51718c92 Safeslinger: cleanup 2014-09-04 14:56:30 +02:00
Dominik Schürmann
b1c3bfa157 Safeslinger: get all bytes 2014-09-04 14:34:59 +02:00
Dominik Schürmann
4872fd5b2d Use bytes to share via safeslinger, import on result 2014-09-04 13:44:01 +02:00
Dominik Schürmann
d0f46f1efb Integrate safeslinger share 2014-09-04 12:54:16 +02:00
Dominik Schürmann
46d45ebd67 Fix mAllowedKeyIds 2014-09-03 18:05:30 +02:00
Vincent Breitmoser
7bc424a8cb work on passphrase caching, make use of cached SecretKeyType data (WIP!) 2014-09-03 02:43:06 +02:00
Vincent Breitmoser
e9b14585f5 add getSecretKeyType method to CachedPublicKeyRing 2014-09-03 02:43:06 +02:00
Dominik Schürmann
35962cd254 Fix possible nullpointer in AppsListFragment 2014-09-02 23:13:59 +02:00
Dominik Schürmann
e2d51b86f5 If no key flags subpacket is present allow all key flags, fixes mailvelope keys 2014-09-02 17:16:04 +02:00
Dominik Schürmann
b08aa132e0 Remove version 3 checks, no longer supported in import 2014-09-02 16:42:07 +02:00
Dominik Schürmann
fe2c17cdeb Pull from transifex 2014-09-02 14:11:10 +02:00
Dominik Schürmann
0c437acd43 Catch security exception, known problem... 2014-09-02 13:51:09 +02:00
Vincent Breitmoser
e0905a3afb cache key s2k type in database, for later use 2014-09-02 01:24:16 +02:00
Vincent Breitmoser
a97ebc1ec9 Lock drawer in EncryptFileActivity if called from intent 
Closes #810
 2014-09-01 23:46:22 +02:00
Vincent Breitmoser
f8625f5310 rename EncryptMessageFragment -> EncryptTextFragment 2014-09-01 23:46:14 +02:00
Vincent Breitmoser
b3d3026de7 remove redundant check from EncryptFileActivity 2014-09-01 23:38:11 +02:00
Vincent Breitmoser
2ead78a1e5 split EncryptActivity into Encrypt{Text,File}Activity 2014-09-01 23:25:03 +02:00
Vincent Breitmoser
6b5e65253c small ui changes in encrypt 2014-09-01 21:43:15 +02:00
Vincent Breitmoser
16a93038dd remove broken(?) cancellation code 2014-09-01 21:23:05 +02:00
Dominik Schürmann
a64443e71f Experimental support for revoked, expired keys with signatures 2014-09-01 00:14:59 +02:00
Dominik Schürmann
40e6b24b14 Prepare API for OpenPgpSignatureResult extensions 2014-08-31 23:50:04 +02:00
Dominik Schürmann
9a18635b89 Changelog 2.9 2014-08-31 22:12:52 +02:00
Dominik Schürmann
428d6b1182 prevent nullpointer in ImportKeysServerFragment, return empty lists instead of null 2014-08-31 21:52:14 +02:00
Dominik Schürmann
9258fbfb74 Cleanup keyspinner layout, key id typeface monospace 2014-08-31 20:39:36 +02:00
Dominik Schürmann
bdf0436c94 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-31 20:26:12 +02:00
Dominik Schürmann
5e7eed239f Better leyout for account settings 2014-08-31 20:26:06 +02:00
Vincent Breitmoser
e9a2f256b9 add cancel prevention mechanism, improve cancellation for key import 2014-08-31 20:05:19 +02:00
Vincent Breitmoser
d17b478a9e don't make our service sticky 2014-08-31 19:31:21 +02:00
Vincent Breitmoser
e46bc24079 add cancel support to edit key action 2014-08-31 19:20:08 +02:00
Vincent Breitmoser
7da7832284 Add cancelable mechanism and support in key import 
Closes #323
 2014-08-31 17:32:13 +02:00
Vincent Breitmoser
38c6cf045c remember "show advanced tabs" setting 
Closes #669
 2014-08-31 00:39:37 +02:00
Vincent Breitmoser
a73abf57f1 if there is only one private key, use it fo certification by default 2014-08-31 00:19:59 +02:00
Vincent Breitmoser
0738a38bbe use LoaderFragment for CertifyActivity 2014-08-31 00:19:16 +02:00
Vincent Breitmoser
56f760e3f8 ditch NullProgressable 2014-08-30 18:32:29 +02:00
Vincent Breitmoser
8981fcf93d fix one log level 2014-08-30 17:22:20 +02:00
Vincent Breitmoser
07ecd38842 get rid of a deprecated method use 2014-08-30 17:12:12 +02:00
Vincent Breitmoser
5ff3043903 canonicalize: add check for algorithm type 
closes #797
 2014-08-30 17:00:58 +02:00
Vincent Breitmoser
ac080b21ef show bitsizes in import key list again 
closes #802
 2014-08-30 15:45:36 +02:00
Dominik Schürmann
8f37b22adb Fix possible nullpointer in Preferences 2014-08-29 18:39:15 +02:00
Dominik Schürmann
677d9e6023 Fix crash in PgpKeyHelper 2014-08-28 13:10:52 +02:00
Dominik Schürmann
c0ebc92611 Merge branch 'master' into yubikey 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
 2014-08-28 11:00:18 +02:00
Dominik Schürmann
b193965e58 Merge pull request #796 from open-keychain/develop 
ECC support
 2014-08-28 10:46:58 +02:00
Dominik Schürmann
4aeacd5b51 Fix NullPointerException in ImportKeysActivity 2014-08-28 10:40:11 +02:00
Dominik Schürmann
c2f6aa09c5 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-27 19:28:46 +02:00
Dominik Schürmann
d795f8d4e2 Strip out duplicate user ids 2014-08-27 19:28:33 +02:00
Vincent Breitmoser
cb2eb8aca2 small language fixes for previous commit 2014-08-27 15:42:09 +02:00
Dominik Schürmann
12a5b2174f Abort import of pubkeys where secret keys exist but new pubkey has more subkeys, fix #696 2014-08-27 14:12:59 +02:00
Dominik Schürmann
86a05033ae Cleanup FoldableLinearLayout 2014-08-27 13:54:33 +02:00
Vincent Breitmoser
783dae8804 add ecc support 2014-08-24 16:08:37 +02:00
Dominik Schürmann
71657d993c API: Fix re-seletion of keys on default account 2014-08-23 15:27:25 +02:00
Dominik Schürmann
3d6f5e8ba1 Fix contact sync 2014-08-22 09:01:37 +02:00
Dominik Schürmann
152cd10b70 Revert "No need for setSyncAutomatically, this is only for network tickles" 
This reverts commit 0c1e65bc8b.

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
 2014-08-22 08:53:16 +02:00
Dominik Schürmann
3acbe9052f Add ECDH and ECDSA values 2014-08-21 15:40:09 +02:00
Dominik Schürmann
aa35f6cffb Fixing build with Spongy Castle 1.51 2014-08-21 15:20:49 +02:00
Dominik Schürmann
7adff7c7df Add info about device with intent chooser bug 2014-08-21 14:41:32 +02:00
Dominik Schürmann
b7de91ad51 Disable custom intent chooser 2014-08-21 14:07:37 +02:00
Dominik Schürmann
562e379c56 Fix nullpointer when revoking keys 2014-08-21 11:40:48 +02:00
Dominik Schürmann
3c46c3c2df Add account only on jelly bean and above 2014-08-21 11:36:47 +02:00
Dominik Schürmann
0c1e65bc8b No need for setSyncAutomatically, this is only for network tickles 2014-08-21 11:33:42 +02:00
Dominik Schürmann
2930f83b2a Change account type 2014-08-21 11:19:44 +02:00
Dominik Schürmann
4c6783215f cleanup 2014-08-21 00:33:52 +02:00
Dominik Schürmann
d1ef355f55 Fix result handling in account settings 2014-08-21 00:29:49 +02:00
Vincent Breitmoser
ad9339b23d Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-21 00:02:33 +02:00
Vincent Breitmoser
63ca81d871 Copyright (C) 2014 Vincent Breitmoser 2014-08-21 00:02:27 +02:00
Dominik Schürmann
3ace5052e7 Comment extra in requestSync 2014-08-20 23:56:17 +02:00
Dominik Schürmann
6e3af6605a Sync in KeychainIntentService on delete, import, save 2014-08-20 23:55:01 +02:00
Dominik Schürmann
642a63fab6 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 23:26:09 +02:00
Dominik Schürmann
418e922c78 Enable sync adapter, changelog 2014-08-20 23:26:01 +02:00