 Dominik Schürmann
|
d377d1f23d
|
Better handling of user id revocation in UI code
|
2014-08-05 17:59:05 +02:00 |
|
|
Dominik Schürmann
|
160e6972d8
|
Create key: make single user id primary user id, other cleanup
|
2014-08-05 17:25:22 +02:00 |
|
|
Dominik Schürmann
|
369f6e080c
|
Refactor expiry dialog
|
2014-08-05 15:07:11 +02:00 |
|
|
Dominik Schürmann
|
e9fccff8bc
|
Merge branch 'master' of github.com:open-keychain/open-keychain
|
2014-08-05 00:23:15 +02:00 |
|
|
Dominik Schürmann
|
80408460a0
|
KeychainContract: use longs instead of String, other fixes
|
2014-08-05 00:23:04 +02:00 |
|
|
Dominik Schürmann
|
b617112c9b
|
Merge pull request #736 from mar-v-in/use-file-size
Use size of input uris for progress bar in encrypt/decrypt
|
2014-08-05 00:12:39 +02:00 |
|
 mar-v-in
|
2712c18a7a
|
Use size of input uris for progress bar in encrypt/decrypt
|
2014-08-04 20:34:00 +02:00 |
|
|
Dominik Schürmann
|
de6950377c
|
Lint fixes
|
2014-08-04 17:10:56 +02:00 |
|
|
Dominik Schürmann
|
ce8d38d9b3
|
Add license headers
|
2014-08-04 16:46:23 +02:00 |
|
|
Dominik Schürmann
|
7eafd77e15
|
Fix nullpointer, remove unused window feature
|
2014-08-04 16:37:42 +02:00 |
|
|
Dominik Schürmann
|
f5f6102458
|
Pull from transifex
|
2014-08-04 16:33:05 +02:00 |
|
|
Dominik Schürmann
|
a2c1221397
|
Fixing lint complaints, removing unused resources
|
2014-08-04 16:29:16 +02:00 |
|
|
Dominik Schürmann
|
3a6ac2a16a
|
More cleanup
|
2014-08-04 15:49:49 +02:00 |
|
|
Dominik Schürmann
|
e87c69647c
|
Even more smaller nitpicks
|
2014-08-04 15:40:34 +02:00 |
|
|
Dominik Schürmann
|
c4311e2f52
|
Remove support for IO_FILE, this is no longer used and was never a good practice, use IO_URI on Android!
|
2014-08-04 14:44:11 +02:00 |
|
|
Dominik Schürmann
|
839294d27c
|
Cleanup, prevent encrypt Intent inception
|
2014-08-04 14:42:03 +02:00 |
|
|
Dominik Schürmann
|
b42afcd32c
|
Fix debug backup/restore methods
|
2014-08-04 11:19:46 +02:00 |
|
|
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 |
|