moparisthebest
/
open-keychain
mirror of https://github.com/moparisthebest/open-keychain
1
0
Fork 0
Code Issues Releases Wiki Activity
3,449 Commits 12 Branches 24 Tags 116 MiB
Commit Graph

3449 Commits

Author SHA1 Message Date
Dominik Schürmann 9b093c6d73 Increase minSdk to 15, according to stats 2015-01-14 18:59:18 +01:00
Dominik Schürmann 4ad3c24126 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-14 14:52:29 +01:00
Dominik Schürmann f397d4f995 Reorganize folders of graphics sources 2015-01-14 14:52:23 +01:00
Vincent Breitmoser 8ef104281b fix ambiguous column name in advanced key info 2015-01-14 14:12:49 +01:00
Dominik Schürmann b4edb88f45 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-01-14 14:02:58 +01:00
Dominik Schürmann c94ef60c5d Fix SearchView 2015-01-14 14:02:51 +01:00
Vincent Breitmoser 2e04888d36 involve user attributes in unit tests for merge and canonicalize! 2015-01-14 13:25:38 +01:00
Vincent Breitmoser 73feaa974c small fixes to user attribute handling 2015-01-14 13:25:38 +01:00
Vincent Breitmoser bbc9d90c3e add basic tests for addition of user attributes 2015-01-14 13:25:38 +01:00
Vincent Breitmoser 4660608887 fix log entry for addition of user attributes 2015-01-14 13:25:38 +01:00
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 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 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