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
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
70bfb5c586
return values for create key
2014-07-30 14:57:59 +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
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
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
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
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
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
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
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
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
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
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
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
709196f774
Use strings in edit key
2014-07-03 16:49:25 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
Vincent Breitmoser
5c6139f57a
forward touch events to pager in import activity
2014-06-18 22:57:56 +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