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

2571 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann
a8b8ed6f14 Gradle troubleshooting info 2014-08-04 09:59:11 +02:00
Dominik Schürmann
da163c8d3d TokenAutoComplete: Do not abort build if lint finds errors 2014-08-04 02:37:41 +02:00
Dominik Schürmann
fb5c829ff7 Remove old edit key stuff 2014-08-04 02:31:54 +02:00
Dominik Schürmann
7f463ae0df Edit key: subkey adding, not finished 2014-08-04 02:26:34 +02:00
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
aa5856bcb8 Again update submodules 2014-08-01 17:53:57 +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
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