cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,142 Commits 1 Branch 0 Tags
4cc127e4604c664ee6a8607fc2404256f8949609
Commit Graph
427 Commits
Author SHA1 Message Date
Dominik Schürmann 4cc127e460 Merge pull request #672 from artbristol/functional-testing 
VERY basic test for save keyring
 2014-06-21 21:31:25 +02:00
Dominik Schürmann 0c3a478a43 Cleanup pull keybase code 2014-06-21 21:31:00 +02:00
Dominik Schürmann 4ae5c56b73 Merge pull request #668 from timbray/master 
Moved Keybase stuff into KeybaseLib submodule
 2014-06-21 21:25:03 +02:00
Dominik Schürmann 18430bef17 Start new designed activity 2014-06-21 20:25:51 +02:00
Art O Cathain 0af2b27cb3 VERY basic test for save keyring 2014-06-21 17:44:04 +01:00
Dominik Schürmann a1525bffe2 Fix qr code finally 2014-06-20 23:01:35 +02:00
Vincent BreitmoserandDominik Schürmann 0d644e37b1 import: forward motion events to activity regardless 2014-06-20 22:30:54 +02:00
Dominik Schürmann 0a790c7aa2 Work on Qr code import 2014-06-20 22:28:08 +02:00
Tim Bray 17f43ad21b Moved Keybase stuff into KeybaseLib submodule 2014-06-20 09:31:34 -07:00
Dominik Schürmann 6b7aa2767a Fix keybase import 2014-06-20 15:58:32 +02:00
Dominik Schürmann f0b8261ad3 Use actionbar button for log activity 2014-06-20 15:49:54 +02:00
Dominik Schürmann 717d66961b Fix onTouchEvent delegation, with workaround for Android bug 2014-06-20 15:39:27 +02:00
Dominik Schürmann 4aec28c237 Fix update from keyserver flow 2014-06-20 15:14:34 +02:00
Vincent f47bb1e8e2 Merge pull request #658 from artbristol/functional-testing 
Start on Robolectric integration test
 2014-06-20 00:44:31 +02:00
mar-v-in 58706425d6 Merge branch 'master' of https://github.com/open-keychain/open-keychain into improve-file 2014-06-19 13:57:35 +02:00
Dominik Schürmann 48c96184dc Fix app name in PGP header, closing #663 2014-06-19 11:56:36 +02:00
Art O Cathain b1815ef24a revert to previous min version 2014-06-19 07:52:37 +01:00
Dominik Schürmann 3d8e6b303c Fixing fingerprint search, part 1 2014-06-19 01:26:21 +02:00
Dominik Schürmann 47edcacf61 Remove unused code to import splitted qr codes 2014-06-19 00:54:52 +02:00
Dominik Schürmann f0487b0ca7 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-19 00:38:47 +02:00
Dominik Schürmann 7fc188dbd6 New callback model for ImportKeysActivity 2014-06-19 00:38:36 +02:00
Vincent Breitmoser b40b429bc0 remove obsolete subkey binding check from signature verification 2014-06-19 00:14:28 +02:00
Dominik Schürmann 0db425b289 Reference ic_launcher instead of icon 2014-06-18 23:19:54 +02:00
Dominik Schürmann bce874db09 decrease size of search icons in import 2014-06-18 23:06:58 +02:00
Vincent BreitmoserandDominik Schürmann 5c6139f57a forward touch events to pager in import activity 2014-06-18 22:57:56 +02:00
Dominik Schürmann a246dc9675 Fix new actionbar icon sizes, rename icon to ic_launcher following Android naming conventions 2014-06-18 22:30:54 +02:00
Dominik Schürmann 37a81af748 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-18 22:02:07 +02:00
Dominik Schürmann d9ccef4899 consistent button design in import activity 2014-06-18 22:01:58 +02:00
Vincent Breitmoser ada6a12174 fix key export 2014-06-18 21:54:59 +02:00
mar-v-in d9c937bbe7 Merge branch 'master' into improve-file 2014-06-18 21:43:54 +02:00
Vincent Breitmoser 4ad15739e2 canonicalize: missed two logging entries 2014-06-18 21:43:41 +02:00
Vincent Breitmoser 825f37eee4 Merge remote-tracking branch 'origin/master' 2014-06-18 21:14:39 +02:00
Vincent Breitmoser 5f20b8de1a Merge branch 'new-edit' 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/OperationResultParcel.java
	OpenKeychain/src/main/res/values/strings.xml
 2014-06-18 21:09:04 +02:00
Dominik Schürmann 8ffc959f07 Merge pull request #661 from mar-v-in/improve-contacts 
Improve contact sync
 2014-06-18 20:56:38 +02:00
Vincent Breitmoser 3bffe4da55 generate public keyring from secret if not available 2014-06-18 20:55:44 +02:00
Vincent Breitmoser f8d895dea4 consolidate: almost sane logging 2014-06-18 20:27:59 +02:00
Vincent Breitmoser 134f8471c0 consolidate: add key import routines with consolidation 2014-06-18 19:39:16 +02:00
mar-v-in a1c3c41073 Reset importDone at the beginning of sync 2014-06-18 17:06:46 +02:00
mar-v-in b9d88de286 Wait for import to be done before writing contacts 2014-06-18 17:01:36 +02:00
mar-v-in 4bbaf6faa1 Remove abandoned contacts 2014-06-18 16:47:33 +02:00
mar-v-in 39a68c30f8 Code style 2014-06-18 16:14:12 +02:00
mar-v-in 0bcf7a39bf Continue contact db sync 
- Only add keyrings to contact db that are not expired nor revoked
- Merge all user ids of a key into one contact (#659)
- Update contacts: Changes in keyrings (user id add, user id revoke, change of primary id) will be updated into contact db

TODO:
- delete contact once keyring is removed from OK
- sync: wait for key downloads to complete before changing contact db
 2014-06-18 16:14:11 +02:00
Vincent Breitmoser f80228a08d consolidate: make it work 2014-06-18 14:02:21 +02:00
Vincent Breitmoser 1e45e5cd9a code cleanup in ProviderHelper and UncachedKeyRing 2014-06-18 10:00:21 +02:00
Vincent Breitmoser d8b0015d25 consolidate: add logging 2014-06-18 00:30:45 +02:00
Vincent Breitmoser b4974d922e consolidate: first draft 2014-06-18 00:30:45 +02:00
Vincent Breitmoser adf15d4d16 import-log: don't count self certs as unknown 2014-06-18 00:25:52 +02:00
Vincent Breitmoser c63f3c8a5d prepare ProviderHelper for consolidation before insert 2014-06-18 00:21:11 +02:00
Dominik Schürmann 4d34361590 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-06-18 00:03:19 +02:00
Dominik Schürmann 8c7a360d6e Redesign Import, still some todos and regression bugs 2014-06-18 00:03:06 +02:00