moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-30 12:32:17 -05:00
Code Issues Releases Wiki Activity
2,167 Commits 12 Branches 24 Tags 116 MiB
e84aa5a69d
Commit Graph

2167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann
bce874db09 decrease size of search icons in import 2014-06-18 23:06:58 +02:00
Vincent Breitmoser
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
Vincent Breitmoser
0013199b2d handle database error on secret key insert 2014-06-17 23:46:02 +02:00
Vincent Breitmoser
6e4d0dede1 canonicalize: support secret keys 2014-06-17 23:25:45 +02:00
Vincent Breitmoser
4bff50bffc new-edit: add logging to modifySecretKeyRing operation 2014-06-17 21:23:24 +02:00
Vincent Breitmoser
5c47143d64 new-edit: add new save keyring stuff 2014-06-17 20:11:54 +02:00
Vincent Breitmoser
a0f546739d new-edit: remove old save keyring stuff 2014-06-17 20:03:58 +02:00
Vincent Breitmoser
02fbaaf858 import-log: clean up progress messages 2014-06-17 12:18:41 +02:00
Vincent Breitmoser
9058291c05 canonicalize: fix NullPointerException 2014-06-17 11:57:14 +02:00
Vincent Breitmoser
ffea551afc drop invalid user ids and add fatal case(s) 2014-06-16 22:32:17 +02:00
Vincent Breitmoser
2f0e70587d add more progress info from import routine 2014-06-16 22:00:57 +02:00
Vincent Breitmoser
109bea7542 import-log: distinguish master/subkeys, distinguish redundant/bad certs, more docs 2014-06-16 22:00:57 +02:00
Art O Cathain
7ea57b7c89 Fix hard-coded size 2014-06-16 19:12:26 +01:00
Art O Cathain
d06ba72edc Start on Robolectric integration test 2014-06-16 18:58:41 +01:00
Dominik Schürmann
21e9d0b7b4 Merge pull request #656 from danielhass/supertoast-dev 
Added SuperToasts with new notify-wrapper
 2014-06-16 15:20:15 +02:00
Daniel Haß
da28c000ad Changed license header 2014-06-16 13:19:34 +02:00
Daniel Haß
5bd0b5011e Moved Notify class to utils 2014-06-16 13:13:43 +02:00
Daniel Haß
eeff0c7150 Removed unused import 2014-06-16 13:06:42 +02:00
Daniel Haß
76d733cbc7 Added notification area to decrypt content 2014-06-16 12:38:19 +02:00
Daniel Haß
e48d5e4474 Replaced AppMsg with notify wrapper call 2014-06-16 12:37:51 +02:00
Daniel Haß
998f616607 Added notification area as reusable layout 2014-06-16 12:37:37 +02:00
Daniel Haß
41545e5e52 Added notification wrapper for toast like notifys 2014-06-16 12:37:22 +02:00
Dominik Schürmann
81344389e5 Merge pull request #654 from artbristol/master 
Update JUnit version
 2014-06-14 15:54:22 +02:00
Art O Cathain
63861fa60b Later version of Junit prevents 'Multiple dex files define Lorg/hamcrest/Description' error 2014-06-14 13:16:39 +01:00
Vincent Breitmoser
9d77790729 Merge branch 'canonicalize' 2014-06-13 00:33:13 +02:00