Commit Graph
100 Commits
Author SHA1 Message Date
Dominik Schürmann bb0d04de82 Fix for user ids in API 2014-09-07 20:09:36 +02:00
Dominik Schürmann cfe20d89ea Update API lib 2014-09-07 19:23:55 +02:00
Dominik Schürmann 4c2419642b Remove SelectSecretKey, not used anymore 2014-09-07 19:18:19 +02:00
Dominik Schürmann 6c3f6dc74a Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-07 19:01:28 +02:00
Dominik Schürmann ef30d842d8 API fixes 2014-09-07 18:59:56 +02:00
Dominik Schürmann 857fc43873 Update and fix Intent API 2014-09-07 18:50:58 +02:00
Dominik Schürmann a9644cab07 Update Intent API 2014-09-07 18:31:52 +02:00
Dominik Schürmann 65a0a0e34f Make Intent API as recommended in http://developer.android.com/guide/components/intents-filters.html 2014-09-07 18:26:43 +02:00
Dominik Schürmann d172058150 Due to compatiblity switch from SHA512 to SHA256 2014-09-07 17:58:28 +02:00
Dominik Schürmann c026dac8fc Remove table layout, use hint text for edit fields 2014-09-07 17:27:25 +02:00
Dominik Schürmann 1f477c8059 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-07 17:09:54 +02:00
Dominik Schürmann 94a47719ae Put quotes around all strings, should fix transifex consistency problems, also see http://developer.android.com/guide/topics/resources/string-resource.html (scroll down to Escaping apostrophes and quotes) 2014-09-07 17:09:46 +02:00
Dominik Schürmann 3ba2e0b0c1 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-07 17:01:07 +02:00
Dominik Schürmann d1e08f9305 Two buttons to encrypt files and text, some fixes 2014-09-07 17:00:58 +02:00
Dominik Schürmann 02663de191 Better symmetric encryption layout 2014-09-07 16:14:48 +02:00
Dominik Schürmann 27772d401c Save account on back press and with notify 2014-09-07 16:10:28 +02:00
Dominik Schürmann 0e83df21cf More UI rework 2014-09-07 15:30:32 +02:00
Dominik Schürmann 0706005732 Fix width for encrypt to 2014-09-07 11:52:02 +02:00
Dominik Schürmann 0d1c9f7745 Remove file menu items from text activity 2014-09-06 18:06:48 +02:00
Dominik Schürmann 05a29a1f8f No inception with APG 2014-09-06 18:05:06 +02:00
Dominik Schürmann cc14119425 Fix AndroidManifest for new encrypt activities 2014-09-06 17:55:19 +02:00
Dominik Schürmann f2f1a9516d Share helper 2014-09-06 17:39:00 +02:00
Dominik Schürmann 59f32c4fca Drawer nav method cleanup 2014-09-06 16:36:58 +02:00
Dominik Schürmann 30978384af Remove unused gmail clearup method 2014-09-06 16:28:31 +02:00
Dominik Schürmann 6e3973e26a Add experimental support for yubikey PINs, remove caching of empty passphrases 2014-09-05 20:04:07 +02:00
Dominik Schürmann fa9bbdd60c Add yubikey default PIN preference 2014-09-05 19:40:04 +02:00
Dominik Schürmann 2a9b083012 Safeslinger: icon, about info 2014-09-04 21:12:25 +02:00
Dominik Schürmann e40dc48da3 Update safeslinger lib 2014-09-04 20:54:48 +02:00
Dominik Schürmann 8cf4e25320 Safeslinger: more simplification 2014-09-04 14:59:39 +02:00
Dominik Schürmann 7b51718c92 Safeslinger: cleanup 2014-09-04 14:56:30 +02:00
Dominik Schürmann b1c3bfa157 Safeslinger: get all bytes 2014-09-04 14:34:59 +02:00
Dominik Schürmann 4872fd5b2d Use bytes to share via safeslinger, import on result 2014-09-04 13:44:01 +02:00
Dominik Schürmann d0f46f1efb Integrate safeslinger share 2014-09-04 12:54:16 +02:00
Dominik Schürmann 10e96dff43 Add safeslinger to build 2014-09-04 11:30:36 +02:00
Dominik Schürmann dece50244b Add safeslinger submodule 2014-09-04 11:23:23 +02:00
Dominik Schürmann 46d45ebd67 Fix mAllowedKeyIds 2014-09-03 18:05:30 +02:00
Dominik Schürmann 35962cd254 Fix possible nullpointer in AppsListFragment 2014-09-02 23:13:59 +02:00
Dominik Schürmann 65da538a15 Fix strings 2014-09-02 18:52:28 +02:00
Dominik Schürmann e2d51b86f5 If no key flags subpacket is present allow all key flags, fixes mailvelope keys 2014-09-02 17:16:04 +02:00
Dominik Schürmann b08aa132e0 Remove version 3 checks, no longer supported in import 2014-09-02 16:42:07 +02:00
Dominik Schürmann fe2c17cdeb Pull from transifex 2014-09-02 14:11:10 +02:00
Dominik Schürmann eb33d314c8 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-09-02 13:51:17 +02:00
Dominik Schürmann 0c437acd43 Catch security exception, known problem... 2014-09-02 13:51:09 +02:00
Dominik Schürmann b547258df6 Add testkey for gnupg generated divert-to-card key with Yubikey NEO 2014-09-02 11:25:05 +02:00
Dominik Schürmann 42acb12059 Fix transifex linebreaks by adding apostrophs to strings with linebreaks 2014-09-01 16:00:50 +02:00
Dominik Schürmann a64443e71f Experimental support for revoked, expired keys with signatures 2014-09-01 00:14:59 +02:00
Dominik Schürmann 40e6b24b14 Prepare API for OpenPgpSignatureResult extensions 2014-08-31 23:50:04 +02:00
Dominik Schürmann 0fc1a09bfc Version 2.9 2014-08-31 22:20:02 +02:00
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