Commit Graph

3732 Commits

Author SHA1 Message Date
Dominik Schürmann
464f7c6718 Fix saving of allowed keys 2015-01-30 10:47:40 +01:00
Dominik Schürmann
15e7e5f7c6 Fix travis for build tools update 2015-01-30 10:24:32 +01:00
Dominik Schürmann
90d1b6b435 Update mini dns lib 2015-01-30 10:10:55 +01:00
Dominik Schürmann
c2c28fab7b Merge branch 'ligi-ligi/fix/add_ability_to_compile_with_java8' into development 2015-01-30 10:10:25 +01:00
Dominik Schürmann
34b664f4b6 Merge branch 'ligi/fix/add_ability_to_compile_with_java8' of https://github.com/ligi/open-keychain into ligi-ligi/fix/add_ability_to_compile_with_java8 2015-01-30 10:10:13 +01:00
Dominik Schürmann
3c2f9ce0da Header exported 2015-01-30 10:10:04 +01:00
Dominik Schürmann
38f7950d90 Saving of allowed keys 2015-01-29 21:00:58 +01:00
ligi
fcd91d881e Add explicit casting to be able to compile with java8 2015-01-29 20:30:26 +01:00
ligi
4aa6e37ac6 Use latest buildTools 2015-01-29 20:28:58 +01:00
Dominik Schürmann
d6e4936fa5 Introduce allowed keys table per API client 2015-01-29 17:46:27 +01:00
Dominik Schürmann
e0369a2f14 Header image tryout 2015-01-29 17:02:01 +01:00
Dominik Schürmann
e4e3360866 Update api lib 2015-01-29 15:33:44 +01:00
Dominik Schürmann
34b01e9f2b Remove files related to old nav drawer 2015-01-29 13:36:38 +01:00
Dominik Schürmann
6a7d332606 Fix item layout in apps list 2015-01-29 13:24:08 +01:00
Dominik Schürmann
a346b58db7 Close FileDescriptors and input, output streams when possible 2015-01-29 12:44:06 +01:00
Dominik Schürmann
c4ef86b38a Refactor DecryptActivity into DecryptOverviewFragment for nav drawer 2015-01-29 12:03:00 +01:00
Dominik Schürmann
e243e72f86 Update api lib 2015-01-29 11:17:48 +01:00
Dominik Schürmann
03a01dc7ae White popup theme 2015-01-29 11:03:19 +01:00
Dominik Schürmann
43930ed8f2 Move key list logic into fragment, UI fixes for nav drawer 2015-01-29 10:10:07 +01:00
Dominik Schürmann
5564f65a69 Merge remote-tracking branch 'origin/t/snackbar' into development
Conflicts:
	OpenKeychain/build.gradle
2015-01-29 09:55:09 +01:00
Dominik Schürmann
81d4d31fd7 Cloud search icon 2015-01-28 18:11:08 +01:00
Dominik Schürmann
6c6201f129 Fix cleartext signatures internally 2015-01-27 17:13:54 +01:00
Dominik Schürmann
d11d3933bc Update api lib 2015-01-27 14:08:25 +01:00
Dominik Schürmann
5a1187b781 Fix nullpointer in ImportKeysActivity 2015-01-27 13:15:24 +01:00
Dominik Schürmann
3b23a71209 Merge branch 'detached-sigs-api' into development 2015-01-27 13:04:21 +01:00
Dominik Schürmann
9c6f195eb7 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-27 13:04:09 +01:00
Dominik Schürmann
ae7ba2639f Support verification of detached signatures 2015-01-27 13:00:28 +01:00
Dominik Schürmann
e8780b4410 Merge branch 'development' into detached-sigs-api
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
2015-01-27 09:46:42 +01:00
Vincent Breitmoser
8c496287a2 update openpgp-api-lib for charset support 2015-01-27 09:46:13 +01:00
Dominik Schürmann
e77f9a5351 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-27 09:43:45 +01:00
Dominik Schürmann
fd29d27e61 Temporary nav drawer fixes 2015-01-27 09:37:07 +01:00
Vincent Breitmoser
6c80025ead backend support for charset in ascii-armored streams 2015-01-27 09:17:23 +01:00
Dominik Schürmann
fc786280fd Fixes for detached signatures 2015-01-26 17:33:40 +01:00
Vincent Breitmoser
efe5c80b1c remove unused NonPgpPartException 2015-01-26 16:33:10 +01:00
Vincent Breitmoser
2bb7c3bcef move last parts of import logic from kis into operation 2015-01-26 16:33:10 +01:00
Dominik Schürmann
34a7728cec Merge branch 'development' into detached-sigs-api
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
2015-01-26 16:30:21 +01:00
Dominik Schürmann
e049895b9f Material Design Drawer 2015-01-26 15:24:42 +01:00
Dominik Schürmann
e4e2d647c8 Material Design: Full screen dialogs 2015-01-26 00:50:35 +01:00
Vincent Breitmoser
b4781343d9 specify our usage of java 1.7 in build files 2015-01-25 12:41:03 +01:00
Vincent Breitmoser
8d9c3c0534 lift language level to java 7, and some code cleanup 2015-01-25 12:36:00 +01:00
Vincent Breitmoser
41aba69fad introduce PromoteKeyOperation to create dummy secret from public keys 2015-01-25 02:08:07 +01:00
Vincent Breitmoser
1516f951b7 work on divert-to-key and other keyring stuff
- allow modifySecretKeyRing operation without passphrase, but a only
  restricted subset of operations (ie, s2k strip/divert)
- pass byte array with serial number to key edit operation to initialize
  divert-to-card key
- update spongycastle to support serial numbers in iv for divert-to-card
2015-01-25 01:57:58 +01:00
Vincent Breitmoser
fb2fa195bf allow explicit re-certification in SaveKeyringParcel 2015-01-24 23:11:54 +01:00
Vincent Breitmoser
0e0970c347 move key stripping into ChangeSubkey, support divert-to-card 2015-01-24 23:05:50 +01:00
Vincent Breitmoser
53955a8014 forgot another test case in prev. commit 2015-01-19 19:15:44 +01:00
Vincent Breitmoser
89969252fd fix unit test for new key flag behavior 2015-01-19 18:53:12 +01:00
Vincent Breitmoser
a65edcdb2f only respect most recent signature for key flags 2015-01-19 18:31:57 +01:00
Vincent Breitmoser
e71bd3d9dd always show revoked user ids last! 2015-01-19 18:31:57 +01:00
Dominik Schürmann
3752cdd132 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-19 17:25:36 +01:00
Dominik Schürmann
3ac466c9db Disable sharing chooser blacklisting for lollipop 2015-01-19 17:22:31 +01:00