moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-24 17:52:16 -05:00
Code Issues Releases Wiki Activity
2,811 Commits 12 Branches 24 Tags 116 MiB
16a93038dd
Commit Graph

2811 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dominik Schürmann
d03d574177 Merge pull request #727 from mar-v-in/fix-cachedpublickeyring 
Fix CachedPublicKeyring
 2014-08-01 09:31:14 +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
Vincent Breitmoser
a3c2eaf1e9 tests: adapt to new EditKeyResult return value 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