moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-11 18:02:15 -05:00
Code Issues Releases Wiki Activity
4,164 Commits 12 Branches 24 Tags 116 MiB
95875d727e
Commit Graph

4164 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann
99361bdcff Better way to have dark toolbar and light theme 2015-01-14 13:19:21 +01:00
Dominik Schürmann
d9e0f0a271 Fix Toolbars in decrypt activities 2015-01-14 10:35:40 +01:00
Dominik Schürmann
47051f9a09 svg backup icon 2015-01-14 10:28:09 +01:00
Dominik Schürmann
5517b4f8cf Launcher icon fixes 2015-01-14 02:03:20 +01:00
Dominik Schürmann
318d3eb120 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-14 00:04:10 +01:00
Vincent Breitmoser
c57355b24a actually import user attributes (though they are not shown anywhere yet) 2015-01-14 00:03:02 +01:00
Vincent Breitmoser
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
Dominik Schürmann
7da3ddae7b Refactor BaseActivity 2015-01-13 23:43:18 +01:00
Dominik Schürmann
d8ff737fc5 Use Toolbar and new BaseActivity 2015-01-13 23:15:13 +01:00
Dominik Schürmann
862d1f1971 Green 2015-01-13 22:18:40 +01:00
Dominik Schürmann
2e3545949b Start working on Material Design 2015-01-13 21:55:53 +01:00
Vincent Breitmoser
33ab856214 update spongycastle with more public methods for WrappedUserAttribute 2015-01-13 20:53:38 +01:00
Vincent Breitmoser
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
Vincent Breitmoser
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
Vincent Breitmoser
50e515c6cd add support for user attributes in merge() routine 2015-01-13 20:37:26 +01:00
Dominik Schürmann
2f0eb3fbd6 Set minSdk to 14 2015-01-13 19:05:26 +01:00
Vincent Breitmoser
fc85ef71a8 remove LinkedIdentity (committed earlier by accident) 2015-01-13 00:10:59 +01:00
Vincent Breitmoser
fc3397de5d add support for user attributes (during canonicalization) 2015-01-12 20:08:35 +01:00
Dominik Schürmann
01c3e7bbf9 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-12 15:38:25 +01:00
Dominik Schürmann
374de7ed96 Update safeslinger lib 2015-01-12 15:38:16 +01:00
Dominik Schürmann
b73ad7d87e Update safeslinger lib 2015-01-12 15:37:41 +01:00
Dominik Schürmann
3e74405f3c Merge pull request #1023 from adithyaphilip/development 
Issue #954 - fixed crash when file scheme is passed, broadened deletion scope
 2015-01-12 11:03:42 +01:00
Abraham Philip
16f924eef3 fixed crash when file scheme is passed, broadened deletion scope 2015-01-09 05:07:50 +05:30
Dominik Schürmann
a87a45aa9a No output stream for detached signatures, makes no sense to pipe it through 2015-01-08 14:57:09 +01:00
Dominik Schürmann
1c4b8c193d Experimental API support for detached signatures (not tested) 2015-01-08 14:48:13 +01:00
Dominik Schürmann
6570483fab Test new icon 2015-01-07 14:10:12 +01:00
Dominik Schürmann
816b1bb8c8 OpenPGP instead of PGP 2015-01-07 13:45:28 +01:00
Dominik Schürmann
443fbaff17 PIn not pin passphrase 2015-01-07 13:29:56 +01:00
Dominik Schürmann
c4ee00bd39 OpenPGP not PGP 2015-01-07 00:01:57 +01:00
Dominik Schürmann
6ec85b0550 Clearup after lockpattern experiments 2015-01-06 19:29:51 +01:00
Dominik Schürmann
af762a65a0 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-06 14:52:12 +01:00
Dominik Schürmann
e34ad18ed2 Passphrase wizard tests 2015-01-06 14:52:07 +01:00
Vincent Breitmoser
0c3f9ae0a6 tests: add a couple of CertifyOperation test cases 2015-01-03 23:02:11 +01:00
Vincent Breitmoser
07251f35ae minor stuff 2015-01-03 23:01:57 +01:00
Vincent Breitmoser
47ace7cea3 make certify routines more robust (#1016) 2015-01-03 22:14:12 +01:00
Vincent Breitmoser
2192a6badd add more descriptive string about non-mdc encrypted data 2015-01-03 21:07:33 +01:00
Vincent Breitmoser
320f7d35ef encapsulate high level edit key into new operation class 2015-01-03 13:55:15 +01:00
Vincent Breitmoser
5057ea1744 deal with non-existent user ids during import (#994) 2015-01-02 14:28:03 +01:00
Vincent Breitmoser
9cf800bcd8 tests: add multiple keys with signature test case 2015-01-02 02:50:14 +01:00
Vincent Breitmoser
920fbdfb42 throw exception if no data is found in getGenericData 2015-01-02 02:24:11 +01:00
Vincent Breitmoser
56f2a3137b get rid of RuntimeException control flow in UncachedKeyRing.fromStream 2015-01-02 02:05:12 +01:00
Vincent Breitmoser
b52fb90380 fix and test for bad certificate version numbers (#1012) 
closes #1012
 2015-01-02 01:58:16 +01:00
Vincent Breitmoser
704fc2dd45 tests: for export, check that a token local cert actually exists before export 2015-01-02 01:11:43 +01:00
Vincent Breitmoser
57e3266fa5 tests: add test for key export 2015-01-02 00:15:08 +01:00
Vincent Breitmoser
7223abcf0c extend canonicalize to strip local certificates on export 2015-01-02 00:07:05 +01:00
Vincent Breitmoser
1c1ae769ef small improvements regarding pin tests and logging 2015-01-01 21:13:07 +01:00
Vincent Breitmoser
2d38079574 add empty notation data packet only if necessary 2015-01-01 20:46:39 +01:00
Vincent Breitmoser
9f7b2472cf tests: be less verbose about inserting keyrings for encrypt/decrypt 2015-01-01 20:21:52 +01:00
Vincent Breitmoser
5e9d8ca8c6 tests: add multi key encryption/decryption test, new way for fake passphrase cache 2015-01-01 20:21:32 +01:00
Vincent Breitmoser
bf537c4a81 fix unit tests (canonicalize after create) 2015-01-01 18:24:09 +01:00