Commit Graph

87 Commits

Author SHA1 Message Date
Sam Whited fdc10c794f Fix typo in subtree merge directions 2014-10-28 12:26:41 -04:00
Sam Whited f7f4c79419 Add subtree merge directions to README 2014-10-28 12:24:25 -04:00
Sam Whited e3f4742ed8 Version 5, compatible with OpenKeychain 2.9.1
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQEcBAABAgAGBQJUDaeBAAoJEHGMBwEAASKCBAEH/iu7405Mim34yjZzUyHrREPq
 soQoQEr2f3A8FnEQDX+q4RhTEGG3WNzw9FDcf4Aot6d1dyL6DZMy/AaslQyAPNSf
 AlFyQ36YU44BwgTsHxjxgQ2Vdiff2tfS8wK6He4wGfC48WFvpMeD9VIwHTwtT37F
 RW011BBshlcd3fVX7qVdiQ/TKJsKTy4+LmJhf3UsZ7McZ5hkmkA+HwoHb+B+NEQN
 UMhdFeMrK/GKEY1ALmm1Dv6DRO7AKGOmmrQ24/ciHD4DF/0OkUP5tISRRZfG/oRn
 J+gYBH3FcJy4tb9pLDFDGLB/OpX1kulPLEeUlQrV98guD2hV3KBYVZ0Hs0Bqqdk=
 =wKIt
 -----END PGP SIGNATURE-----

Subtree merged in openpgp api lib
2014-10-28 12:16:35 -04:00
Sam Whited 4a1bae3a69 Subtree merged in minidns 2014-10-28 12:14:21 -04:00
Sam Whited ccba01ef19 Remove minidns dir 2014-10-28 12:13:53 -04:00
Sam Whited 41d2e72be7 Subtree merged in MemorizingTrustManager 2014-10-28 12:11:51 -04:00
Sam Whited 89c294af11 Don't use submodules 2014-10-28 12:07:04 -04:00
Sam Whited b888967b35 Set the root project name 2014-10-26 10:58:50 -04:00
Sam Whited ef25720f0f Include build number in output of release builds 2014-10-26 10:22:37 -04:00
Sam Whited 4024136b1c Use full URI for android application Gradle plugin 2014-10-26 10:14:38 -04:00
Sam Whited b82a0e6528 Remove useless include from Gradle settings 2014-10-26 10:13:16 -04:00
Sam Whited a6d0042e5c Move submodules back to libs/ 2014-10-26 09:54:41 -04:00
Sam Whited 90898ec3d4 Add some logic for signing releases 2014-10-26 09:11:28 -04:00
Sam Whited c83e49d1b8 Update otr4j to 0.21 2014-10-26 09:05:12 -04:00
Sam Whited 7f484513be Pull otr4j form Maven repo 2014-10-26 08:54:41 -04:00
Sam Whited 5e3b713286 Add non-project files back 2014-10-22 18:26:47 -04:00
Sam Whited 5f4b6e39bc Use proguard on release builds
We don't need obfuscation (it's an open source project), but proguard
wil shrink the apk by stripping out unused code.
2014-10-22 18:22:49 -04:00
Sam Whited 1f49e99c46 Suppress lint errors and remove bcprov 2014-10-22 18:17:49 -04:00
Sam Whited bf0c447fec Add proguard rules 2014-10-22 15:49:48 -04:00
Sam Whited 281ce3105f Make conversations the root project 2014-10-22 15:47:11 -04:00
Sam Whited 07b47172a0 Add build deps and move build props to build file 2014-10-22 15:39:53 -04:00
Sam Whited 038f7afd88 Add gradle directory 2014-10-22 12:42:28 -04:00
Sam Whited 64bdd7e731 Use Gradle build system 2014-10-22 12:38:44 -04:00
Dominik Schürmann 0be263d5d3 Work on Yubikey decryption 2014-09-08 14:09:15 +02:00
Dominik Schürmann 2cebac6a23 Fix for user ids in API 2014-09-07 20:07:13 +02:00
Dominik Schürmann ac927df10a Merge branch 'master' of https://github.com/open-keychain/openpgp-api-lib 2014-09-07 19:23:20 +02:00
Dominik Schürmann f6d678cbe5 Fix nullpointer with new OpenPgpSignatureResult version 2014-09-07 19:23:04 +02:00
Dominik Schürmann ec234ebf01 Pull from transifex 2014-09-04 01:28:06 +02:00
Dominik Schürmann 9dd15131e1 Update README 2014-09-02 16:12:35 +02:00
Dominik Schürmann bba03f2f2f Update README 2014-09-02 16:11:46 +02:00
Dominik Schürmann 3bcf7266c3 Update README 2014-09-02 16:11:07 +02:00
Dominik Schürmann 8b36d28668 Changelog 2014-08-31 23:49:34 +02:00
Dominik Schürmann 575b9d2279 Add userIds to OpenPgpSignatureResult 2014-08-31 23:48:21 +02:00
Dominik Schürmann eda2470c4d Merge branch 'master' of https://github.com/open-keychain/openpgp-api-lib 2014-08-31 23:39:59 +02:00
Dominik Schürmann e0be0f648a Add SIGNATURE_KEY_REVOKED, SIGNATURE_KEY_EXPIRED, rename SIGNATURE_PUB_KEY_UNKNOWN 2014-08-31 23:39:56 +02:00
Dominik Schürmann fb3c754ea8 Merge pull request #1 from Flowdalic/flow
Add my Real-name to the Copyright statement
2014-08-30 18:56:17 +02:00
Florian Schmaus d15482c22a Add my Real-name to the Copyright statement
of ParcelFileDescriptorUtil.
2014-08-30 15:19:43 +02:00
Dominik Schürmann 1d0eeef047 Use application context 2014-08-12 15:03:00 +02:00
Dominik Schürmann 9e1f732b23 More fixes for OpenPgpServiceConnection 2014-08-12 14:38:28 +02:00
Dominik Schürmann cbfeb90cec Refactor OpenPgpServiceConnection with better callback 2014-08-12 13:46:34 +02:00
Dominik Schürmann 940a1d8eeb Add EXTRA_ORIGINAL_FILENAME 2014-08-11 23:56:25 +02:00
Dominik Schürmann 777d22d75d Rename to OpenPgpMetadata 2014-08-11 21:26:34 +02:00
Dominik Schürmann 9aa5f23788 Support mime type in metadata 2014-08-11 20:16:30 +02:00
Dominik Schürmann 6bec5eedde Increase version to 4 2014-08-11 17:19:23 +02:00
Dominik Schürmann 4f6475f11b Add metadata parcel 2014-08-11 17:12:02 +02:00
Dominik Schürmann fab79b605f Lint fixes 2014-08-04 17:10:29 +02:00
Rene Treffer 9e42bff014 Allow mdns multicast / unicast reply queries 2014-07-30 22:38:02 +02:00
Rene Treffer 858251d52c Remove System.out code 2014-07-30 22:37:09 +02:00
Rene Treffer 64f25e1783 Fix style on build.gradle 2014-07-30 22:29:16 +02:00
Dominik Schürmann e515a49027 Update gradle plugin to 0.12.2 2014-07-27 18:28:20 +02:00