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 |
|
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
|
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 |
|
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
|
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 |
|