diff options
author | Ricki Hirner <hirner@bitfire.at> | 2016-09-02 13:21:11 +0300 |
---|---|---|
committer | Ricki Hirner <hirner@bitfire.at> | 2016-09-02 13:21:11 +0300 |
commit | 65d39862576877cd18f4c47bf7502c39bdb3063f (patch) | |
tree | f31602633b52752cca2d228bad40c637671755ac | |
parent | c350baa8634ac479c26476d28b8fc28a30adf826 (diff) |
README changesv1.3
-rw-r--r-- | README.md | 2 | ||||
-rw-r--r-- | app/src/main/java/at/bitfire/davdroid/ui/AboutActivity.java | 3 | ||||
m--------- | cert4android | 0 |
3 files changed, 1 insertions, 4 deletions
@@ -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 @@ -90,9 +90,6 @@ public class AboutActivity extends AppCompatActivity { "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" ), new ComponentInfo( diff --git a/cert4android b/cert4android -Subproject ec4e75dc9141e97aff250116120b631e0046a96 +Subproject a0570cb416ae586fbdc8c2f7383d89966b53d62 |