Commit Graph
100 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
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
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
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
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
Dominik Schürmann e91dc022fb Fix nullpointer in EncryptKeyCompletionView 2015-05-01 14:36:22 +02:00
Dominik Schürmann 5ad50b99a2 Remove time from key creation display 2015-04-30 19:02:33 +02:00
Dominik Schürmann c88d2e42b7 Fix key creation string and display 2015-04-30 18:57:51 +02:00
Dominik Schürmann 7c275fed9d API: Allow selection of decryption keys when decryption fails 2015-04-30 18:45:43 +02:00
Dominik Schürmann f623411fb6 Update snackbar 2015-04-30 00:59:57 +02:00
Dominik Schürmann 14921e783f Update wrapper to verify local cache 2015-04-29 22:56:49 +02:00
Dominik Schürmann 41968206d3 Use own gradle wrapper to verify downloaded gradle package via SHA-256 sum. See https://github.com/gradle/gradle/pull/448 2015-04-29 20:43:46 +02:00
Dominik Schürmann db59cd0bbf Merge pull request #1233 from wfaulk/readme
Update README.md with new build info
2015-04-29 01:27:34 +02:00
Dominik Schürmann 2b6bb57c1c Display development build status 2015-04-28 11:06:54 +02:00
Dominik Schürmann 9eb98f6eb7 Merge pull request #1225 from vectorijk/SwitchToMaterialDrawer
update lib MaterialDrawer to latest(2.8.2)
2015-04-26 01:38:18 +02:00
Dominik Schürmann 4c74dbe11e UI fixes for Android < 5 2015-04-26 01:28:29 +02:00
Dominik Schürmann 4732bc5744 Remove unused decrypt result layout 2015-04-26 00:36:37 +02:00
Dominik Schürmann c442d3bd0d Put decrypt result in toolbar, some ui fixes for decrypt 2015-04-26 00:33:26 +02:00
Dominik Schürmann f1f0126048 Switch to new support lib version 22.1 2015-04-25 23:40:26 +02:00
Dominik Schürmann 5d6eb2930c Update in-app contributor list 2015-04-25 15:10:15 +02:00
Dominik Schürmann 64ca19464b Set different titles when changing in nav drawer 2015-04-25 14:37:55 +02:00
Dominik Schürmann 28da731201 Fix empty screen when clicking on encrypt in details view 2015-04-25 14:15:38 +02:00
Dominik Schürmann f8af6e3387 Update lib section in about 2015-04-25 14:09:55 +02:00
Dominik Schürmann 933d5402a2 Remove old navigation drawer dependency 2015-04-25 14:06:53 +02:00
Dominik Schürmann de575a618a Merge pull request #1220 from vectorijk/SwitchToMaterialDrawer
Switch to MaterialDrawer library
2015-04-25 13:59:56 +02:00
Dominik Schürmann 702c28854b Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-04-22 19:00:47 +02:00
Dominik Schürmann a4e871030d Update changelog 2015-04-22 19:00:18 +02:00
Dominik Schürmann a244a58b5a Merge pull request #1218 from manojkhannakm/development
Fixed Snackbar behind layout
2015-04-22 15:57:45 +02:00
Dominik Schürmann 43484c8236 Merge pull request #1214 from adithyaphilip/keyserver-verification
Verifying Newly Added Keyservers
2015-04-22 13:13:36 +02:00
Dominik Schürmann b0c87e2372 Merge pull request #1212 from adithyaphilip/qr-result
Corrected possible null pointer with key import
2015-04-22 01:04:22 +02:00
Dominik Schürmann 713f6ba6c7 Simplify ImportKeysProxyActivity 2015-04-21 20:15:10 +02:00
Dominik Schürmann 7d273ecfa6 Merge branch 'development' of github.com:open-keychain/open-keychain into development 2015-04-21 20:09:52 +02:00
Dominik Schürmann b0efee2526 Merge pull request #1209 from adithyaphilip/qr-result
Make Logs not Toasts - Fixes Issue #1198
2015-04-21 20:09:31 +02:00
Dominik Schürmann 71aeffdfc8 Merge pull request #1207 from adithyaphilip/register-keyserver-urls
support for handling keyserver urls from browser, added documentation
2015-04-20 18:33:45 +02:00
Dominik Schürmann 7a097dd5df Cleanup in HkpKeyserver 2015-04-20 13:53:00 +02:00
Dominik Schürmann f2d3abd4c9 Format KeyListFragment 2015-04-18 16:52:02 +02:00
Dominik Schürmann 555b0bf757 Temporarily fix devices without nfc 2015-04-18 16:50:52 +02:00
Dominik Schürmann baac30508d Graphic stuff 2015-04-17 17:30:03 +02:00
Dominik Schürmann 413c4bce59 Use https for zxing lib 2015-04-17 17:29:45 +02:00
Dominik Schürmann b440456acc Use portrait mode for qr code scanning 2015-04-15 10:25:56 +02:00
Dominik Schürmann e332699c9c More cleanup 2015-04-15 10:10:53 +02:00
Dominik Schürmann 3668c8897d Fix YubiKey naming, cleanup 2015-04-15 10:02:41 +02:00
Dominik Schürmann f41758261f Clean up NfcOperationActivity 2015-04-15 09:55:29 +02:00
Dominik Schürmann 84deba9886 Reformat nfcVerifyPIN 2015-04-15 09:50:34 +02:00
Dominik Schürmann 284ae594bb Merge pull request #1200 from josecastillo/development
Fix for NFC signing operations: move PIN verify inside sign/decrypt operation and set correct mode.
2015-04-15 09:49:09 +02:00
Dominik Schürmann ddeb88e72a Contribution info 2015-04-14 17:46:10 +02:00
Dominik Schürmann 789a320127 Contribution info 2015-04-14 17:44:48 +02:00
Dominik Schürmann 66554607d0 Remove unused includes in settings.gradle 2015-04-14 09:37:17 +02:00
Dominik Schürmann 191784bf4b Update libs 2015-04-14 00:48:45 +02:00
Dominik Schürmann a545d50f4b Pull from transifex 2015-04-14 00:40:28 +02:00
Dominik Schürmann b288e5f4fe Update html-textview, fix build 2015-04-14 00:06:05 +02:00
Dominik Schürmann 71024460cb Reformat comment in PassphraseCacheService 2015-04-13 23:53:46 +02:00
Dominik Schürmann 1923942fc9 Buffer ascii armored encryption/signatures 2015-04-13 23:41:16 +02:00
Dominik Schürmann f12c7b64d8 Merge pull request #1193 from adithyaphilip/auto-refresh-contacts
Immediate display of contact card, fixed contact picture display issue, hides card if no contact
2015-04-13 23:33:23 +02:00
Dominik Schürmann 256d644d03 IMplement CryptoInputParcelCacheService 2015-04-13 23:29:35 +02:00
Dominik Schürmann 9fc001c9b9 Clearer var naming 2015-04-12 21:23:59 +02:00
Dominik Schürmann 4a55308741 More simplifications to PassphraseCacheService 2015-04-12 20:12:10 +02:00
Dominik Schürmann c3d6637e6a Simplify PassphraseCacheService 2015-04-12 19:55:10 +02:00
Dominik Schürmann fd09b9d380 Remove html-textview reference from settings.gradle 2015-04-12 18:39:37 +02:00
Dominik Schürmann 2512d3007e Switch to html-textview from JCenter 2015-04-12 18:13:03 +02:00
Dominik Schürmann f442565896 Update api lib 2015-04-10 17:36:34 +02:00
Dominik Schürmann 7074b44347 Cache CryptoInputParcel in OpenPgpService 2015-04-10 15:58:37 +02:00
Dominik Schürmann 5ea01a15d3 Remove unused AlgorithmNames 2015-04-10 15:21:02 +02:00
Dominik Schürmann ae4fc47443 Add license headers 2015-04-10 15:20:36 +02:00
Dominik Schürmann 702a77ccd1 Externalize Parcelable caching 2015-04-10 15:16:13 +02:00
Dominik Schürmann a467480717 Fix signing subkey selection in remote service 2015-04-07 13:49:34 +02:00