cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,465 Commits 1 Branch 0 Tags
08ae9db4eeeecb865943b2b1386b3a845ed4e0fb
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dominik Schürmann 08ae9db4ee Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-31 23:54:11 +02:00
Dominik Schürmann 55b764eb1d Show revoked and expired for private keys 2014-07-31 23:54:02 +02:00
Dominik Schürmann 3451111edd Fix update from keyserver 2014-07-31 23:51:08 +02:00
Dominik Schürmann 3e918a70ea Remove private/secret key language from strings 2014-07-31 23:34:13 +02:00
Dominik Schürmann 97209f9d3d Fixes for upload 2014-07-31 23:31:09 +02:00
Dominik Schürmann 38120ae77c Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-31 23:13:33 +02:00
Dominik Schürmann db70fcfdbf Create key: design fixes 2014-07-31 23:13:29 +02:00
Dominik Schürmann 50aea621ba Fix animations in create key 2014-07-31 21:51:35 +02:00
Dominik Schürmann b9694ae9c5 Add notify layouts to some activities 2014-07-31 21:29:45 +02:00
Dominik Schürmann 38922f96a6 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-31 21:20:16 +02:00
Dominik Schürmann 138d5a1d9c Robots like coffee too... 2014-07-31 21:18:24 +02:00
Dominik Schürmann 7bbe869c88 Parcelable data over 1MB can not be send through binder, parcel into a cache file, fix #592 2014-07-31 20:38:06 +02:00
Dominik Schürmann 279ddf7cbe Handle result in create key 2014-07-31 19:19:11 +02:00
Dominik Schürmann 258bd3a44f Fix string 2014-07-31 19:06:30 +02:00
Dominik Schürmann 80f9c769c0 Keyserver exception translateable 2014-07-31 19:05:09 +02:00
Dominik Schürmann b052d5e89c Smaller notes 2014-07-31 18:42:54 +02:00
Dominik Schürmann aa32c60a0a Even better Exception handling with keyserver queries 2014-07-31 18:07:11 +02:00
Dominik Schürmann cc034a0913 Exception handling with keyserver queries 2014-07-31 17:56:47 +02:00
Dominik Schürmann 9475285013 Better exception handling for import of keys 2014-07-31 17:11:06 +02:00
Dominik Schürmann 1d2c93ca8a More file association hacks for AndroidManifest and key import 2014-07-31 16:15:36 +02:00
Dominik Schürmann 927b120275 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-30 17:47:25 +02:00
Dominik Schürmann 65488cbf05 Create key: work on upload 2014-07-30 17:47:17 +02:00
Dominik Schürmann fcc535a573 Create key: repeat passphrase 2014-07-30 15:29:01 +02:00
Dominik Schürmann 052cdfa392 Create key: upload 2014-07-30 15:19:33 +02:00
Dominik Schürmann e46d72ba27 Fix drawer in key list 2014-07-30 14:59:12 +02:00
Dominik Schürmann 70bfb5c586 return values for create key 2014-07-30 14:57:59 +02:00
Dominik Schürmann cdee62b79d Create key: layout above buttons 2014-07-30 01:13:02 +02:00
Dominik Schürmann 9f9aa79066 Fix conflicts 2014-07-30 01:07:10 +02:00
Dominik Schürmann 43b8170a44 Merge branch 'master' of github.com:open-keychain/open-keychain 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
 2014-07-30 00:58:28 +02:00
Dominik Schürmann 6448de8f6a Create key with fragments 2014-07-30 00:50:53 +02:00
Dominik Schürmann cce243299a Fix build by removing old icon reference 2014-07-28 16:26:06 +02:00
Dominik Schürmann ed6a89f35c Use new icons in other key related activites, delete old icons 2014-07-28 16:10:36 +02:00
Dominik Schürmann 23689da56d Use verified icon for certify action 2014-07-28 12:24:40 +02:00
Dominik Schürmann 730f820c8c Set visibility at last 2014-07-28 11:17:12 +02:00
Dominik Schürmann 3d6edd1190 Use icons in key view 2014-07-28 11:11:23 +02:00
Dominik Schürmann a3045c710e Use new status icons in key list 2014-07-28 09:34:57 +02:00
Dominik Schürmann 0c3b2a6ed4 Smaller status images, green test 2014-07-28 09:10:45 +02:00
Dominik Schürmann b2f7e839e1 Fix resource names, add small test 2014-07-28 01:23:38 +02:00
Dominik Schürmann 61944b9e39 Add icons from ModernPGP project 2014-07-28 01:12:23 +02:00
Dominik Schürmann 6c7e3aee91 Fix background color of notify area 2014-07-27 21:45:48 +02:00
Dominik Schürmann 7e8b056574 cleanup left-overs 2014-07-27 21:44:00 +02:00
Dominik Schürmann 5974dccbea Redesigned QR Code view 2014-07-27 21:40:43 +02:00
Dominik Schürmann 0f87b81158 Load QR Code asynchronously and with a fade in animation 2014-07-27 20:58:25 +02:00
Dominik Schürmann 57d9c7a013 Open keyboard on passphrase dialog, this should now work on all Android versions... hopefully 2014-07-27 20:42:39 +02:00
Dominik Schürmann 97e8faa1dd Make PassphraseCacheService a foreground service 2014-07-27 18:56:23 +02:00
Dominik Schürmann ee307cdf28 Update gradle plugin to 0.12.2 2014-07-27 18:28:54 +02:00
Dominik Schürmann cb3425f947 Update spongycastle 2014-07-27 18:21:39 +02:00
Dominik Schürmann 4eceb5bde1 Merge pull request #720 from artbristol/skip-bc-tests-externally 
Skip spongycastle tests in root project
 2014-07-27 18:13:02 +02:00
Dominik Schürmann 0403cbf11a Prettify buttons 2014-07-27 18:12:14 +02:00
Dominik Schürmann dab540e121 Work on first time wizard design 2014-07-27 17:56:52 +02:00
Dominik Schürmann 9ea5148550 Update libs 2014-07-25 01:34:57 +02:00
Dominik Schürmann 5eb414a22b Program flow fixes 2014-07-25 01:34:29 +02:00
Dominik Schürmann 527c3e93f8 Update README.md 2014-07-19 15:16:45 +02:00
Dominik Schürmann 207870af1d Update README.md 2014-07-19 15:15:31 +02:00
Dominik Schürmann 8385c9c9dd Update README 2014-07-19 15:14:20 +02:00
Dominik Schürmann 94e56a4542 Merge branch 'da-kid-master' 2014-07-18 09:49:51 +02:00
Dominik Schürmann b332aacabb Merge branch 'master' of https://github.com/da-kid/open-keychain into da-kid-master 
Conflicts:
	OpenKeychain/src/test/resources/extern/OpenPGP-Haskell
 2014-07-18 09:49:20 +02:00
Dominik Schürmann 306bea5ee9 Removed OpenPGP-haskell submodule 2014-07-18 09:39:36 +02:00
Dominik Schürmann 3d74a9c11c Add OpenPGP-Haskell test files directly 2014-07-18 09:34:54 +02:00
Dominik Schürmann 82af9672fd Temporary program flow fixes 2014-07-16 10:07:50 +02:00
Dominik Schürmann 77d04a915b Simple create key 2014-07-16 10:05:00 +02:00
Dominik Schürmann 57f5a788fd Simple create key 2014-07-16 10:04:48 +02:00
Dominik Schürmann c1c831e52b New first time screen 2014-07-16 09:49:37 +02:00
Dominik Schürmann d3c54d5f12 Fallback if no primary user id exists 2014-07-16 00:22:45 +02:00
Dominik Schürmann 848043a481 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-15 19:34:01 +02:00
Dominik Schürmann 503b146a14 Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-15 19:22:44 +02:00
Dominik Schürmann 72237a0892 some fixes for edit 2014-07-15 19:22:40 +02:00
Dominik Schürmann e1d505a291 Update README with build instructions for build 2014-07-15 17:51:31 +02:00
Dominik Schürmann 0ce9c13132 Fix strings from 'keys' to 'passphrases' 2014-07-12 21:07:29 +02:00
Dominik Schürmann af5fddab7c Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-12 21:04:57 +02:00
Dominik Schürmann 195f2c25cc Merge pull request #713 from da-kid/master 
Added notification to passphrasecache
 2014-07-12 21:02:19 +02:00
Dominik Schürmann 45dfb39749 more work on edit key 2014-07-12 20:39:23 +02:00
Dominik Schürmann 16498be4a2 Fix nullpointer in API, fix #693 2014-07-08 04:24:27 +02:00
Dominik Schürmann 61d0e12e8a cleanup 2014-07-08 03:37:32 +02:00
Dominik Schürmann daa1f5cf8e Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-08 03:34:53 +02:00
Dominik Schürmann 5adcb7885c Work on subkeys adapter 2014-07-08 03:34:27 +02:00
Dominik Schürmann 3363507be4 Bett API string 2014-07-04 09:52:25 +02:00
Dominik Schürmann 709196f774 Use strings in edit key 2014-07-03 16:49:25 +02:00
Dominik Schürmann e006d4762c Pull from transifex 2014-07-03 16:38:22 +02:00
Dominik Schürmann 9e56e53cf1 Pull from transifex 2014-07-03 16:30:41 +02:00
Dominik Schürmann 3085f0d229 Small strings fix 2014-07-03 16:24:10 +02:00
Dominik Schürmann 1ba41e7482 Remove old edit button, rename activities 2014-07-03 16:21:16 +02:00
Dominik Schürmann bd7b4ccf2b cleanup, debug for passphrase set 2014-07-03 15:58:03 +02:00
Dominik Schürmann 6ca9d8a268 fix no passphrase check 2014-07-03 15:54:07 +02:00
Dominik Schürmann b9d2ae938a Cache passphrase for edit 2014-07-03 15:49:46 +02:00
Dominik Schürmann 2988ac6e7b Cache passphrase for edit 2014-07-03 15:48:46 +02:00
Dominik Schürmann 85dde66804 parcel newPassphrase 2014-07-03 15:28:45 +02:00
Dominik Schürmann 9cbf78f7ad cleanup 2014-07-03 15:24:04 +02:00
Dominik Schürmann 42cc8b687b edit key: subkey adapter 2014-07-03 15:14:06 +02:00
Dominik Schürmann 55f067b063 Work on edit 2014-07-03 15:06:05 +02:00
Dominik Schürmann 8cbdf7b1c5 smaller dropdown items 2014-07-03 08:48:33 +02:00
Dominik Schürmann 3512ac7199 Remove unnecessary error logs 2014-07-02 20:53:16 +02:00
Dominik Schürmann 12db94abca A little bit less purple 2014-07-02 18:59:23 +02:00
Dominik Schürmann 931bfdd9df Update spongycastle 2014-07-02 16:56:38 +02:00
Dominik Schürmann d967c5d864 merge KeychainIntentService 2014-07-02 16:49:21 +02:00
Dominik Schürmann 13a13829a8 fix nullpointer, cleanup 2014-07-02 16:47:12 +02:00
Dominik Schürmann 94a58f3aa8 remove init methods from adapter 2014-07-02 16:33:30 +02:00
Dominik Schürmann 3d34eb8ca4 edit key: work on saving 2014-07-02 15:42:38 +02:00
Dominik Schürmann a66c6b5b7a Merge branch 'master' of github.com:open-keychain/open-keychain 2014-07-02 15:11:13 +02:00
Dominik Schürmann bb39caa28d Add infographic from FSFE 2014-07-02 15:11:06 +02:00