moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-23 06:12:20 -05:00
Code Issues Releases Wiki Activity
4,268 Commits 12 Branches 24 Tags
Commit Graph

4268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Breitmoser
20a6c5ce8a Version 3.2.1 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJVTz9/AAoJEHGMBwEAASKCRxoH/0IqEXg79Hu2Q+XHzfxNl01W
 ork+6qHRG6AaKaYv5xEgj2CFwG/HSpVGbTR+3ahn28d9UMgh05vSRR2Jh2qkSMCb
 owEVMlHopQkWKqLEsXcbkdMQxDqdVTUeLJcldxR2+B7CM1orZr6VLSU6rDVvHLq1
 kPBAsk74cNg8svjfRFC4GdveWGNOnhUY267kVi7TFOhOIhX2ujbfY1ovJK7Zt5Ft
 qCg2/TY2tWDZUkJ3RIhwrBVUo6lvMNZ5r0cjkualBOe3qNZqejXt6IwEjZZR9vLA
 YkICjSF6DaLpTR97WucMKN2zqe4Gv4jWhYP4q+2OqrbJSUwbqxAsTahlyQXxht4=
 =YRwH
 -----END PGP SIGNATURE-----

Merge tag 'v3.2.1' into linked-identities

Version 3.2.1

Conflicts:
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
	OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml
	OpenKeychain/src/main/res/values/strings.xml
 2015-05-11 17:28:34 +02:00
Vincent Breitmoser
92ac2ded10 linked-ids: small compatibility changes 2015-05-11 17:00:45 +02:00
Dominik Schürmann
5c44f84009 3.2.1 v3.2.1 2015-05-10 13:16:37 +02:00
Dominik Schürmann
a35594201a Fixing rotate crashes in create key 2015-05-10 13:16:03 +02:00
Dominik Schürmann
e4b7920edc Fix crash with v3 key fingerprints 2015-05-10 12:11:35 +02:00
Dominik Schürmann
0a29f6d3ac Cleanup 2015-05-10 11:52:39 +02:00
Dominik Schürmann
5b1bf888b4 Reformat manifest 2015-05-10 11:15:10 +02:00
Dominik Schürmann
874da746ea Add dontnote to proguard 2015-05-10 10:44:04 +02:00
Dominik Schürmann
3c0f82970c Workaround for Samsung Android 4.2 bug 2015-05-10 04:58:44 +02:00
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
Vincent Breitmoser
9aff6c7f85 linked-ids: add certificate pinning, pin twitter api cert 2015-05-09 19:27:33 +02:00
Vincent Breitmoser
3600cda3bc linked-ids: rename RawLinkedIdentity to UriAttribute 2015-05-09 19:09:09 +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
Vincent Breitmoser
57f72996e8 linked-ids: rename "cookie" to "token" 2015-05-09 12:29:43 +02:00
Vincent Breitmoser
4378f8f871 linked-ids: code cleanup, handle all lint errors 2015-05-09 12:24:48 +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 v3.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
Vincent Breitmoser
39382e978f check for fingerprint of any subkey (arguable?) 2015-05-06 11:25:29 +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