Commit Graph

4139 Commits

Author SHA1 Message Date
Dominik Schürmann bfc57aefa5 Use snackbar lib from maven repo 2015-05-10 03:39:19 +02:00
Dominik Schürmann e14a2efcad Fixes and clarifications to app signature (or better certificate) pinning 2015-05-10 03:31:19 +02:00
Dominik Schürmann 6e326fb000 Add self-encrypt for old API 2015-05-10 03:00:42 +02:00
Dominik Schürmann b1ccfc6276 Merge pull request #1270 from adithyaphilip/linked-contact-crash
Fixed sync on key import, crash for 'me' linked contact
2015-05-09 18:17:37 +02:00
Adithya Abraham Philip 797cd28997 fixed sync on key import, 'me' linked contact crash 2015-05-08 19:05:21 +05:30
Dominik Schürmann 64a85721cb Update contrib section in README 2015-05-08 12:54:04 +02:00
Dominik Schürmann 63022aa96a Version 3.2 2015-05-06 14:32:17 +02:00
Dominik Schürmann dbff510783 Add screenshots 2015-05-06 14:22:53 +02:00
Dominik Schürmann dad19454e9 Pull from transifex 2015-05-06 14:04:03 +02:00
Dominik Schürmann c0c35d383e Update function graphic 2015-05-06 14:03:52 +02:00
Dominik Schürmann 13dff41350 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-05-06 13:56:36 +02:00
Dominik Schürmann 5ba071c61b Update openpgp-api lib 2015-05-06 13:55:40 +02:00
Vincent Breitmoser 91d500b20d check for fingerprint of any subkey (arguable?) 2015-05-06 11:26:01 +02:00
Dominik Schürmann a45aaa2277 Fix import of keyring with pub+sec key with same key id 2015-05-06 04:10:27 +02:00
Dominik Schürmann d2998ea80d Rename for consistency 2015-05-06 03:37:57 +02:00
Dominik Schürmann 8de6589c9d Renaming for consisitency 2015-05-06 03:29:04 +02:00
Dominik Schürmann f102ae5da5 Move error overlay into generalized DecryptFragment, better error handling in DecryptTextActivity 2015-05-06 03:26:42 +02:00
Dominik Schürmann 9c0187c6b4 Remove reference to deleted API Demo 2015-05-06 00:33:45 +02:00
Dominik Schürmann afc91fb918 Switch to new library repos 2015-05-06 00:08:04 +02:00
Dominik Schürmann f87d21a661 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-05-05 09:27:07 +02:00
Dominik Schürmann e3f5c6d01e Cleanup manifest 2015-05-05 09:26:57 +02:00
Dominik Schürmann 855b8c4ef9 Fix nullpointer in file decryption 2015-05-05 09:05:39 +02:00
Dominik Schürmann 9bf01bad14 Merge pull request #1235 from wfaulk/replacement_extra
Fix Bluetooth share without breaking others
2015-05-04 23:33:32 +02:00
William Faulk aba9c884ce revert unneeded changes for short key ID 2015-05-04 17:15:51 -04:00
William Faulk 7e7892ff2e revert unneeded changes for old temp Bluetooth share file 2015-05-04 17:15:10 -04:00
William Faulk 44b47e185d use single file extension 2015-05-04 17:09:59 -04:00
William Faulk eabc6cd8d4 use TemporaryStorageProvider for Bluetooth Share 2015-05-04 16:49:30 -04:00
William Faulk af1809eebc Use FILE_EXTENSION constants 2015-05-04 16:46:16 -04:00
William Faulk be3e52884f Use primary user ID for filename instead of short key ID 2015-05-04 16:46:15 -04:00
William Faulk 6383d19dd3 Wrap EXTRA_REPLACEMENT_EXTRAS section so it only runs on Lollipop or greater 2015-05-04 16:46:15 -04:00
William Faulk b06e7cd737 Fix Bluetooth share without breaking others 2015-05-04 16:46:15 -04:00
Dominik Schürmann 291f95db5a Fix revoked/expired state in decrypt activity 2015-05-04 21:13:07 +02:00
Dominik Schürmann 2583f77f07 Fix cancel/skip in create key wizard 2015-05-04 20:47:19 +02:00
Dominik Schürmann f3090f2939 Display notify above keyboard in CreateKeyEmailFragment 2015-05-04 15:34:48 +02:00
Dominik Schürmann 2cd1cf9192 Fix email pattern 2015-05-04 15:27:19 +02:00
Dominik Schürmann 9698cb94e3 Merge branch 'Hiperzone-development' into development 2015-05-04 14:56:11 +02:00
Dominik Schürmann e1ca612bc4 Use more simple email validation regex 2015-05-04 14:55:56 +02:00
Dominik Schürmann 520f9abea3 Merge branch 'development' of https://github.com/Hiperzone/open-keychain into Hiperzone-development
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyEmailFragment.java
2015-05-04 14:42:21 +02:00
Dominik Schürmann 045ea93ee1 Merge branch 'manojkhannakm-development' into development 2015-05-04 14:30:12 +02:00
Dominik Schürmann eb9019c78c Temporary fix for gradle dependency bug 2015-05-04 14:29:47 +02:00
Dominik Schürmann dedda1603c Fix dublicated code in CreateKeyEmailFragment 2015-05-04 14:19:16 +02:00
Dominik Schürmann 39c610c2d1 Merge branch 'development' of https://github.com/manojkhannakm/open-keychain into manojkhannakm-development 2015-05-04 14:18:10 +02:00
Dominik Schürmann b726dea244 license header for PgpCertifyOperation 2015-05-04 14:12:42 +02:00
Dominik Schürmann 51bb96742f Apply patch from https://github.com/open-keychain/open-keychain/issues/1222#issuecomment-98582938 2015-05-04 14:01:34 +02:00
Dominik Schürmann 4e425495e6 Apply patch from https://github.com/open-keychain/open-keychain/issues/1240 with db upgrade 2015-05-04 13:57:43 +02:00
Dominik Schürmann 02e86c90b6 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-05-04 13:31:38 +02:00
Dominik Schürmann 6ba4160786 Merge pull request #1238 from wfaulk/fix-tests
updated robolectric to support new android support libs
2015-05-04 13:29:43 +02:00
William Faulk 971ceb07d4 updated robolectric to support new android support libs 2015-05-03 14:06:01 -07:00
Dominik Schürmann aa68c41f5a Fix yubikey strings 2015-05-01 14:48:57 +02:00
Dominik Schürmann f3870cee29 More nullpointer fixes 2015-05-01 14:44:40 +02:00