cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,463 Commits 1 Branch 0 Tags
0e0970c347f0a2f78f190d6d26205178037f5095
Commit Graph
726 Commits
Author SHA1 Message Date
Vincent Breitmoser 0e0970c347 move key stripping into ChangeSubkey, support divert-to-card 2015-01-24 23:05:50 +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
Vincent 491c12d5d3 No setContentView in onCreate for KeyListActivity 2015-01-16 15:41:43 +01:00
Vincent Breitmoser 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
Dominik Schürmann 09e992081b Style tabs, add missing drawables 2015-01-15 14:48:13 +01:00
Dominik Schürmann fe25a68c6a Yubikey numkey by default to true 2015-01-14 20:19:56 +01:00
Dominik Schürmann 1516ebf26a Toolbar for settings 2015-01-14 20:18:03 +01:00
Dominik Schürmann 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
Vincent Breitmoser 8ef104281b fix ambiguous column name in advanced key info 2015-01-14 14:12:49 +01:00
Dominik Schürmann c94ef60c5d Fix SearchView 2015-01-14 14:02:51 +01:00
Dominik Schürmann d9e0f0a271 Fix Toolbars in decrypt activities 2015-01-14 10:35:40 +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 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 2e3545949b Start working on Material Design 2015-01-13 21:55:53 +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 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 320f7d35ef encapsulate high level edit key into new operation class 2015-01-03 13:55:15 +01:00
Vincent Breitmoser 56f2a3137b get rid of RuntimeException control flow in UncachedKeyRing.fromStream 2015-01-02 02:05:12 +01:00
Vincent Breitmoser 71c53f13ec fix small merge conflict oversight 2014-12-30 16:24:20 +01:00
Vincent Breitmoser 9e663237b6 Merge branch 'development' of github.com:open-keychain/open-keychain into development 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
	OpenKeychain/src/main/res/values/strings.xml
 2014-12-30 13:09:27 +01:00
Vincent Breitmoser 438405d3d2 add PIN as a SecretKeyType 2014-12-30 12:34:24 +01:00
Dominik Schürmann ccde6add70 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-12-29 23:17:01 +01:00
Dominik Schürmann 610c4780f1 New work on PIN and lock pattern UI 2014-12-29 23:16:54 +01:00
Vincent Breitmoser 576e6fd0cc introduce new ChangeUnlockParcel packet for extended passphrase changing capabilities 2014-12-29 23:12:11 +01:00
Dominik Schürmann 7dbf0abf7b Fix crash on first time wizard 2014-12-28 19:06:17 +01:00
Vincent Breitmoser a221464f38 Fix to preselect certification key if only one is available 
Closes #981
 2014-10-29 22:47:34 +01:00
Vincent Breitmoser 8b53bed6c0 remove unused ExchangeKeySpinner class 2014-10-29 22:45:49 +01:00
Vincent Breitmoser 727783dd00 retrofit getBlob method of matrixcursor for android 2.3 2014-10-27 17:36:53 +01:00
Dominik Schürmann 1e5797387a Rename multi certify files to certify 2014-10-26 22:41:40 +01:00
Dominik Schürmann be31815ee8 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 22:38:35 +01:00
Dominik Schürmann fa73362a9f Fix notify after certify 2014-10-26 22:38:30 +01:00
Vincent Breitmoser ce58eb4b03 disable cancel button instead of hiding it on cancel prevention 2014-10-26 22:26:05 +01:00
Dominik Schürmann 3325ff57a7 Use new safe slinger activity from share tab 2014-10-26 02:34:51 +02:00
Dominik Schürmann 4631f45ed7 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 02:17:26 +02:00
Dominik Schürmann be3e6ae6ef Move advanced info into own activity 2014-10-26 02:16:39 +02:00
Vincent Breitmoser d6b9fc27b7 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2014-10-26 01:54:12 +02:00
Vincent Breitmoser 510ef40f55 implement upload of keyring after certification, check that option by default 2014-10-26 01:50:48 +02:00
Dominik Schürmann 97baa0e52f Keyboard tests 2014-10-26 01:09:35 +02:00
Dominik Schürmann 94693efbe5 Fail on unknown key ids on API, Key item design consistency for API 2014-10-26 00:19:14 +02:00
Dominik Schürmann e4391c282d Fix layout of select key adapter 2014-10-26 00:15:35 +02:00
Dominik Schürmann 74bac3ea36 Remove empty layout 2014-10-25 23:36:48 +02:00
Dominik Schürmann 94e7bbb67b Remove PassphraseDialogFragment 2014-10-25 22:56:27 +02:00
Dominik Schürmann ad60ec2d00 Remove old certify activity 2014-10-25 22:55:16 +02:00