cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,806 Commits 1 Branch 0 Tags
9a18635b892b8b05459efc115e744cd75453725b
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann 9a18635b89 Changelog 2.9 2014-08-31 22:12:52 +02:00
Dominik Schürmann 428d6b1182 prevent nullpointer in ImportKeysServerFragment, return empty lists instead of null 2014-08-31 21:52:14 +02:00
Dominik Schürmann 9258fbfb74 Cleanup keyspinner layout, key id typeface monospace 2014-08-31 20:39:36 +02:00
Dominik Schürmann bdf0436c94 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-31 20:26:12 +02:00
Dominik Schürmann 5e7eed239f Better leyout for account settings 2014-08-31 20:26:06 +02:00
Dominik Schürmann f6d1b45007 Move date picker to left because of width constraints inside the dialog 2014-08-31 18:51:29 +02:00
Dominik Schürmann 5444c14ef9 Hide keyserver spinner under advanced options in certify activity 2014-08-31 17:26:29 +02:00
Dominik Schürmann 456aa00e2a Update TokenAutoComplete 2014-08-29 18:49:55 +02:00
Dominik Schürmann 8f37b22adb Fix possible nullpointer in Preferences 2014-08-29 18:39:15 +02:00
Dominik Schürmann 880aea53c9 Mardown compatible changelog 2014-08-28 13:12:44 +02:00
Dominik Schürmann 677d9e6023 Fix crash in PgpKeyHelper 2014-08-28 13:10:52 +02:00
Dominik Schürmann aeb0296572 Update nfc lib 2014-08-28 11:05:52 +02:00
Dominik Schürmann c0ebc92611 Merge branch 'master' into yubikey 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
 2014-08-28 11:00:18 +02:00
Dominik Schürmann b193965e58 Merge pull request #796 from open-keychain/develop 
ECC support
 2014-08-28 10:46:58 +02:00
Dominik Schürmann 4aeacd5b51 Fix NullPointerException in ImportKeysActivity 2014-08-28 10:40:11 +02:00
Dominik Schürmann 9288e4f0a9 Fix RuntimeException in KeyListActivity on tablets 2014-08-28 10:37:01 +02:00
Dominik Schürmann 33e219242c Travis should use gradle wrapper script 2014-08-28 00:51:45 +02:00
Dominik Schürmann 6d9a18941b v2.8 2014-08-27 19:29:17 +02:00
Dominik Schürmann c2f6aa09c5 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-27 19:28:46 +02:00
Dominik Schürmann d795f8d4e2 Strip out duplicate user ids 2014-08-27 19:28:33 +02:00
Dominik Schürmann 12a5b2174f Abort import of pubkeys where secret keys exist but new pubkey has more subkeys, fix #696 2014-08-27 14:12:59 +02:00
Dominik Schürmann 86a05033ae Cleanup FoldableLinearLayout 2014-08-27 13:54:33 +02:00
Dominik Schürmann 5ddbbb76be Function graphic 2014-08-26 08:50:44 +02:00
Dominik Schürmann 88d7e46d6f Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-23 15:27:35 +02:00
Dominik Schürmann 71657d993c API: Fix re-seletion of keys on default account 2014-08-23 15:27:25 +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
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
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
Dominik Schürmann 0f8958afb9 Upload key working 2014-08-20 22:17:16 +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
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
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
Dominik Schürmann 47bcc6149e return some more results 2014-08-20 20:08:51 +02:00
Dominik Schürmann 0e152d1db0 Merge branch 'master' of github.com:open-keychain/open-keychain 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
 2014-08-20 19:48:19 +02:00
Dominik Schürmann f46f2b6895 Fixes and temporary fixes for returning results 2014-08-20 19:46:44 +02:00
Dominik Schürmann c3b12bb3c2 Pull from transifex 2014-08-20 18:30:22 +02:00
Dominik Schürmann 70426041df Pull from transifex 2014-08-20 11:09:41 +02:00
Dominik Schürmann d6d68622ce Travis is now stable 2014-08-20 11:03:56 +02:00
Dominik Schürmann c00d619099 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-20 09:20:55 +02:00
Dominik Schürmann d26c6b1a08 Update keybase lib 2014-08-20 09:20:30 +02:00
Dominik Schürmann c86ef06a24 Merge pull request #782 from mar-v-in/issue-781 
Fix mime types
 2014-08-19 23:42:42 +02:00
Dominik Schürmann 16ab761006 Fix strings 2014-08-19 18:12:19 +02:00
Dominik Schürmann c42f6a04ed Start consolidate activity 2014-08-19 16:49:48 +02:00
Dominik Schürmann 4f8ddad9d3 ConsolidateDialogActivity 2014-08-19 16:40:57 +02:00
Dominik Schürmann 4be8c36b43 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-19 16:31:59 +02:00
Dominik Schürmann 5f8bbab569 Scroll fixes for certify activity 2014-08-19 16:31:51 +02:00
Dominik Schürmann 8d668d170c Notes about criticality 2014-08-19 15:23:37 +02:00
Dominik Schürmann 68cce5c0c8 Bouncy Castle link 2014-08-19 14:53:25 +02:00
Dominik Schürmann 9474749be1 Decrease iteration count, delayed for 2.9 2014-08-19 14:51:28 +02:00
Dominik Schürmann 26e82afa8e Merge branch 'master' of github.com:open-keychain/open-keychain 2014-08-19 14:46:15 +02:00
Dominik Schürmann c1d05d0ee9 Change criticallity of subpackets after discussion 2014-08-19 14:16:46 +02:00
Dominik Schürmann 4a280f6ba3 Use higher s2k count 2014-08-19 11:11:58 +02:00
Dominik Schürmann d131693bb8 Use SHA512 instead of SHA1 and AES256 instead of CAST5 where possible 2014-08-19 10:58:38 +02:00
Dominik Schürmann b1bde6ead9 Mark packets critical 2014-08-19 10:42:35 +02:00
Dominik Schürmann 2c8bcffff3 add feature to key sig subpacket to indicate that we want MDC 2014-08-19 10:37:27 +02:00
Dominik Schürmann a2b3824556 New preferred hash and symmetric algos, removed SHA-1, 3DES, new ordering 2014-08-19 10:30:44 +02:00
Dominik Schürmann 6ffdafc0e6 Add license headers 2014-08-19 10:01:39 +02:00
Dominik Schürmann c1a265bfd1 certs header design 2014-08-19 10:01:31 +02:00
Dominik Schürmann 638c29792d Header for certs view 2014-08-19 09:52:15 +02:00
Dominik Schürmann a5d34478df Add subkey: at least one flag should be selected! 2014-08-18 11:13:52 +02:00
Dominik Schürmann 3e7ce0008f Fixes for expiry UI 2014-08-18 11:02:41 +02:00
Dominik Schürmann f206902002 Fixing date picker issues 2014-08-16 16:17:46 +02:00
Dominik Schürmann ccf58a92fa Fix flags UI in add subkey dialog 2014-08-16 13:42:55 +02:00
Dominik Schürmann c1f9c5e4b5 Fix ElGamal key creation, SUBKEY_BINDING cert must use algo of master key 2014-08-16 13:30:13 +02:00
Dominik Schürmann 4d698c896a Fix expiry when adding subkeys 2014-08-16 12:28:49 +02:00
Dominik Schürmann 474fc50b80 Always return a SaveKeyringResult from saving 2014-08-16 12:24:46 +02:00
Dominik Schürmann 188eeb79c9 Fix and simplify in OperationResultParcel 2014-08-16 12:13:30 +02:00
Dominik Schürmann bbe986743c API: Allow ACTION_SIGN_AND_ENCRYPT with no key ids or user ids extras, fix pre-selection of key ids (no revoked or expired ones, also select duplicates), refactor text using spannables 2014-08-16 05:28:51 +02:00
Dominik Schürmann 443170b876 do not pre-select revoked or expired keys 2014-08-16 04:11:39 +02:00
Dominik Schürmann 8d60d9f103 Fix encrypt only 2014-08-16 03:59:58 +02:00