moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-11 11:35:07 -05:00
Code Issues Releases Wiki Activity
3,260 Commits 12 Branches 24 Tags 116 MiB
0516b80c07
Commit Graph

1373 Commits

Author SHA1 Message Date
Dominik Schürmann
59096b37fd Support API versions 3 and 4 2014-08-11 17:22:53 +02:00
Dominik Schürmann
b673565035 Get original filename for decryption 2014-08-11 17:10:47 +02:00
Dominik Schürmann
549feb69ed Add option to pass original filename to PgpSignEncrypt 2014-08-11 10:00:24 +02:00
Dominik Schürmann
94b7b1b5d8 progress for signing binary 2014-08-11 09:55:24 +02:00
Dominik Schürmann
867b89be0a More fixes for decryption progress 2014-08-11 01:31:51 +02:00
Dominik Schürmann
13f86890d6 Handle missing MDC as failed only if no valid signature is present 2014-08-10 21:50:46 +02:00
Dominik Schürmann
33a4d68520 More fixes for decryption progress 2014-08-10 21:09:10 +02:00
Dominik Schürmann
c981902aba Handle missing integrity protection MDC packet as if integrity check would have failed. 
An attacker could strip the MDC on its way to the receiver...
 2014-08-10 20:59:13 +02:00
Dominik Schürmann
b0821a3ddd Introduction of metadata api, starting to fix decryption progress 2014-08-10 20:44:02 +02:00
Dominik Schürmann
1abae04cda Fix compression setting for encryption of files 2014-08-10 20:27:34 +02:00
Dominik Schürmann
65fd0de7e1 passphrase instead of pass phrase 2014-08-07 11:17:58 +02:00
Dominik Schürmann
d4105420f7 Pull from transifex 2014-08-07 10:01:57 +02:00
Dominik Schürmann
a908c7de67 Readd missing string 2014-08-07 10:01:42 +02:00
Dominik Schürmann
bac767d184 Edit key: prevent the combination of change to primary user id and revocation 2014-08-07 08:51:56 +02:00
Dominik Schürmann
881a50207a Merge branch 'master' into yubikey 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	extern/openpgp-api-lib
	settings.gradle
 2014-08-06 01:08:12 +02:00
Dominik Schürmann
6ba7536838 ModernPGP infos 2014-08-06 00:59:38 +02:00
Dominik Schürmann
8b0c389b1b Update changelog and about 2014-08-06 00:32:04 +02:00
Dominik Schürmann
e4974ac409 Use CompressionAlgorithmTags instead of homebrew constants 2014-08-05 23:50:59 +02:00
Dominik Schürmann
f4802157dd Optimize imports 2014-08-05 22:46:00 +02:00
Dominik Schürmann
6354b2dcf9 Increase maximum custom RSA size 2014-08-05 22:38:36 +02:00
Dominik Schürmann
1455af2eed Edit key: key flags 2014-08-05 22:35:37 +02:00
Dominik Schürmann
f8a222983e Use PublicKeyAlgorithmTags instead of homebrew choices constants, fix expiry selection for adding new subkeys 2014-08-05 20:52:29 +02:00
Dominik Schürmann
39380a3617 More work on add subkey dialog design 2014-08-05 18:42:55 +02:00
Dominik Schürmann
04cdd45e1a Work on add subkey dialog design 2014-08-05 18:35:48 +02:00
Dominik Schürmann
d377d1f23d Better handling of user id revocation in UI code 2014-08-05 17:59:05 +02:00
Dominik Schürmann
160e6972d8 Create key: make single user id primary user id, other cleanup 2014-08-05 17:25:22 +02:00
Dominik Schürmann
369f6e080c Refactor expiry dialog 2014-08-05 15:07:11 +02:00
Dominik Schürmann
e9fccff8bc Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-05 00:23:15 +02:00
Dominik Schürmann
80408460a0 KeychainContract: use longs instead of String, other fixes 2014-08-05 00:23:04 +02:00
mar-v-in
2712c18a7a Use size of input uris for progress bar in encrypt/decrypt 2014-08-04 20:34:00 +02:00
Dominik Schürmann
ce8d38d9b3 Add license headers 2014-08-04 16:46:23 +02:00
Dominik Schürmann
7eafd77e15 Fix nullpointer, remove unused window feature 2014-08-04 16:37:42 +02:00
Dominik Schürmann
f5f6102458 Pull from transifex 2014-08-04 16:33:05 +02:00
Dominik Schürmann
a2c1221397 Fixing lint complaints, removing unused resources 2014-08-04 16:29:16 +02:00
Dominik Schürmann
3a6ac2a16a More cleanup 2014-08-04 15:49:49 +02:00
Dominik Schürmann
e87c69647c Even more smaller nitpicks 2014-08-04 15:40:34 +02:00
Dominik Schürmann
c4311e2f52 Remove support for IO_FILE, this is no longer used and was never a good practice, use IO_URI on Android! 2014-08-04 14:44:11 +02:00
Dominik Schürmann
839294d27c Cleanup, prevent encrypt Intent inception 2014-08-04 14:42:03 +02:00
Dominik Schürmann
b42afcd32c Fix debug backup/restore methods 2014-08-04 11:19:46 +02:00
Dominik Schürmann
fb5c829ff7 Remove old edit key stuff 2014-08-04 02:31:54 +02:00
Dominik Schürmann
7f463ae0df Edit key: subkey adding, not finished 2014-08-04 02:26:34 +02:00
Dominik Schürmann
c39cf197f4 button language in encrypt 2014-08-04 00:54:57 +02:00
Dominik Schürmann
d9ffc26d64 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-04 00:49:25 +02:00
Dominik Schürmann
4979ccd645 Smaller UI fixes 2014-08-04 00:49:16 +02:00
Vincent Breitmoser
d4240f73f5 delete unused PgpConversionHelper 2014-08-04 00:39:59 +02:00
Dominik Schürmann
c2ca841ac9 Merge pull request #728 from mar-v-in/improve-file-more 
Improve file encrypt
 2014-08-04 00:21:59 +02:00
mar-v-in
d4f2d3842b Minor cleanup 2014-08-02 04:16:26 +02:00
mar-v-in
e17c1a0cd4 Fix focusing with To field 2014-08-02 00:52:34 +02:00
mar-v-in
9d101b4fe5 Encrypt UI (drop downs) 2014-08-01 23:30:31 +02:00
Dominik Schürmann
0bfac9989f Merge branch 'master' into yubikey 2014-08-01 17:54:53 +02:00
Dominik Schürmann
f72a07690c Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-01 17:54:10 +02:00
Vincent Breitmoser
80ed3464f4 small fix for MSG_MF_UID_ADD log entry 2014-08-01 17:52:27 +02:00
Dominik Schürmann
c9b028804c Add user id with dialog 2014-08-01 17:47:07 +02:00
Vincent Breitmoser
f555447011 fix dumb mistake in modifySecretKey 2014-08-01 17:46:04 +02:00
Vincent Breitmoser
827a958e12 remove debug output about security providers (cleaner unit tests) 2014-08-01 17:00:08 +02:00
Vincent Breitmoser
c0edaf9a5e make FileImportCache generic, iterable, and add unit test 2014-08-01 16:59:48 +02:00
Vincent Breitmoser
11e5261f07 move classes around a bit 2014-08-01 16:50:33 +02:00
mar-v-in
b206b6d351 Cache input file thumbnail. 2014-08-01 12:41:30 +02:00
mar-v-in
1ebb92b336 Cache contact photos to make UI more fluid 2014-08-01 12:24:26 +02:00
mar-v-in
3a13cd5e4d Fix first key is not used erroneously 2014-08-01 12:23:31 +02:00
Dominik Schürmann
e10cbc54c6 Merge branch 'master' into yubikey 
Conflicts:
	.gitmodules
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
 2014-08-01 11:09:25 +02:00
mar-v-in
0568632f32 Merge branch 'master' into improve-file-more 2014-08-01 10:32:20 +02:00
Dominik Schürmann
acbf2a1861 Remve cacheing of keyrings (cleanup of #726) 2014-08-01 09:35:38 +02:00
Dominik Schürmann
6ab19ca363 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-01 09:34:10 +02:00
Dominik Schürmann
d2f50eb60f identity instead of credentials 2014-08-01 09:34:07 +02:00
Dominik Schürmann
13a85e5702 Merge pull request #726 from mar-v-in/fix-import-from-server 
Fix import from server
 2014-08-01 09:31:17 +02:00
mar-v-in
4b2b1a25e3 Fix CachedPublicKeyring 
I had this code already in my git, but it was in between the load of other things in there, just pulled it out.
 2014-08-01 05:37:21 +02:00
mar-v-in
00f5352ddc Fixes after merge 2014-08-01 05:31:04 +02:00
mar-v-in
fc2a1f5838 Merge branch 'master' into improve-file-more 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
 2014-08-01 05:29:40 +02:00
mar-v-in
3a97c36d4a Undo import changes 2014-08-01 05:16:08 +02:00
mar-v-in
159c532ae2 Fix import from server 
Was broken since 7bbe869c88
This also keeps the ACTION_IMPORT_KEYRING action stable
 2014-08-01 05:11:24 +02:00
Dominik Schürmann
79f69f2fce Start fixing CachedPublicKeyRing 2014-08-01 00:38:36 +02:00
Dominik Schürmann
a25ca5429f Certifying instead of signing 2014-08-01 00:22:15 +02:00
Dominik Schürmann
f7cbf39555 Remove runtime check to fix passphrase service 2014-08-01 00:18:46 +02:00
Dominik Schürmann
a86b1d92f8 Use darker colors 2014-08-01 00:18:29 +02:00
Dominik Schürmann
afe56e08fe Show file tab only for import of existing keys 2014-08-01 00:10:01 +02:00
Dominik Schürmann
08ae9db4ee Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-31 23:54:11 +02:00
Dominik Schürmann
55b764eb1d Show revoked and expired for private keys 2014-07-31 23:54:02 +02:00
Dominik Schürmann
3451111edd Fix update from keyserver 2014-07-31 23:51:08 +02:00
Vincent Breitmoser
faf3868f01 lowercase all key ids from keyserver 2014-07-31 23:49:53 +02:00
Vincent Breitmoser
3d7cdf5428 move upload/update buttons from menu to buttons 2014-07-31 23:49:53 +02:00
mar-v-in
c71cdc1432 Fix string resources 2014-07-31 23:36:37 +02:00
Dominik Schürmann
3e918a70ea Remove private/secret key language from strings 2014-07-31 23:34:13 +02:00
Dominik Schürmann
97209f9d3d Fixes for upload 2014-07-31 23:31:09 +02:00
mar-v-in
36d8c9f608 Fix merge 2014-07-31 23:20:43 +02:00
mar-v-in
eae7c711a3 Merge branch 'master' into improve-file-more 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/CachedPublicKeyRing.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java
 2014-07-31 23:19:01 +02:00
Dominik Schürmann
38120ae77c Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-31 23:13:33 +02:00
Dominik Schürmann
db70fcfdbf Create key: design fixes 2014-07-31 23:13:29 +02:00
Vincent Breitmoser
caad5d1fc1 fix bug in UploadKeyActivity, minor work on uri handling 2014-07-31 23:07:20 +02:00
Vincent Breitmoser
c5ce794ef7 more fixes on canonicalization and progress 2014-07-31 22:36:25 +02:00
mar-v-in
0c7eea225b - add multi select for storage api (kitkat) 
- UI fixes
- refactoring
 2014-07-31 22:21:46 +02:00
Dominik Schürmann
50aea621ba Fix animations in create key 2014-07-31 21:51:35 +02:00
Dominik Schürmann
b9694ae9c5 Add notify layouts to some activities 2014-07-31 21:29:45 +02:00
Dominik Schürmann
38922f96a6 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-31 21:20:16 +02:00
Dominik Schürmann
138d5a1d9c Robots like coffee too... 2014-07-31 21:18:24 +02:00
Vincent Breitmoser
58c2ca6eb8 completely overengineer progress indication in {modify,create}SecretKeyRing methods 2014-07-31 20:59:50 +02:00
Dominik Schürmann
7bbe869c88 Parcelable data over 1MB can not be send through binder, parcel into a cache file, fix #592 2014-07-31 20:38:06 +02:00
Vincent Breitmoser
d48e980946 avoid nullpointerexception in EditKeyResult 2014-07-31 19:27:26 +02:00
Vincent Breitmoser
acb5a70e44 fix fromStream method, properly recognize multiple concatenated streams 2014-07-31 19:27:26 +02:00
Vincent Breitmoser
b40081c364 always return an EditKeyResult in modifyKey method 2014-07-31 19:27:25 +02:00
Dominik Schürmann
279ddf7cbe Handle result in create key 2014-07-31 19:19:11 +02:00
Dominik Schürmann
258bd3a44f Fix string 2014-07-31 19:06:30 +02:00
Dominik Schürmann
80f9c769c0 Keyserver exception translateable 2014-07-31 19:05:09 +02:00
Dominik Schürmann
b052d5e89c Smaller notes 2014-07-31 18:42:54 +02:00
Vincent Breitmoser
ecb2c2c2b1 reduce memory usage while parsing multiple keyrings from a stream 2014-07-31 18:25:46 +02:00
Dominik Schürmann
aa32c60a0a Even better Exception handling with keyserver queries 2014-07-31 18:07:11 +02:00
Dominik Schürmann
cc034a0913 Exception handling with keyserver queries 2014-07-31 17:56:47 +02:00
Vincent Breitmoser
33172d598d couple of logging fixes 2014-07-31 17:09:30 +02:00
Vincent Breitmoser
b156a057e8 rename Wrapped*Key* to Canonicalized*Key* 2014-07-31 17:09:30 +02:00
Dominik Schürmann
9475285013 Better exception handling for import of keys 2014-07-31 17:11:06 +02:00
Dominik Schürmann
1d2c93ca8a More file association hacks for AndroidManifest and key import 2014-07-31 16:15:36 +02:00
Dominik Schürmann
927b120275 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-30 17:47:25 +02:00
Dominik Schürmann
65488cbf05 Create key: work on upload 2014-07-30 17:47:17 +02:00
Vincent Breitmoser
64aac8023e couple of fixes in save*KeyRing methods 2014-07-30 16:22:55 +02:00
Dominik Schürmann
fcc535a573 Create key: repeat passphrase 2014-07-30 15:29:01 +02:00
Dominik Schürmann
052cdfa392 Create key: upload 2014-07-30 15:19:33 +02:00
Dominik Schürmann
e46d72ba27 Fix drawer in key list 2014-07-30 14:59:12 +02:00
Dominik Schürmann
70bfb5c586 return values for create key 2014-07-30 14:57:59 +02:00
Dominik Schürmann
cdee62b79d Create key: layout above buttons 2014-07-30 01:13:02 +02:00
Dominik Schürmann
9f9aa79066 Fix conflicts 2014-07-30 01:07:10 +02:00
Dominik Schürmann
43b8170a44 Merge branch 'master' of github.com:open-keychain/open-keychain 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
 2014-07-30 00:58:28 +02:00
Dominik Schürmann
6448de8f6a Create key with fragments 2014-07-30 00:50:53 +02:00
Vincent Breitmoser
4457b4a24c fix a couple remaining AppMsgs 2014-07-29 14:00:36 +02:00
Vincent Breitmoser
377d0f09fa Merge branch 'ditch-appmsg' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java
 2014-07-29 13:53:18 +02:00
Vincent Breitmoser
da131220aa watch out for nullpointers from get(Un|)HashedSubpackets 
fixes #721
 2014-07-28 17:09:56 +02:00
Dominik Schürmann
cce243299a Fix build by removing old icon reference 2014-07-28 16:26:06 +02:00
Dominik Schürmann
ed6a89f35c Use new icons in other key related activites, delete old icons 2014-07-28 16:10:36 +02:00
Dominik Schürmann
23689da56d Use verified icon for certify action 2014-07-28 12:24:40 +02:00
Dominik Schürmann
730f820c8c Set visibility at last 2014-07-28 11:17:12 +02:00
Dominik Schürmann
3d6edd1190 Use icons in key view 2014-07-28 11:11:23 +02:00
Dominik Schürmann
a3045c710e Use new status icons in key list 2014-07-28 09:34:57 +02:00
Dominik Schürmann
0c3b2a6ed4 Smaller status images, green test 2014-07-28 09:10:45 +02:00
Dominik Schürmann
b2f7e839e1 Fix resource names, add small test 2014-07-28 01:23:38 +02:00
Dominik Schürmann
61944b9e39 Add icons from ModernPGP project 2014-07-28 01:12:23 +02:00
Dominik Schürmann
6c7e3aee91 Fix background color of notify area 2014-07-27 21:45:48 +02:00
Dominik Schürmann
7e8b056574 cleanup left-overs 2014-07-27 21:44:00 +02:00
Dominik Schürmann
5974dccbea Redesigned QR Code view 2014-07-27 21:40:43 +02:00
Dominik Schürmann
0f87b81158 Load QR Code asynchronously and with a fade in animation 2014-07-27 20:58:25 +02:00
Dominik Schürmann
57d9c7a013 Open keyboard on passphrase dialog, this should now work on all Android versions... hopefully 2014-07-27 20:42:39 +02:00
Dominik Schürmann
97e8faa1dd Make PassphraseCacheService a foreground service 2014-07-27 18:56:23 +02:00
Dominik Schürmann
0403cbf11a Prettify buttons 2014-07-27 18:12:14 +02:00
Dominik Schürmann
dab540e121 Work on first time wizard design 2014-07-27 17:56:52 +02:00
Vincent Breitmoser
f4ee71e3ef introduce EditKeyResult with transient UncachedKeyRing (half-baked!) 2014-07-27 01:22:10 +02:00
Vincent Breitmoser
a8782272b3 some more work on supertoast and result parcel stuff 2014-07-27 00:46:38 +02:00
Vincent Breitmoser
8132b9ac74 Merge branch 'master' into ditch-appmsg 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivityOld.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
 2014-07-26 23:06:32 +02:00
Vincent Breitmoser
45722d7cfb canonicalize: couple of fixes 2014-07-26 22:16:33 +02:00
Vincent Breitmoser
236a502ea7 generic UncachedKeyRing fixes 2014-07-26 15:51:35 +02:00
Vincent Breitmoser
043ed600e6 Merge remote-tracking branch 'origin/master' 2014-07-26 03:59:12 +02:00
Vincent Breitmoser
7296ac4849 UncachedKeyRing.merge: copy over new secret subkeys into secret keyrings 2014-07-26 03:57:54 +02:00
Vincent Breitmoser
7fe1b00080 fixes for extractPublicKeyRing, update SpongyCastle 2014-07-26 03:56:28 +02:00
Vincent Breitmoser
ab2b90342e test and fix: adding an empty user id should fail 2014-07-26 03:47:29 +02:00
mar-v-in
1e4f0c6b00 Make DecryptFragment abstract, as it should be 2014-07-25 13:39:54 +02:00
Dominik Schürmann
5eb414a22b Program flow fixes 2014-07-25 01:34:29 +02:00
Dominik Schürmann
bf10eb91b7 Remove support for V3 signatures 2014-07-22 18:24:12 +02:00
Dominik Schürmann
e4e8bc5e07 Cleanup 2014-07-22 18:14:17 +02:00
Dominik Schürmann
99af2c33d3 Reuse signature creation timestamp for synchronous signing 2014-07-22 18:09:12 +02:00
Dominik Schürmann
afd6851e5b Fix test 2014-07-21 15:25:09 +02:00
Dominik Schürmann
2f5c73746d Merge branch 'master' into yubikey 2014-07-21 15:11:59 +02:00
Dominik Schürmann
d882572f0d NFC Yubikey: only pass through hash of message and not whole content 2014-07-21 15:10:29 +02:00
Vincent Breitmoser
f560bc9317 forgot to move test classpath out of root project 2014-07-21 03:59:28 +02:00
mar-v-in
2913a78b18 Load of rework on EncryptActivity, still some TODOs 2014-07-20 17:09:34 +02:00
Vincent Breitmoser
cd1511a4e6 canonicalize: fix for tests 2014-07-19 02:19:15 +02:00
Dominik Schürmann
a10f582513 Merge branch 'master' into yubikey 2014-07-18 09:56:39 +02:00
Dominik Schürmann
b332aacabb Merge branch 'master' of https://github.com/da-kid/open-keychain into da-kid-master 
Conflicts:
	OpenKeychain/src/test/resources/extern/OpenPGP-Haskell
 2014-07-18 09:49:20 +02:00
Daniel Albert
db002bde7c Fixed another unescaped apostrophe. 2014-07-17 21:17:39 +02:00
Daniel Albert
8a8d8c5a68 Fixed unescaped apostrophe 2014-07-17 20:53:10 +02:00
Dominik Schürmann
f2a6064e38 Fixes 2014-07-17 20:29:07 +02:00
Daniel Albert
01046fc0e7 Added description to Setting, Changed title to suggested one 2014-07-17 20:01:53 +02:00
Daniel Albert
d63534d655 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
 2014-07-16 18:49:16 +02:00
Daniel Albert
e375cde7e1 Final Commit for #662 2014-07-16 18:17:46 +02:00
Dominik Schürmann
3cce00d61e add lib dependency, update lib 2014-07-16 11:00:32 +02:00
Dominik Schürmann
82af9672fd Temporary program flow fixes 2014-07-16 10:07:50 +02:00
Dominik Schürmann
77d04a915b Simple create key 2014-07-16 10:05:00 +02:00
Dominik Schürmann
57f5a788fd Simple create key 2014-07-16 10:04:48 +02:00
Dominik Schürmann
c1c831e52b New first time screen 2014-07-16 09:49:37 +02:00
Dominik Schürmann
d3c54d5f12 Fallback if no primary user id exists 2014-07-16 00:22:45 +02:00
Vincent Breitmoser
64b87f75be move getPublicKey into abstract WrappedKeyRing (also, fix getPrimaryUserId) 2014-07-15 19:47:52 +02:00
Dominik Schürmann
848043a481 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-15 19:34:01 +02:00
Vincent Breitmoser
501d4b887a signatures: a revocation reason does NOT determine if a cert is a revocation type 2014-07-15 19:31:27 +02:00
Dominik Schürmann
503b146a14 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-15 19:22:44 +02:00
Dominik Schürmann
72237a0892 some fixes for edit 2014-07-15 19:22:40 +02:00
Vincent Breitmoser
29145e49c9 merge: different msg if nothing was merged 2014-07-15 19:17:08 +02:00
Vincent Breitmoser
858fe47d46 Merge remote-tracking branch 'origin/master' into external-test 
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-07-15 17:39:36 +02:00
Daniel Albert
c101ee0240 Merge remote-tracking branch 'upstream/master' into feature-conceal-software 2014-07-13 15:39:16 +02:00
Dominik Schürmann
0ce9c13132 Fix strings from 'keys' to 'passphrases' 2014-07-12 21:07:29 +02:00
Dominik Schürmann
af5fddab7c Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-12 21:04:57 +02:00
Dominik Schürmann
45dfb39749 more work on edit key 2014-07-12 20:39:23 +02:00
Daniel Albert
bd909375c2 Fixed misplaced bracket 2014-07-12 19:24:51 +02:00
Daniel Albert
92c66743e0 Added Preference for concealing the PgpApplication 2014-07-12 19:19:12 +02:00
Daniel Albert
066591dab1 Wello there, That's Java, not C^^ 2014-07-12 18:53:52 +02:00
Daniel Albert
079194abe5 Fixed issues discussed in #713 2014-07-12 18:12:03 +02:00
Daniel Albert
7a3fe61a1f Put text into strings.xml, for internationalization 2014-07-12 12:52:44 +02:00
Daniel Albert
2568ea4b2e Added Purging for Android < 4.1 2014-07-12 12:42:48 +02:00
Daniel Albert
cf40517eac Implemented Notification, no fallback yet 2014-07-12 12:27:19 +02:00
Daniel Albert
af90db96a5 new PassphraseCache, storing UserIDs as well 2014-07-12 10:51:12 +02:00
Vincent Breitmoser
f82093c666 modifyKey: error out on integrity check fails 2014-07-12 02:02:37 +02:00
Vincent Breitmoser
0e3327c65c createKey: better logging, handle empty user id case 2014-07-12 01:29:06 +02:00
Vincent Breitmoser
54bc874ce5 Merge remote-tracking branch 'origin/master' into external-test 
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyFragment.java
 2014-07-11 21:00:26 +02:00
Vincent Breitmoser
faa8c2baa3 travis: get rid of lint 2014-07-11 16:39:31 +02:00
Vincent Breitmoser
20b28b5207 modifyKey: proper expiry check during SubkeyAdd 2014-07-11 15:42:02 +02:00
Vincent Breitmoser
7b195ac2e3 modifyKey: make SubkeyChange operations work 2014-07-11 15:20:16 +02:00
Vincent Breitmoser
1436ab8d90 SaveKeyringParcel: follow attribute m prefix coding guideline 2014-07-11 13:51:36 +02:00
Vincent Breitmoser
bb92fe2804 test: get rid of some SaveKeyringParcel boilerplate 2014-07-11 13:49:17 +02:00
Vincent Breitmoser
26f6d58284 get rid of some inspection warnings 2014-07-11 13:45:06 +02:00
Vincent Breitmoser
4da273ac16 modifyKey: error out on nonexisting new primary user id 2014-07-11 13:35:48 +02:00
Vincent Breitmoser
d6f3b4b879 fix bug in canonicalization regarding subkey revocation 2014-07-11 03:27:44 +02:00
Vincent Breitmoser
f6e39b0a97 modifyKey: couple more fixes from tests 2014-07-11 02:51:13 +02:00
Vincent Breitmoser
e477577c55 some UncachedKeyRing fixes, primary user id mostly 2014-07-11 02:50:35 +02:00
Vincent Breitmoser
38ee6203ad modifyKey: preserve master key flags 2014-07-11 02:49:51 +02:00
Vincent Breitmoser
dce2df4113 add come createKey strings 2014-07-11 02:48:54 +02:00
Vincent Breitmoser
90f546a4e8 tests: add testSubkeyAdd 2014-07-10 01:38:57 +02:00
Vincent Breitmoser
a9c3d6b507 Merge remote-tracking branch 'artbristol/functional-testing-canonicalize-badsignature' into external-test 
Conflicts:
	OpenKeychain-Test/src/test/resources/extern/OpenPGP-Haskell
 2014-07-09 16:39:26 +02:00
Vincent Breitmoser
718acbf954 put unit tests into external module (CAVEAT) 
this requires a more up to date version of gradle-android-test-plugin
than is currently in the repositories. it must be added to the local
maven repo using ./install-custom-gradle-test-plugin.sh before
compiling.
 2014-07-09 16:03:30 +02:00
mar-v-in
5185492b04 Fix OperationResultParcel 
Naming conventions save lives... or atleast make addAll() work
 2014-07-09 00:10:09 +02:00
Dominik Schürmann
16498be4a2 Fix nullpointer in API, fix #693 2014-07-08 04:24:27 +02:00
Dominik Schürmann
61d0e12e8a cleanup 2014-07-08 03:37:32 +02:00
Dominik Schürmann
daa1f5cf8e Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-08 03:34:53 +02:00
Dominik Schürmann
5adcb7885c Work on subkeys adapter 2014-07-08 03:34:27 +02:00
Art O Cathain
78b0c5e74a actually provide a tostring 2014-07-07 21:38:49 +01:00
Art O Cathain
37433bd282 prevent odd ambiguous method toString error 2014-07-07 21:37:48 +01:00
Art O Cathain
51bedc2e73 (c) headers, tidy imports 2014-07-07 21:35:10 +01:00
Vincent Breitmoser
9971f9ad4c use KeyringTestHelper.diffKeyrings method for unit test 
Conflicts:
	OpenKeychain/src/test/java/tests/UncachedKeyringTest.java
 2014-07-07 21:12:50 +01:00
Vincent Breitmoser
83e5a3d341 add diffKeyrings method 2014-07-07 21:08:48 +01:00
Vincent Breitmoser
9320d2d8a2 use KeyringTestHelper.diffKeyrings method for unit test 2014-07-07 19:02:57 +02:00
Vincent Breitmoser
23524af81d add diffKeyrings method 2014-07-07 18:52:59 +02:00
Vincent Breitmoser
e54dd26d29 Merge remote-tracking branch 'artbristol/functional-testing-canonicalize' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
 2014-07-07 18:19:52 +02:00
Vincent Breitmoser
d8f2782293 use SuperToast instead of AppMsg in code, part 2 2014-07-07 17:35:23 +02:00
Vincent Breitmoser
2c62aa90c0 use SuperToast instead of AppMsg in code, part 1 2014-07-07 17:34:41 +02:00
Vincent Breitmoser
d044daeedd get rid of AppMsg library 2014-07-07 17:33:25 +02:00
Art O Cathain
4fbffd7bb4 Actually test canonicalize 2014-07-06 19:43:38 +01:00
Art O Cathain
e906fe5387 add the GPG version 2014-07-06 19:43:24 +01:00
Art O Cathain
c05fd07986 data fixes 2014-07-06 19:43:24 +01:00
Art O Cathain
9032e032ff add toString for test ease 2014-07-06 19:43:17 +01:00
Art O Cathain
5479eafd4b actually canonicalize 2014-07-06 19:42:51 +01:00
Art O Cathain
cb64f8865c work in progress 2014-07-06 19:42:51 +01:00
Art O Cathain
b02519ce25 add toString for test ease 2014-07-06 15:50:07 +01:00
Art O Cathain
22108cf4e2 actually canonicalize 2014-07-06 15:50:07 +01:00
Art O Cathain
80e09bd05e work in progress 2014-07-06 15:50:07 +01:00
Art O Cathain
ccb1579864 Prefer composition to inheritance is the mantra these das 2014-07-06 15:23:39 +01:00
mar-v-in
fdf6411d5f Merge branch 'master' into improve-file-more 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java
	OpenKeychain/src/main/res/layout/encrypt_content.xml
 2014-07-06 02:24:34 +02:00
mar-v-in
1b0666e9de Many changes to file ... and still incomplete 
- Multi file
- Reworked UI
 2014-07-06 02:10:35 +02:00
Dominik Schürmann
3363507be4 Bett API string 2014-07-04 09:52:25 +02:00
Dominik Schürmann
709196f774 Use strings in edit key 2014-07-03 16:49:25 +02:00
Dominik Schürmann
e006d4762c Pull from transifex 2014-07-03 16:38:22 +02:00
Dominik Schürmann
9e56e53cf1 Pull from transifex 2014-07-03 16:30:41 +02:00
Dominik Schürmann
3085f0d229 Small strings fix 2014-07-03 16:24:10 +02:00
Dominik Schürmann
1ba41e7482 Remove old edit button, rename activities 2014-07-03 16:21:16 +02:00
Dominik Schürmann
bd7b4ccf2b cleanup, debug for passphrase set 2014-07-03 15:58:03 +02:00
Dominik Schürmann
6ca9d8a268 fix no passphrase check 2014-07-03 15:54:07 +02:00
Dominik Schürmann
b9d2ae938a Cache passphrase for edit 2014-07-03 15:49:46 +02:00
Dominik Schürmann
2988ac6e7b Cache passphrase for edit 2014-07-03 15:48:46 +02:00
Dominik Schürmann
85dde66804 parcel newPassphrase 2014-07-03 15:28:45 +02:00
Dominik Schürmann
9cbf78f7ad cleanup 2014-07-03 15:24:04 +02:00
Dominik Schürmann
42cc8b687b edit key: subkey adapter 2014-07-03 15:14:06 +02:00
Dominik Schürmann
55f067b063 Work on edit 2014-07-03 15:06:05 +02:00
Dominik Schürmann
8cbdf7b1c5 smaller dropdown items 2014-07-03 08:48:33 +02:00
mar-v-in
51a4b0466b Add support for multiple input/output URIs to KeychainIntentService 2014-07-03 00:34:41 +02:00
Dominik Schürmann
3512ac7199 Remove unnecessary error logs 2014-07-02 20:53:16 +02:00
Dominik Schürmann
12db94abca A little bit less purple 2014-07-02 18:59:23 +02:00
Dominik Schürmann
d967c5d864 merge KeychainIntentService 2014-07-02 16:49:21 +02:00
Dominik Schürmann
13a13829a8 fix nullpointer, cleanup 2014-07-02 16:47:12 +02:00
Dominik Schürmann
94a58f3aa8 remove init methods from adapter 2014-07-02 16:33:30 +02:00
Vincent Breitmoser
a920f9ce0c Merge remote-tracking branch 'origin/master' 2014-07-02 16:05:58 +02:00
Vincent Breitmoser
100b5f4c5f Merge branch 'create-keyring' 2014-07-02 16:05:28 +02:00
Vincent Breitmoser
ebcd243e97 support changing primary user id in SaveKeyringParcel 
Closes #695
 2014-07-02 16:02:56 +02:00
Dominik Schürmann
3d34eb8ca4 edit key: work on saving 2014-07-02 15:42:38 +02:00
Dominik Schürmann
a66c6b5b7a Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-02 15:11:13 +02:00
Dominik Schürmann
4f83a4f163 Edit key: adding user ids 2014-07-02 15:10:50 +02:00
Vincent Breitmoser
6f558add35 use expert create key for key creation testing (revert this later on!) 2014-07-02 15:05:02 +02:00
Vincent Breitmoser
9fb92c8642 fix subkey addition 2014-07-02 15:03:28 +02:00
Vincent Breitmoser
144a10a3d0 forgot a line in previous commit 2014-07-02 14:53:25 +02:00
Vincent Breitmoser
287b74885e don't use zero plural string for english 
closes #703
 2014-07-02 14:51:11 +02:00
mar-v-in
93eae114ea Encrypt/Decrypt UI work 2014-07-02 00:34:21 +02:00
mar-v-in
3564773410 Add temporary file storage as discussed in #665 
Writable from OpenKeychain, readable worldwide. Should be used to write shared files to it by first creating the file using TemporaryStorageProvider.createFile and then write to the Uri returned.
 2014-07-01 14:50:15 +02:00
Dominik Schürmann
7408a35e19 edit key: part 3 2014-07-01 12:36:02 +02:00
mar-v-in
50e72b196f Missing import after merge 2014-07-01 01:26:50 +02:00
mar-v-in
d1d414c006 Merge branch 'master' into improve-file-more 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java
 2014-07-01 00:15:30 +02:00
Dominik Schürmann
a901004588 remove leftover of AndroidBootstrap 2014-06-30 22:05:02 +02:00
Dominik Schürmann
7c84b1fffd Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-30 22:01:25 +02:00
Dominik Schürmann
c2ba7e2420 work on edit key 2014-06-30 22:01:17 +02:00
Daniel Albert
5dcbc07af9 Fixed Bootstrap resource 2014-06-30 21:32:40 +02:00
Daniel Albert
cc095a2098 (should have) fixed Travis builds 2014-06-30 21:24:31 +02:00
Daniel Albert
f3b68a9932 Deprecated Android Bootstrap, thus fixing #597 2014-06-30 19:18:20 +02:00
Daniel Albert
158d19a945 Fixed, issue #702 2014-06-30 19:13:09 +02:00
Daniel Albert
df9af316b4 Merge branch 'master' of https://github.com/open-keychain/open-keychain 2014-06-30 19:09:56 +02:00
Daniel Albert
1e9789f5b4 Converted all other buttons 2014-06-30 19:09:13 +02:00
Vincent Breitmoser
de698b8955 add create key capabilities to SaveKeyringParcel 2014-06-29 22:34:53 +02:00
Daniel Albert
2406842847 Ported even more buttons to use new design (Key and User editor) 
Added drawables for them
 2014-06-29 22:31:37 +02:00
Daniel Albert
e8bb14ca26 Converted AsymetricKeyFragment to new button style 2014-06-29 15:28:24 +02:00
Daniel Albert
9091c22240 Added new button style and converted account_settings and the select_secret_key_layout to use it 2014-06-29 13:59:51 +02:00
Daniel Albert
4beff43a83 Updated file_dialog to use the new buttons 2014-06-29 13:21:33 +02:00
Daniel Albert
e731dc139f Improved button style 
centered buttons
removed commented-out button
 2014-06-29 12:33:02 +02:00
Daniel Albert
bd44516576 Added button_rounded style 
converted decrypt_file_fragment to new style
 2014-06-28 21:12:56 +02:00
Vincent Breitmoser
6d7a9ec48a pass import results through to viewkeyactivity on update 2014-06-28 20:54:14 +02:00
Vincent Breitmoser
3acb7fb087 fix nullpointerexception in importkeyactivity 2014-06-28 20:54:13 +02:00
Vincent Breitmoser
d6a2875816 code cleanup and plurals in import log entries 
closes #698
 2014-06-28 19:15:28 +02:00
Daniel Albert
2da5bfabd3 Merge remote-tracking branch 'upstream/master' 2014-06-28 12:30:30 +02:00
Daniel Albert
d19c97a714 Switched to the dark icons 2014-06-28 12:25:41 +02:00
Dominik Schürmann
3f3e1cdb05 Magic to find possible mails and names of device owner 2014-06-28 00:05:12 +02:00
Dominik Schürmann
1d5606a1a3 More wizardry 2014-06-27 23:01:11 +02:00
Dominik Schürmann
8bfba0826f Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-27 21:40:26 +02:00
Dominik Schürmann
9fe07478e7 Start work on a first-time wizard 2014-06-27 21:40:18 +02:00
Daniel Albert
567e5cc6a5 Added unlock icon, fixed drawer items, switched to icons from resource in drawer 2014-06-27 21:03:19 +02:00
Daniel Albert
1b90b46b00 Swapped out FontawesomeText with normal ImageView 2014-06-26 21:33:42 +02:00
Daniel Albert
607af7bcca Temporary fix for #648 2014-06-25 19:20:17 +02:00
Dominik Schürmann
150090852b Merge pull request #690 from mar-v-in/hkps-by-default 
HKPS by default
 2014-06-25 08:48:40 +02:00
mar-v-in
f97ac83a89 Move sks-keyservers.net CA into assets folder 2014-06-25 00:37:01 +02:00
Dominik Schürmann
a1bcbe72a3 new edit key: first version to add user ids 2014-06-24 22:58:28 +02:00
Dominik Schürmann
94bd2a675e Merge pull request #688 from da-kid/master 
Fix for #687
 2014-06-24 20:22:50 +02:00
Dominik Schürmann
9ce7d29a2d Merge submodules 2014-06-24 20:16:46 +02:00
Daniel Albert
02bcd391bf Fix for #687 2014-06-24 20:15:48 +02:00
Dominik Schürmann
e84aa5a69d Rename registered apps to apps 2014-06-24 13:54:24 +02:00
mar-v-in
38823b73a3 Merge branch 'master' into improve-file-more 2014-06-24 11:35:59 +02:00
mar-v-in
997faac90e Merge branch 'master' into hkps-by-default 2014-06-24 11:35:26 +02:00
mar-v-in
97de1592f0 Fix sks-keyservers.net sub pool 2014-06-24 11:27:35 +02:00
mar-v-in
04e64ac84e Update Keyservers to use hkps as needed 2014-06-24 11:26:52 +02:00
mar-v-in
f039ef81ae Use URLEncoder instead of Uri.encode 2014-06-24 01:31:06 +02:00
mar-v-in
9a7fc6d464 Rewrote hkp add to work with hkps as well. 
Also removes HttpClient dependency (deprecated for android)
 2014-06-24 00:57:04 +02:00
Vincent
c865de4002 Merge pull request #686 from mar-v-in/minidns 
Use minidns instead of dnsjava
 2014-06-23 23:16:25 +02:00
mar-v-in
e6629b53a2 Few fixes on hkps 
TODO: Fix add as well
 2014-06-23 22:46:59 +02:00
mar-v-in
3ebbaae253 Add hkps support for sks-keyservers.net 2014-06-23 22:27:58 +02:00
mar-v-in
b92a389ebc Add TlsHelper (designed to be used with sks-keyservers.net) 
We can't use the AndroidPinning library for this, because it requires the certificate to be signed using a system CA, sks-keyservers.net uses there own CA
 2014-06-23 22:26:02 +02:00
mar-v-in
2b18dc741a Switch to dnsjava 2014-06-23 22:02:18 +02:00
Dominik Schürmann
804f811998 Merge pull request #684 from da-kid/master 
Fix of #683
 2014-06-23 19:35:27 +02:00
Daniel Albert
85bf24521d Merge branch 'master' of https://github.com/da-kid/open-keychain 2014-06-23 19:24:42 +02:00
Daniel Albert
f68cf2a435 Fixed Issue #683 which caused OK to crash upon importing keys which contain percent signs. 2014-06-23 19:10:50 +02:00
Art O Cathain
13f785d0b0 borrow tests from Haskell OpenPGP 2014-06-23 17:54:27 +01:00
Art O Cathain
a5d85b367d add OpenPGP-Haskell to test collateral 2014-06-23 17:54:27 +01:00
Dominik Schürmann
bfd7c03b0a remove margin in import keys (leftover from nav drawer) 2014-06-23 18:38:26 +02:00
Dominik Schürmann
8f4e66348d Merge pull request #681 from timbray/master 
Handle empty keybase.io query, should fix #675
 2014-06-23 13:42:58 +02:00
Dominik Schürmann
e8b96d1035 Disable pre-dexing, causes exceptions on some systems 2014-06-23 13:44:25 +02:00
Tim Bray
b48f727f98 Handle empty keybase.io query, should fix #675 2014-06-22 22:37:05 -07:00
Dominik Schürmann
514a4c668b new edit key: change passphrase 2014-06-22 18:26:17 +02:00
Dominik Schürmann
b43fb63753 new edit key: diff for existing user ids 2014-06-22 18:12:04 +02:00
mar-v-in
9e7e0be82c Merge branch 'master' of github.com:mar-v-in/open-keychain into improve-file-more 2014-06-22 16:45:07 +02:00
mar-v-in
79fb23b095 Improve file more, Part 1 
- Use Uris where it makes sense, Use File class to clarify it's a file (and not whatever else a string could be)
- Show sdcard in side menu in storage API #665
- Propose filename with gpg ending when storing it using the storage API #665
- Don't show output dialog on Android 4.4 #665
- Only show filename on Android < 4.4 #665

TODO:
- File deletion for Android < 4.4
- Testing (especially with Android < 4.4)
- Batch-encryption
- UI
- Temporary content provider (see #665 discussion)
 2014-06-22 16:31:28 +02:00
Dominik Schürmann
4db0194e6a Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-22 16:03:13 +02:00
Dominik Schürmann
106e1fcf03 Rename adapter 2014-06-22 16:03:03 +02:00
Vincent Breitmoser
9f947aefe6 ditch outdated certifyKey operation 2014-06-22 14:46:14 +02:00
Vincent Breitmoser
4d091d1784 use arraylists instead of arrays in savekeyringparcel 2014-06-22 14:45:40 +02:00
Vincent Breitmoser
37cee1322b fix indentation in various key import methods 2014-06-22 14:17:08 +02:00
Vincent Breitmoser
002a391a68 Merge remote-tracking branch 'origin/master' 2014-06-22 13:42:03 +02:00
Vincent Breitmoser
22ea9c6047 fix parcel method in ParcelableKeyRing 2014-06-22 13:41:54 +02:00
Dominik Schürmann
c52828d247 add buttons in edit key 2014-06-22 13:33:50 +02:00
Vincent Breitmoser
857b15cbd5 use hashcode instead of keyid in import list (keyids may not be unique!) 2014-06-22 13:32:07 +02:00
Dominik Schürmann
9d20e68f11 Revert hint_keybase_search 2014-06-22 10:59:50 +02:00
Dominik Schürmann
4cc127e460 Merge pull request #672 from artbristol/functional-testing 
VERY basic test for save keyring
 2014-06-21 21:31:25 +02:00
Dominik Schürmann
0c3a478a43 Cleanup pull keybase code 2014-06-21 21:31:00 +02:00
Dominik Schürmann
4ae5c56b73 Merge pull request #668 from timbray/master 
Moved Keybase stuff into KeybaseLib submodule
 2014-06-21 21:25:03 +02:00
Dominik Schürmann
18430bef17 Start new designed activity 2014-06-21 20:25:51 +02:00
Art O Cathain
0af2b27cb3 VERY basic test for save keyring 2014-06-21 17:44:04 +01:00
Dominik Schürmann
a1525bffe2 Fix qr code finally 2014-06-20 23:01:35 +02:00
Vincent Breitmoser
0d644e37b1 import: forward motion events to activity regardless 2014-06-20 22:30:54 +02:00
Dominik Schürmann
0a790c7aa2 Work on Qr code import 2014-06-20 22:28:08 +02:00
Tim Bray
17f43ad21b Moved Keybase stuff into KeybaseLib submodule 2014-06-20 09:31:34 -07:00
Dominik Schürmann
6b7aa2767a Fix keybase import 2014-06-20 15:58:32 +02:00
Dominik Schürmann
f0b8261ad3 Use actionbar button for log activity 2014-06-20 15:49:54 +02:00
Dominik Schürmann
717d66961b Fix onTouchEvent delegation, with workaround for Android bug 2014-06-20 15:39:27 +02:00
Dominik Schürmann
4aec28c237 Fix update from keyserver flow 2014-06-20 15:14:34 +02:00
Vincent
f47bb1e8e2 Merge pull request #658 from artbristol/functional-testing 
Start on Robolectric integration test
 2014-06-20 00:44:31 +02:00
mar-v-in
58706425d6 Merge branch 'master' of https://github.com/open-keychain/open-keychain into improve-file 2014-06-19 13:57:35 +02:00
Dominik Schürmann
48c96184dc Fix app name in PGP header, closing #663 2014-06-19 11:56:36 +02:00
Art O Cathain
b1815ef24a revert to previous min version 2014-06-19 07:52:37 +01:00
Dominik Schürmann
3d8e6b303c Fixing fingerprint search, part 1 2014-06-19 01:26:21 +02:00
Dominik Schürmann
47edcacf61 Remove unused code to import splitted qr codes 2014-06-19 00:54:52 +02:00
Dominik Schürmann
f0487b0ca7 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-19 00:38:47 +02:00
Dominik Schürmann
7fc188dbd6 New callback model for ImportKeysActivity 2014-06-19 00:38:36 +02:00
Vincent Breitmoser
b40b429bc0 remove obsolete subkey binding check from signature verification 2014-06-19 00:14:28 +02:00
Dominik Schürmann
0db425b289 Reference ic_launcher instead of icon 2014-06-18 23:19:54 +02:00
Dominik Schürmann
bce874db09 decrease size of search icons in import 2014-06-18 23:06:58 +02:00
Vincent Breitmoser
5c6139f57a forward touch events to pager in import activity 2014-06-18 22:57:56 +02:00
Dominik Schürmann
a246dc9675 Fix new actionbar icon sizes, rename icon to ic_launcher following Android naming conventions 2014-06-18 22:30:54 +02:00
Dominik Schürmann
37a81af748 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-18 22:02:07 +02:00
Dominik Schürmann
d9ccef4899 consistent button design in import activity 2014-06-18 22:01:58 +02:00
Vincent Breitmoser
ada6a12174 fix key export 2014-06-18 21:54:59 +02:00
mar-v-in
d9c937bbe7 Merge branch 'master' into improve-file 2014-06-18 21:43:54 +02:00
Vincent Breitmoser
4ad15739e2 canonicalize: missed two logging entries 2014-06-18 21:43:41 +02:00
Vincent Breitmoser
825f37eee4 Merge remote-tracking branch 'origin/master' 2014-06-18 21:14:39 +02:00
Vincent Breitmoser
5f20b8de1a Merge branch 'new-edit' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/res/values/strings.xml
 2014-06-18 21:09:04 +02:00
Dominik Schürmann
8ffc959f07 Merge pull request #661 from mar-v-in/improve-contacts 
Improve contact sync
 2014-06-18 20:56:38 +02:00
Vincent Breitmoser
3bffe4da55 generate public keyring from secret if not available 2014-06-18 20:55:44 +02:00
Vincent Breitmoser
f8d895dea4 consolidate: almost sane logging 2014-06-18 20:27:59 +02:00
Vincent Breitmoser
134f8471c0 consolidate: add key import routines with consolidation 2014-06-18 19:39:16 +02:00
mar-v-in
a1c3c41073 Reset importDone at the beginning of sync 2014-06-18 17:06:46 +02:00
mar-v-in
b9d88de286 Wait for import to be done before writing contacts 2014-06-18 17:01:36 +02:00
mar-v-in
4bbaf6faa1 Remove abandoned contacts 2014-06-18 16:47:33 +02:00
mar-v-in
39a68c30f8 Code style 2014-06-18 16:14:12 +02:00
mar-v-in
0bcf7a39bf Continue contact db sync 
- Only add keyrings to contact db that are not expired nor revoked
- Merge all user ids of a key into one contact (#659)
- Update contacts: Changes in keyrings (user id add, user id revoke, change of primary id) will be updated into contact db

TODO:
- delete contact once keyring is removed from OK
- sync: wait for key downloads to complete before changing contact db
 2014-06-18 16:14:11 +02:00
Vincent Breitmoser
f80228a08d consolidate: make it work 2014-06-18 14:02:21 +02:00
Vincent Breitmoser
1e45e5cd9a code cleanup in ProviderHelper and UncachedKeyRing 2014-06-18 10:00:21 +02:00
Vincent Breitmoser
d8b0015d25 consolidate: add logging 2014-06-18 00:30:45 +02:00
Vincent Breitmoser
b4974d922e consolidate: first draft 2014-06-18 00:30:45 +02:00
Vincent Breitmoser
adf15d4d16 import-log: don't count self certs as unknown 2014-06-18 00:25:52 +02:00
Vincent Breitmoser
c63f3c8a5d prepare ProviderHelper for consolidation before insert 2014-06-18 00:21:11 +02:00
Dominik Schürmann
4d34361590 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-18 00:03:19 +02:00
Dominik Schürmann
8c7a360d6e Redesign Import, still some todos and regression bugs 2014-06-18 00:03:06 +02:00
Vincent Breitmoser
0013199b2d handle database error on secret key insert 2014-06-17 23:46:02 +02:00
Vincent Breitmoser
6e4d0dede1 canonicalize: support secret keys 2014-06-17 23:25:45 +02:00
Vincent Breitmoser
4bff50bffc new-edit: add logging to modifySecretKeyRing operation 2014-06-17 21:23:24 +02:00
Vincent Breitmoser
5c47143d64 new-edit: add new save keyring stuff 2014-06-17 20:11:54 +02:00
Vincent Breitmoser
a0f546739d new-edit: remove old save keyring stuff 2014-06-17 20:03:58 +02:00
Vincent Breitmoser
02fbaaf858 import-log: clean up progress messages 2014-06-17 12:18:41 +02:00
Vincent Breitmoser
9058291c05 canonicalize: fix NullPointerException 2014-06-17 11:57:14 +02:00
Vincent Breitmoser
ffea551afc drop invalid user ids and add fatal case(s) 2014-06-16 22:32:17 +02:00
Vincent Breitmoser
2f0e70587d add more progress info from import routine 2014-06-16 22:00:57 +02:00
Vincent Breitmoser
109bea7542 import-log: distinguish master/subkeys, distinguish redundant/bad certs, more docs 2014-06-16 22:00:57 +02:00
Art O Cathain
7ea57b7c89 Fix hard-coded size 2014-06-16 19:12:26 +01:00
Art O Cathain
d06ba72edc Start on Robolectric integration test 2014-06-16 18:58:41 +01:00
Daniel Haß
da28c000ad Changed license header 2014-06-16 13:19:34 +02:00
Daniel Haß
5bd0b5011e Moved Notify class to utils 2014-06-16 13:13:43 +02:00
Daniel Haß
eeff0c7150 Removed unused import 2014-06-16 13:06:42 +02:00
Daniel Haß
76d733cbc7 Added notification area to decrypt content 2014-06-16 12:38:19 +02:00
Daniel Haß
e48d5e4474 Replaced AppMsg with notify wrapper call 2014-06-16 12:37:51 +02:00
Daniel Haß
998f616607 Added notification area as reusable layout 2014-06-16 12:37:37 +02:00
Daniel Haß
41545e5e52 Added notification wrapper for toast like notifys 2014-06-16 12:37:22 +02:00
Art O Cathain
63861fa60b Later version of Junit prevents 'Multiple dex files define Lorg/hamcrest/Description' error 2014-06-14 13:16:39 +01:00
Vincent Breitmoser
ca4774fd62 Merge remote-tracking branch 'origin/master' into canonicalize 
Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/AndroidManifest.xml
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
	OpenKeychain/src/main/res/values/strings.xml
	settings.gradle
 2014-06-13 00:27:40 +02:00
Vincent Breitmoser
073433fa74 canonicalize: require primary key binding certificates for signing subkeys 2014-06-12 23:10:44 +02:00
Vincent Breitmoser
79131be5f0 canonicalize: simplify import with info from canonicalization 2014-06-12 22:27:32 +02:00
Vincent Breitmoser
0594d9156e canonicalize: filter out future and local certificates 2014-06-12 21:57:03 +02:00
Vincent Breitmoser
9dd40b7238 import-log: more minor improvements 2014-06-12 21:12:21 +02:00
Vincent Breitmoser
59701250ba import: use wrapped keyring instead of uncached keyring for trust 2014-06-12 18:11:31 +02:00
Vincent Breitmoser
e4a7d4f6e5 import-log: minor improvements 2014-06-12 18:10:48 +02:00
Vincent Breitmoser
dae503284f canonicalize: more stuff 2014-06-12 17:38:48 +02:00
Vincent Breitmoser
466eddb005 canonicalize: implementation, first draft 2014-06-12 15:47:21 +02:00
Vincent Breitmoser
dea98a4a7e import-log: properly distinguish return states 2014-06-12 12:36:58 +02:00
Vincent Breitmoser
47368f1d24 import-log: better way to check self trust, and fix log level filtering 2014-06-12 01:37:49 +02:00
Vincent Breitmoser
8d75d3e00e import-log: use holder pattern in log fragment 2014-06-11 00:37:23 +02:00
mar-v-in
e106079b90 Delete using Document API (unsafe) 2014-06-10 21:53:02 +02:00
mar-v-in
f55bc41682 Use Document API on KitKat for file encrypt/decrypt 2014-06-10 20:57:48 +02:00
Vincent Breitmoser
3895c10a58 import-log: work on log fragment ui 2014-06-10 20:06:28 +02:00
Vincent Breitmoser
f38556cab1 import-log: switch to flags instead of statuses for result int 2014-06-10 16:24:04 +02:00
Vincent Breitmoser
e41e6ea0de import-log: more interface work 2014-06-10 15:27:26 +02:00
Vincent Breitmoser
eac582a313 import-log: some cosmetics 2014-06-10 13:52:05 +02:00
Vincent Breitmoser
7324bfcb53 import-log: add LogDisplay activity 2014-06-10 01:53:25 +02:00
Vincent Breitmoser
d73a3e2fa8 import-log: use supertoast in ImportKeyActivity 2014-06-10 01:52:38 +02:00
Vincent Breitmoser
cdc61c4392 canonicalize: first step(s) 2014-06-10 01:51:16 +02:00
Vincent Breitmoser
067ffa876d import-log: add OperationResults, use it in ImportKeys operation 2014-06-10 01:31:28 +02:00
Vincent Breitmoser
97c679ada3 import-log: add SuperToast external library 2014-06-10 01:24:58 +02:00
Dominik Schürmann
cb3c2b2008 Disable robolectric, update to android gradle 0.11.1, update gradle to 1.12 2014-06-09 22:09:30 +02:00
Dominik Schürmann
d530a7b0ee Update buildTools to 19.1 2014-06-09 21:52:17 +02:00
mar-v-in
08d63340c9 Modify KeychainIntentService to support I/O with URIs, allow input and output to/from different types (eg. encrypt file and return byte array) 2014-06-08 21:30:11 +02:00
Dominik Schürmann
90f9646f25 Merge pull request #650 from open-keychain/v/import-log 
Parcelable operation result with logging capabilities + import logging
 2014-06-06 23:07:06 +02:00
Dominik Schürmann
a0f43febbb Merge pull request #649 from mar-v-in/automatic-contact-discovery 
Automatic contact discovery and more
 2014-06-06 22:57:51 +02:00
Dominik Schürmann
d2430fe0e3 Move SlidingTabLayout and SlidingTabStrip into appropriate subpackage 2014-06-06 22:47:28 +02:00
Dominik Schürmann
341247d446 Hide subkeys, certs tabs in key view, checkable menu item to show/hide them 2014-06-06 22:46:39 +02:00
mar-v-in
5601f1b76f Fix TAG in account service as well 2014-06-06 17:42:28 +02:00
mar-v-in
55ca0841f6 Fixing TAG and string resource 2014-06-06 17:39:11 +02:00
Vincent Breitmoser
c36b311d5f import-log: better stripped key logging 2014-06-06 17:29:39 +02:00
Vincent Breitmoser
118225d7d2 import-log: add output to logcat (for debugging) 2014-06-06 17:28:36 +02:00
Vincent Breitmoser
e083ccc370 import-log: add import log string resources 2014-06-06 16:15:45 +02:00
Vincent Breitmoser
787f6edf32 import-log: add log statements in import routine 2014-06-06 16:15:27 +02:00
Vincent Breitmoser
b995b836a3 import-log: improve operationresultparcel, add indentation 2014-06-06 16:14:15 +02:00
mar-v-in
9d02bc85e2 Fix compile error introduced during merge 2014-06-06 00:51:24 +02:00
mar-v-in
e2164f571e Merge branch 'master' into automatic-contact-discovery 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-06-05 23:56:29 +02:00
mar-v-in
36312b950a Add dnsjava as submodule 2014-06-05 23:46:14 +02:00
mar-v-in
80e9998640 Show keys with android contacts 
This means to sync userid + keyid into contact storage. Android will merge them to normal contacts based on primary userid.
 2014-06-05 23:22:21 +02:00
Tim Bray
5466adee41 Clean up keyimport.ImportKeysListEntry 2014-06-05 11:58:18 -07:00
Dominik Schürmann
fc3a692002 Merge pull request #645 from timbray/master 
Don't show full fingerprint in key search result lists
 2014-06-05 18:16:29 +02:00
Tim Bray
7811970218 Don't show full fingerprint in key search results 2014-06-05 08:51:55 -07:00
Vincent Breitmoser
c84a1ecfff import-log: add parcelable prototype 2014-06-05 14:17:49 +02:00
mar-v-in
dc1e26f39c Make keylist case insensitive 
You want "michael" to be next to "Michael", don't you?
 2014-06-05 00:59:39 +02:00
Vincent Breitmoser
5ab0d76c69 ui: do show Certify identities button even for secret keys 
Closes #636
 2014-06-04 21:38:30 +02:00
Vincent Breitmoser
36bc0ae676 fix bug with bad verifying master keys 2014-06-04 21:35:36 +02:00
Vincent Breitmoser
2946d442e5 do respect expectedFingerprint during key import 2014-06-04 21:35:03 +02:00
mar-v-in
cae0071342 Merge branch 'master' into automatic-contact-discovery 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-06-04 21:32:37 +02:00
Vincent Breitmoser
cc1e4dce0a neatness refactoring 2014-06-04 20:27:25 +02:00
mar-v-in
6a63746278 Fix regex for hkp parsing to support multiple uids 2014-06-04 18:07:28 +02:00
mar-v-in
dd959876f4 First version of automatic contact discovery. 
TODO:
- Configuration (much of it)
- Enabled by default?
- Which keys to import? Current state: All non-revoked and non-expired with matching userid
- Search for keys if already known? Current state: yes, may cause traffic (configuration: only when wifi?)
- Update interval: Currently Android handles it, might be good (causes automatic refresh on new contact and stuff like that) or bad (too many of refreshes)
 2014-06-04 18:05:16 +02:00
mar-v-in
cc2ef0c17c Store expired state within ImportKeysListEntry 2014-06-04 18:05:16 +02:00
Tim Bray
54b7b0e522 fixed error message 2014-06-04 08:04:26 -07:00
Dominik Schürmann
52f1f30846 Use fixed gradle versions 2014-06-04 10:22:05 +02:00
Dominik Schürmann
6cb791d567 Use fixed gradle versions 2014-06-04 10:21:28 +02:00
Vincent Breitmoser
4a47126f05 Merge remote-tracking branch 'origin/master' into edit-key-rewrite 2014-06-02 18:49:24 +02:00
Vincent Breitmoser
58edc0af67 wrapped-key-ring: add documentation 2014-06-02 13:49:11 +02:00
Vincent Breitmoser
d891f75339 make everything work again 2014-06-02 13:47:48 +02:00
Vincent Breitmoser
e27048fe73 wrapped-key-ring: move key data around in ParcelableKeyRing instead of ImportKeysListEntry 2014-06-02 13:47:48 +02:00
Vincent Breitmoser
ed8b62c32b wrapped-key-ring: no UncachedSecretKeyRing after all 2014-06-02 13:47:48 +02:00
Dominik Schürmann
39997a802e Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-31 20:54:30 +02:00
Dominik Schürmann
6d1369be56 Pull from transifex 2014-05-31 20:49:56 +02:00
mar-v-in
34b97cb136 Merge ACTION_DOWNLOAD_AND_IMPORT_KEYS and ACTION_IMPORT_KEYBASE_KEYS 2014-05-29 11:43:41 +02:00
mar-v-in
d4cdc36448 Merge branch 'hkps-support' into automatic-contact-discovery 2014-05-29 11:33:53 +02:00
mar-v-in
3417a7a2de Store nice origin with keybase keys (that can't be interpreted as HKP server) 2014-05-29 10:34:50 +02:00
mar-v-in
518f3e1763 Make abstract methods in Keyserver public (implementations make them public anyway) 2014-05-29 10:33:15 +02:00
mar-v-in
be490307f9 Download from origin during ACTION_DOWNLOAD_AND_IMPORT_KEYS 2014-05-29 10:24:00 +02:00
mar-v-in
c676e53479 Fix url building to support certificate check on hkps servers 
Note: the CA used by sks-keyservers.net is not valid for android, thus using hkps fails for them. pgp.mit.edu uses a perfectly valid cert.
 2014-05-28 20:44:01 +02:00
mar-v-in
cb92c9ccc8 Add hkps support 2014-05-27 21:16:52 +02:00
mar-v-in
8e5767f967 Store origin with ImportKeysListEntry 2014-05-27 20:17:49 +02:00
mar-v-in
3110122a85 Add ability to resolve HkpKeyserver from _hkp._tcp SRV record 2014-05-27 19:45:58 +02:00
Vincent Breitmoser
a53da491c0 new savekeyring operation (mostly stub) 2014-05-27 13:56:30 +02:00
Vincent Breitmoser
6415290b2d introduce new SaveKeyringParcel 2014-05-27 13:56:28 +02:00
Vincent Breitmoser
ce1c3d1a1e rename SaveKeyringParcel to OldSaveKeyringParcel 2014-05-27 13:53:01 +02:00
Vincent Breitmoser
e7fa124108 update unit test support in build files 2014-05-27 13:52:58 +02:00
Vincent Breitmoser
4a6aaf1e83 fix missing userIds in ImportKeysListEntry 2014-05-27 13:49:39 +02:00
mar-v-in
7865b92285 ContactHelper can read email addresses from contact list 2014-05-26 20:24:13 +02:00
Tim Bray
58da3d12b0 Finished cleaning up rebase conflicts post Keyserver exception refactor 2014-05-23 09:42:32 -07:00
Tim Bray
1ff3962acc Add Log.d for QueryFailedException 2014-05-23 09:34:37 -07:00
Tim Bray
dfd5aa65a5 Add Log.d for QueryFailedException 2014-05-23 09:33:34 -07:00
Vincent Breitmoser
97af8b2a01 wrapped-key-ring: forgot a part in PgpDecryptVerify 2014-05-23 17:04:15 +02:00
Vincent Breitmoser
c107fc668f introduce WrappedSignature for the ViewCert* ui code 2014-05-23 16:48:41 +02:00
Vincent Breitmoser
91a8a6c2d1 wrapped-key-ring: use UncachedKeyRing in ImportKeysListLoader 2014-05-23 16:48:03 +02:00
Vincent Breitmoser
10ad7be46b wrapped-key-ring: UncachedKeyRing wraps only one ring of dynamic type 2014-05-23 16:44:50 +02:00
Vincent Breitmoser
cd0aba9d43 wrapped-key-ring: encapsulate key flags 2014-05-22 13:05:02 +02:00
Vincent Breitmoser
952bb99a24 Merge remote-tracking branch 'origin/master' into wrapped-key-ring 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-05-21 23:06:51 +02:00
Vincent Breitmoser
6d7daec37f wrapped-key-ring: use CachedKeyRing where possible 2014-05-21 21:41:51 +02:00
Vincent Breitmoser
ab6c47a9b3 use long rather than String to build uris by key 2014-05-21 21:26:35 +02:00
Vincent Breitmoser
761d87b661 wrapped-key-ring: split up CachedKeyRing and WrappedKeyRing 2014-05-21 21:07:32 +02:00
Dominik Schürmann
8a2ffd8f90 Layout fixes for key import 2014-05-19 00:10:34 +02:00
Dominik Schürmann
8e846dc132 Add license header to FixedDrawerLayout 2014-05-18 23:23:58 +02:00
Dominik Schürmann
6e9acafc6d Merge highlight keyserver pull request 2014-05-18 23:19:22 +02:00
Dominik Schürmann
19072824ba Rename KeyServer to Keyserver 2014-05-18 23:06:50 +02:00
Thialfihar
1386282840 Rename mCurQuery to mQuery for consistency 2014-05-16 11:38:43 +02:00
Thialfihar
84b754341d Use Highlighter instead of HighlightQueryCursorAdapter 2014-05-16 11:38:43 +02:00
Thialfihar
69ce66be94 Add highlighting to keyserver/keybase search 2014-05-16 11:38:43 +02:00
Thialfihar
ab81d8903a Support mutliple search words and highlight them 
For the regex matching it would be smart to sort the words by length,
so the longest matches come first. This only matters for queries with
words containing parts of each other, which is an unlikely event and
even then it doesn't break anything.
 2014-05-16 11:38:12 +02:00
Tim Bray
148a522694 keybase cleanups for revised search output format 2014-05-15 17:14:45 -07:00
Tim Bray
9b71791679 keybase now has key info in search output 2014-05-15 16:19:10 -07:00
Tim Bray
d9df048194 JWalk javadocs 2014-05-14 14:39:24 -07:00
Dominik Schürmann
bbf19248ef Merge pull request #627 from thi/improve-keybase.io-support 
Improve keybase.io support
 2014-05-14 20:19:44 +02:00
Dominik Schürmann
fd12f89ccb Clarify help start 2014-05-14 18:01:40 +02:00
Thialfihar
b8462de6e5 Rename fingerPrint to fingerprint 2014-05-14 17:22:53 +02:00
Thialfihar
73acb69208 Add github, twitter, website info for keybase keys 
The very point of keybase.io is the identification and proven link
to those identities, so it should be nice to have them.
The display is a bit basic still, as it just adds them as userIds,
I'm sure this can be prettified, perhaps with logos?
 2014-05-14 17:21:27 +02:00
Thialfihar
2480844884 Cleanup keybase query a bit 
Remove ctime and the cached key, making the query for the entire user
object unnecessary. This should only be done when the user decides to
import the key. Hopefully keybase.io can provide all info necessary in
the search results.
 2014-05-14 17:21:27 +02:00
Vincent Breitmoser
2f95100d88 Merge remote-tracking branch 'origin/master' into wrapped-key-ring 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
	OpenKeychain/src/main/res/values/strings.xml
 2014-05-14 16:02:28 +02:00
Thialfihar
056a6dd347 Don't guess keybase key algorithm and size 
Once keybase reports them, we can display them. Until then we simply
don't know and shouldn't lie about it.
 2014-05-14 14:28:54 +02:00
Thialfihar
6162247155 Add extraData property in ImportKeyListEntry 
This allows any KeyServer to store some extra data it might need.
In the case of KeybaseKeyServer it is the username, which then can
be grabbed directly, without the hack of storing it as userId.
 2014-05-14 14:28:41 +02:00
Thialfihar
d50e798c13 List full keybase id or strong key id matches on top 2014-05-14 14:28:26 +02:00
Thialfihar
f4a8e71c33 Make keybase lookup works for key ids starting with 0x 2014-05-14 14:28:13 +02:00
Dominik Schürmann
05a3163f17 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-13 18:52:57 +02:00
Dominik Schürmann
be46eabdb5 Add pgpauth app to help, update html-textview 2014-05-13 18:52:48 +02:00
Daniel Haß
4ed8e45703 Removed unused Toast import 2014-05-11 22:20:44 +02:00
Daniel Haß
010dcf1887 Toast replacement 2014-05-11 22:15:45 +02:00
Daniel Haß
c0b48a616e Fixed wrong AppMsg-Style 2014-05-11 20:28:16 +02:00
Dominik Schürmann
2aa3eb2bb5 Add Tim Bray to about 2014-05-09 11:38:40 +02:00
Dominik Schürmann
1daddfbaab Version 2.7 2014-05-08 19:40:13 +02:00
Dominik Schürmann
37ad355d20 Translations from transifex 2014-05-08 19:39:44 +02:00
Dominik Schürmann
badfa9f7bc Changelog 2.7 2014-05-08 19:32:07 +02:00
Dominik Schürmann
c2b75e3d2e Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-08 18:44:58 +02:00
Dominik Schürmann
af4f32e2d7 Translations from transifex 2014-05-08 18:44:54 +02:00
Vincent Breitmoser
4ba06e7735 ui: purplize dialog headers (huge hack inside) 2014-05-08 18:12:55 +02:00
Vincent Breitmoser
cbc3988628 proper null checks and closing of cursors everywhere 2014-05-08 15:57:38 +02:00
Vincent Breitmoser
79117b1ef8 use longsparsearrays instead of hashmaps in that one place 2014-05-08 15:57:38 +02:00
Dominik Schürmann
956b9a12bb Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-08 15:47:06 +02:00
Dominik Schürmann
33cad382f9 Use flat buttons where appropriate 2014-05-08 15:46:57 +02:00
Vincent Breitmoser
9c5c013538 use setEncryptToSigner for asymmetric encryption 
(tested and works, closes #569)
 2014-05-08 15:31:03 +02:00
Vincent Breitmoser
185c4eed43 use LoaderFragment in ViewKey tabs 
Closes #616
 2014-05-08 13:58:52 +02:00
Vincent Breitmoser
596478a212 extract generic LoaderFragment superclass from KeyList 2014-05-08 13:43:59 +02:00
Dominik Schürmann
5c747a747f Update from transifex 2014-05-08 11:30:16 +02:00
Vincent Breitmoser
346b5dbb28 Don't allow certification using keys where primary subkey is stripped 
Closes #596
 2014-05-07 22:43:14 +02:00
Dominik Schürmann
b4a9d1a2db Add applications section to help 2014-05-07 18:31:31 +02:00
Dominik Schürmann
ab1b2df2d6 Move API libs and API example into their own git repos 2014-05-07 16:51:06 +02:00
Dominik Schürmann
377edfb310 Remove code for sharing whole key via qr code 2014-05-07 15:40:19 +02:00
Dominik Schürmann
b771276611 Start app menu item for registered apps 2014-05-07 15:03:24 +02:00
Dominik Schürmann
2a33eae9eb GET_KEY: also return PendingIntent to key view 2014-05-07 14:53:35 +02:00
Dominik Schürmann
e14ce09186 Better handling of actionbars back 2014-05-07 14:33:20 +02:00
Dominik Schürmann
f4cbd8cabb Design fixes for certification activity 2014-05-07 14:17:18 +02:00
Dominik Schürmann
7c2dc276c1 Alignment in certify activity 2014-05-07 13:48:19 +02:00
Dominik Schürmann
10db9dd09a Change drawer nav icon back to gray 2014-05-07 11:15:40 +02:00
Dominik Schürmann
61fc8d0eee Translations from transifex 2014-05-07 11:01:33 +02:00
Dominik Schürmann
fb0f3c4778 Use paste icon, clarify language once again 2014-05-07 10:59:16 +02:00
Dominik Schürmann
2481b6e660 Pull translations from transifex 2014-05-07 09:31:01 +02:00
Dominik Schürmann
0155335a59 Clarify language 2014-05-07 09:29:02 +02:00
Dominik Schürmann
b405c1d664 Pull translations from transifex 2014-05-07 09:13:32 +02:00
Dominik Schürmann
a36f7f80e2 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-05-07 09:05:38 +02:00
Dominik Schürmann
dc382a2ddd Clarify language 2014-05-07 09:05:28 +02:00
Vincent Breitmoser
174858e9cf ui: apply theme to tab buttons 2014-05-07 03:55:06 +02:00
Vincent Breitmoser
12f1162a1e ui: use SlidingTabLayout in help activity 2014-05-07 03:48:03 +02:00
Vincent Breitmoser
40793935ac ui: primary certification icon was a pixel or two off 2014-05-07 03:19:09 +02:00
Vincent Breitmoser
992d37819c small fix for 6aafb3, forgot to commit this line 2014-05-07 03:18:41 +02:00
Vincent Breitmoser
65274f6c16 ui: purplize searchtext in keylist 2014-05-07 03:07:24 +02:00
Vincent Breitmoser
873b1be75d display AppMsg warning when no encryption subkey is available 2014-05-07 02:27:51 +02:00
Vincent Breitmoser
0bb11be749 ui: slight edit icon cosmetics in keylist 2014-05-07 02:15:09 +02:00
Vincent Breitmoser
6aafb31412 ui: move revocation/expiry notes above tab slider 2014-05-07 02:14:47 +02:00
Vincent Breitmoser
96125b1976 ui: purplize edge overscroll glow effect 2014-05-07 01:39:28 +02:00
Vincent Breitmoser
6a9cb69a1f ui: purpelize fastscroll thumb 2014-05-07 01:13:08 +02:00
Dominik Schürmann
e97cdbd9ad Clarify language 2014-05-06 23:16:08 +02:00
Dominik Schürmann
8eb74d171b Some small style fixes 2014-05-06 23:11:10 +02:00
Dominik Schürmann
1c2919f07f edit button with image 2014-05-06 22:52:50 +02:00
Dominik Schürmann
274326f780 Always use section style instead of custom class 2014-05-06 22:48:47 +02:00
Dominik Schürmann
ad791fd8f8 Move logic classes for import into own sub-package 2014-05-06 22:29:57 +02:00
Vincent Breitmoser
797aeaf6e8 ui: apply purple theme (twi is best color) 2014-05-06 19:18:32 +02:00
Vincent Breitmoser
e0985878d7 ui: use textview buttons in decrypt verify dialogue 2014-05-06 19:18:32 +02:00
Vincent Breitmoser
0d05ff98cb ui: use textviews instead of bootstrap buttons in SignEncrypt 2014-05-06 19:18:32 +02:00
Vincent Breitmoser
d52d455317 ui: make primary star icon slightly larger 2014-05-06 19:18:31 +02:00
Dominik Schürmann
f91457e07f Touch view only once 2014-05-06 15:04:09 +02:00
Vincent Breitmoser
8564c4aca1 ui: use primary icon color for certification status 2014-05-06 00:39:09 +02:00
Vincent Breitmoser
d31ae89824 ui: show revocation and expiry status on info tab 2014-05-06 00:04:37 +02:00
Vincent Breitmoser
162cb1cb7b ui: subkey view redesign 2014-05-05 22:06:09 +02:00
Vincent Breitmoser
0fe0823372 ui: remove primary subkey info 2014-05-05 22:04:57 +02:00
Dominik Schürmann
04f8b2716a Merge pull request #609 from Vadiml1024/master 
Avoid displaying double 0x before keyid in ViewCertActivity
 2014-05-05 11:15:16 +02:00
Dominik Schürmann
158c2466bf Fix license header 2014-05-05 10:13:44 +02:00
Dominik Schürmann
6d10ca678a Merge pull request #603 from timbray/master 
Adds first level of keybase support
 2014-05-05 10:10:47 +02:00
Tim Bray
90b4db0792 Per pull-request comments. 2014-05-04 17:16:58 -07:00
Dominik Schürmann
e48460bb7d Update from transifex 2014-05-05 01:20:51 +02:00
Dominik Schürmann
acfe01e0e2 Update from transifex 2014-05-05 01:20:42 +02:00
Dominik Schürmann
6055b0b0da New key view design, using Android flat buttons and Android icons 2014-05-05 00:58:22 +02:00
Vincent Breitmoser
90ac60b6db wrapped-key-ring: remove more unneeded methods 2014-05-04 17:44:10 +02:00
Vincent Breitmoser
9baddb7d71 wrapped-key-ring: get rid of bc objects in key editor 2014-05-04 17:07:13 +02:00
Vincent Breitmoser
cd8af25ba7 wrapped-key-ring: more work on passphrase caching and certification 2014-05-04 16:59:20 +02:00
Vincent Breitmoser
8cf0638f54 wrapped-key-ring: introduce Uncached*Key objects 2014-05-04 16:56:44 +02:00
Vincent Breitmoser
411b4cfeb2 wrapped-key-ring: redesign underlying CachedKeyRing 2014-05-04 13:22:35 +02:00
Vincent Breitmoser
d0e3af505c wrapped-key-ring: cached data revamp 2014-05-04 13:22:27 +02:00
Vincent Breitmoser
d68fce6875 wrapped-key-ring: view certify 2014-05-04 13:22:19 +02:00
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
Dominik Schürmann
8e645453b1 Speed up build: Upgrade to Gradle Android Plugin 0.10.0, Disable Lint 2014-05-02 17:42:40 +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
b1cd669f14 Update maven libs and use fixed version 2014-04-18 20:54:13 +02:00