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 |
|
Vincent Breitmoser
|
80ed3464f4
|
small fix for MSG_MF_UID_ADD log entry
|
2014-08-01 17:52:27 +02:00 |
|
Dominik Schürmann
|
f72a07690c
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-08-01 17:54:10 +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 |
|
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 |
|