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
e77f9a5351
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-01-27 09:43:45 +01:00
fd29d27e61
Temporary nav drawer fixes
2015-01-27 09:37:07 +01:00
6c80025ead
backend support for charset in ascii-armored streams
2015-01-27 09:17:23 +01:00
fc786280fd
Fixes for detached signatures
2015-01-26 17:33:40 +01:00
efe5c80b1c
remove unused NonPgpPartException
2015-01-26 16:33:10 +01:00
2bb7c3bcef
move last parts of import logic from kis into operation
2015-01-26 16:33:10 +01:00
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
e049895b9f
Material Design Drawer
2015-01-26 15:24:42 +01:00
e4e2d647c8
Material Design: Full screen dialogs
2015-01-26 00:50:35 +01:00
b4781343d9
specify our usage of java 1.7 in build files
2015-01-25 12:41:03 +01:00
8d9c3c0534
lift language level to java 7, and some code cleanup
2015-01-25 12:36:00 +01:00
41aba69fad
introduce PromoteKeyOperation to create dummy secret from public keys
2015-01-25 02:08:07 +01:00
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
fb2fa195bf
allow explicit re-certification in SaveKeyringParcel
2015-01-24 23:11:54 +01:00
0e0970c347
move key stripping into ChangeSubkey, support divert-to-card
2015-01-24 23:05:50 +01:00
a65edcdb2f
only respect most recent signature for key flags
2015-01-19 18:31:57 +01:00
e71bd3d9dd
always show revoked user ids last!
2015-01-19 18:31:57 +01:00
3752cdd132
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-01-19 17:25:36 +01:00
3ac466c9db
Disable sharing chooser blacklisting for lollipop
2015-01-19 17:22:31 +01:00
491c12d5d3
No setContentView in onCreate for KeyListActivity
2015-01-16 15:41:43 +01:00
b6f0fb91da
show notification if KeyListActivity is spawned with an EXTRA_RESULT
...
Closes #1029
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java
2015-01-16 13:58:34 +01:00
09e992081b
Style tabs, add missing drawables
2015-01-15 14:48:13 +01:00
0c74cc7c3d
Fix drawable sizes
2015-01-14 20:25:28 +01:00
fe25a68c6a
Yubikey numkey by default to true
2015-01-14 20:19:56 +01:00
1516ebf26a
Toolbar for settings
2015-01-14 20:18:03 +01:00
85b6669625
Integrate QR Code library instead of requiring the app to be installed, also due to security reasons
2015-01-14 19:14:30 +01:00
9b093c6d73
Increase minSdk to 15, according to stats
2015-01-14 18:59:18 +01:00
4ad3c24126
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-01-14 14:52:29 +01:00
f397d4f995
Reorganize folders of graphics sources
2015-01-14 14:52:23 +01:00
8ef104281b
fix ambiguous column name in advanced key info
2015-01-14 14:12:49 +01:00
b4edb88f45
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-01-14 14:02:58 +01:00
c94ef60c5d
Fix SearchView
2015-01-14 14:02:51 +01:00
73feaa974c
small fixes to user attribute handling
2015-01-14 13:25:38 +01:00
4660608887
fix log entry for addition of user attributes
2015-01-14 13:25:38 +01:00
99361bdcff
Better way to have dark toolbar and light theme
2015-01-14 13:19:21 +01:00
d9e0f0a271
Fix Toolbars in decrypt activities
2015-01-14 10:35:40 +01:00
5517b4f8cf
Launcher icon fixes
2015-01-14 02:03:20 +01:00
318d3eb120
Merge branch 'development' of github.com:open-keychain/open-keychain into development
2015-01-14 00:04:10 +01:00
c57355b24a
actually import user attributes (though they are not shown anywhere yet)
2015-01-14 00:03:02 +01:00
2b1c5358b7
make user_ids table typed, with attribute_data support
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
2015-01-14 00:02:53 +01:00
7da3ddae7b
Refactor BaseActivity
2015-01-13 23:43:18 +01:00
d8ff737fc5
Use Toolbar and new BaseActivity
2015-01-13 23:15:13 +01:00
862d1f1971
Green
2015-01-13 22:18:40 +01:00
2e3545949b
Start working on Material Design
2015-01-13 21:55:53 +01:00
abd1211613
hack to make WrappedUserAttribute serializable
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java
2015-01-13 20:42:40 +01:00
84eece622b
support addition of user attributes
...
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java
OpenKeychain/src/main/res/values/strings.xml
2015-01-13 20:41:01 +01:00
50e515c6cd
add support for user attributes in merge() routine
2015-01-13 20:37:26 +01:00
2f0eb3fbd6
Set minSdk to 14
2015-01-13 19:05:26 +01:00
fc85ef71a8
remove LinkedIdentity (committed earlier by accident)
2015-01-13 00:10:59 +01:00
Dominik Schürmann