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
|
ee307cdf28
|
Update gradle plugin to 0.12.2
|
2014-07-27 18:28:54 +02:00 |
|
Dominik Schürmann
|
cb3425f947
|
Update spongycastle
|
2014-07-27 18:21:39 +02:00 |
|
Dominik Schürmann
|
4eceb5bde1
|
Merge pull request #720 from artbristol/skip-bc-tests-externally
Skip spongycastle tests in root project
|
2014-07-27 18:13:02 +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 |
|
Art O Cathain
|
2291fef7c1
|
Skip spongycastle tests in root project
This will make moving back to a pure SC/BC upstream easier since
we don't need to change their source code
|
2014-07-27 15:40:22 +01: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
|
13bfa3b487
|
test: add tons of tests and fuzzing for UncachedKeyRing.canonicalize
|
2014-07-26 22:15:49 +02:00 |
|
Vincent Breitmoser
|
236a502ea7
|
generic UncachedKeyRing fixes
|
2014-07-26 15:51:35 +02:00 |
|
Vincent Breitmoser
|
cf6e4254c7
|
test: add misc UncachedKeyRing tests
|
2014-07-26 15:51:21 +02:00 |
|
Vincent Breitmoser
|
1c00227c41
|
test: small code cleanup
|
2014-07-26 14:16:44 +02:00 |
|
Vincent Breitmoser
|
d849b6d8a8
|
test: don't need commutativity parameter here after all
|
2014-07-26 04:38:30 +02:00 |
|
Vincent Breitmoser
|
eab4c4ba8e
|
test: (almost) full coverage for UncachedKeyRing.merge
|
2014-07-26 04:35:38 +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
|
a1c163e993
|
tests: add a couple of UncachedKeyRing.merge tests
|
2014-07-26 03:48:13 +02:00 |
|
Vincent Breitmoser
|
ab2b90342e
|
test and fix: adding an empty user id should fail
|
2014-07-26 03:47:29 +02:00 |
|
Dominik Schürmann
|
9ea5148550
|
Update libs
|
2014-07-25 01:34:57 +02:00 |
|
Dominik Schürmann
|
5eb414a22b
|
Program flow fixes
|
2014-07-25 01:34:29 +02:00 |
|