cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,962 Commits 1 Branch 0 Tags
c13ccda65846f71c07e5e8f3b22b087db5d38eca
Commit Graph
2962 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Breitmoser 08bdb0c5b9 update to tidy spongy-master 2014-08-23 11:59:21 +02:00
Dominik Schürmann 79c4d3ea49 Pull from transifex 2014-08-22 09:54:01 +02:00
Dominik Schürmann 77c7eb9096 v2.8 beta4 2014-08-22 09:01:57 +02:00
Dominik Schürmann 3d6f5e8ba1 Fix contact sync 2014-08-22 09:01:37 +02:00
Dominik Schürmann 152cd10b70 Revert "No need for setSyncAutomatically, this is only for network tickles" 
This reverts commit 0c1e65bc8b.

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
 2014-08-22 08:53:16 +02:00
Dominik Schürmann 3acbe9052f Add ECDH and ECDSA values 2014-08-21 15:40:09 +02:00
Dominik Schürmann aa35f6cffb Fixing build with Spongy Castle 1.51 2014-08-21 15:20:49 +02:00
Dominik Schürmann 602fd546f7 Update spongy castle, not building... 2014-08-21 15:12:25 +02:00
Dominik Schürmann 7adff7c7df Add info about device with intent chooser bug 2014-08-21 14:41:32 +02:00
Dominik Schürmann da072ef69c 2.8 beta3 2014-08-21 14:08:01 +02:00
Dominik Schürmann b7de91ad51 Disable custom intent chooser 2014-08-21 14:07:37 +02:00
Dominik Schürmann acff54d7d7 2.8 beta2 2014-08-21 11:44:55 +02:00
Dominik Schürmann 562e379c56 Fix nullpointer when revoking keys 2014-08-21 11:40:48 +02:00
Dominik Schürmann 3c46c3c2df Add account only on jelly bean and above 2014-08-21 11:36:47 +02:00
Dominik Schürmann 0c1e65bc8b No need for setSyncAutomatically, this is only for network tickles 2014-08-21 11:33:42 +02:00
Dominik Schürmann f0ff8d2222 Add sync properties 2014-08-21 11:25:41 +02:00
Dominik Schürmann 2930f83b2a Change account type 2014-08-21 11:19:44 +02:00
Dominik Schürmann 7adf07a9f9 XML cleanup 2014-08-21 10:47:29 +02:00
Dominik Schürmann e1d60c698c v2.8 beta1 2014-08-21 00:46:30 +02:00
Dominik Schürmann 41052d6f8f Pull from transifex 2014-08-21 00:36:15 +02:00
Dominik Schürmann 4c6783215f cleanup 2014-08-21 00:33:52 +02:00
Dominik Schürmann d1ef355f55 Fix result handling in account settings 2014-08-21 00:29:49 +02:00
Vincent Breitmoser ad9339b23d Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-21 00:02:33 +02:00
Vincent Breitmoser 63ca81d871 Copyright (C) 2014 Vincent Breitmoser 2014-08-21 00:02:27 +02:00
Dominik Schürmann 3ace5052e7 Comment extra in requestSync 2014-08-20 23:56:17 +02:00
Dominik Schürmann 6e3af6605a Sync in KeychainIntentService on delete, import, save 2014-08-20 23:55:01 +02:00
Dominik Schürmann 642a63fab6 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 23:26:09 +02:00
Dominik Schürmann 418e922c78 Enable sync adapter, changelog 2014-08-20 23:26:01 +02:00
Dominik Schürmann 0b07c5258f Disable key import in sync adapter 2014-08-20 23:13:37 +02:00
Vincent Breitmoser ce4bfdf945 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 23:09:25 +02:00
Vincent Breitmoser 9c9fc5330a small change to make android studio recognize a honeycomb-only block 2014-08-20 23:09:20 +02:00
Vincent Breitmoser dcf268bcb2 move key deletion into KeychainIntentHandler 2014-08-20 23:08:52 +02:00
Dominik Schürmann e8bc9083f2 improve certs_text 2014-08-20 23:01:27 +02:00
Dominik Schürmann 37caddca70 Upload key working 2014-08-20 22:51:00 +02:00
Vincent Breitmoser 945764b30f Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 22:38:28 +02:00
Dominik Schürmann 0f8958afb9 Upload key working 2014-08-20 22:17:16 +02:00
Vincent Breitmoser dd1b27b28f consolidate: small ui things 2014-08-20 21:52:54 +02:00
Vincent Breitmoser 6c428fa6b5 make number of secret keys imported part of ImportResult parcel 2014-08-20 21:51:57 +02:00
Vincent Breitmoser 9122d43d0a close actionmode in keylist on loading events (avoid inconsistent state) 2014-08-20 21:51:19 +02:00
Dominik Schürmann fa25265e79 Fix key sharing 2014-08-20 21:51:01 +02:00
Dominik Schürmann e33e5b0003 Work on upload key 2014-08-20 21:44:51 +02:00
Vincent Breitmoser 6ed0f667cd consolidate: remove debug "breakpoint" 2014-08-20 21:29:11 +02:00
Dominik Schürmann 45706e6534 Notify duration, cleanup 2014-08-20 21:09:46 +02:00
Dominik Schürmann 937c91eefa Fix nullpointer in first time activity 2014-08-20 20:44:49 +02:00
Dominik Schürmann ccc1d2e006 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 20:24:24 +02:00
Dominik Schürmann 735040e193 return some more results 2014-08-20 20:24:19 +02:00
Vincent Breitmoser 2cc265390c Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 20:16:05 +02:00
Vincent Breitmoser c296529049 modifyKey: small logging changes 2014-08-20 20:15:43 +02:00
Dominik Schürmann 50c33ef322 progress dialog design fix 2014-08-20 20:13:25 +02:00
Dominik Schürmann e13c3bd1ac Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 20:08:56 +02:00