From b757cba521da818a95f18419eb1685462ea7dbd7 Mon Sep 17 00:00:00 2001 From: Ricki Hirner Date: Fri, 2 Sep 2016 12:21:11 +0200 Subject: [PATCH] README changes --- README.md | 2 +- app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java | 3 --- cert4android | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 0bb7e5d0..fe6cd066 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ Help and discussion: [DAVdroid forums](https://davdroid.bitfire.at/forums) Parts of DAVdroid have been outsourced into these libraries: +* [cert4android](https://gitlab.com/bitfireAT/cert4android) – custom certificate management * [dav4android](https://gitlab.com/bitfireAT/dav4android) – WebDAV/CalDav/CardDAV framework * [ical4android](https://gitlab.com/bitfireAT/ical4android) – iCalendar processing and Calendar Provider access * [vcard4android](https://gitlab.com/bitfireAT/vcard4android) – VCard processing and Contacts Provider access @@ -28,7 +29,6 @@ Those libraries are used by DAVdroid (alphabetically): * [dnsjava](http://www.xbill.org/dnsjava/) – [BSD License](http://www.xbill.org/dnsjava/dnsjava-current/LICENSE) * [ez-vcard](https://code.google.com/p/ez-vcard/) – [New BSD License](http://opensource.org/licenses/BSD-3-Clause) * [iCal4j](http://ical4j.sourceforge.net/) – [New BSD License](http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE) -* [MemorizingTrustManager](https://github.com/ge0rg/MemorizingTrustManager) – [MIT License](https://raw.githubusercontent.com/ge0rg/MemorizingTrustManager/master/LICENSE.txt) * [okhttp](https://square.github.io/okhttp/) – [Apache License, Version 2.0](https://square.github.io/okhttp/#license) * [Project Lombok](http://projectlombok.org/) – [MIT License](http://opensource.org/licenses/mit-license.php) * [SLF4J](http://www.slf4j.org/) – [MIT License](http://www.slf4j.org/license.html) diff --git a/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java b/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java index 132120cf..242f0cfa 100644 --- a/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java +++ b/app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java @@ -89,9 +89,6 @@ public class AboutActivity extends AppCompatActivity { ), new ComponentInfo( "ical4j", "2.x", "https://ical4j.github.io/", "Ben Fortuna", R.string.about_license_info_no_warranty, "bsd-3clause.html" - ), new ComponentInfo( - "MemorizingTrustManager", null, "https://github.com/ge0rg/MemorizingTrustManager", - "Georg Lukas", R.string.about_license_info_no_warranty, "mit.html" ), new ComponentInfo( "OkHttp", null, "https://square.github.io/okhttp/", "Square, Inc.", R.string.about_license_info_no_warranty, "apache2.html" diff --git a/cert4android b/cert4android index e8220930..a0570cb4 160000 --- a/cert4android +++ b/cert4android @@ -1 +1 @@ -Subproject commit e8220930201f34bc3f8a371b3df8cfdecff4e249 +Subproject commit a0570cb416ae586fbdc8c2f7383d89966b53d62e