From 4c05dd1e45e2402d657ce9e958762107e0e9ab13 Mon Sep 17 00:00:00 2001 From: rfc2822 Date: Sat, 29 Mar 2014 22:32:51 +0100 Subject: [PATCH] Version bump to 0.5.11-alpha --- AndroidManifest.xml | 4 ++-- README.md | 14 ++++++++------ res/values-de/strings.xml | 14 ++++++++------ res/values/strings.xml | 12 +++++++----- src/at/bitfire/davdroid/Constants.java | 2 +- .../davdroid/webdav/TlsSniSocketFactory.java | 4 +--- 6 files changed, 27 insertions(+), 23 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2318d9a1..4bed1b05 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="34" + android:versionName="0.5.11" android:installLocation="internalOnly"> -

Übersetzungen: Französisch von Unbekannt, Spanisch von @xphnx

+

Übersetzungen: Französisch von Unbekannt, Katalanisch von @pokoli, + Spanisch von @xphnx

-

Benutzte Bibliotheken

+

Verwendete Bibliotheken

- * iCal4j (New BSD License)
- * ez-vcard (New BSD License)
- * Simple XML Serialization (Apache License, Version 2.0)
- * Project Lombok (MIT License)

+ * Apache HttpClient (mittels httpclientandroidlib) – Apache License, Version 2.0
+ * iCal4j – New BSD License
+ * ez-vcard – New BSD License
+ * Simple XML Serialization – Apache License, Version 2.0
+ * Project Lombok – MIT License

]]> Konto-Details Kontoname: diff --git a/res/values/strings.xml b/res/values/strings.xml index 5f885d94..80891a07 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -94,14 +94,16 @@ Store, AndroidPit App Center or Amazon Appstore require other terms, the respective terms apply for versions that are downloaded via these services.

-

Translations: French by unknown contributor, Spanish by @xphnx

+

Translations: Catalanian by @pokoli, French by unknown contributor, + Spanish by @xphnx

Used third-party libraries

- * iCal4j (New BSD License)
- * ez-vcard (New BSD License)
- * Simple XML Serialization (Apache License, Version 2.0)
- * Project Lombok (MIT License)

+ * Apache HttpClient (httpclientandroidlib flavour) – Apache License, Version 2.0
+ * iCal4j – New BSD License)
+ * ez-vcard – New BSD License
+ * Simple XML Serialization – Apache License, Version 2.0
+ * Project Lombok – MIT License

]]> Account details diff --git a/src/at/bitfire/davdroid/Constants.java b/src/at/bitfire/davdroid/Constants.java index 7f43c279..80047558 100644 --- a/src/at/bitfire/davdroid/Constants.java +++ b/src/at/bitfire/davdroid/Constants.java @@ -12,7 +12,7 @@ package at.bitfire.davdroid; public class Constants { public static final String - APP_VERSION = "0.5.10.2-alpha", + APP_VERSION = "0.5.11-alpha", ACCOUNT_TYPE = "bitfire.at.davdroid", diff --git a/src/at/bitfire/davdroid/webdav/TlsSniSocketFactory.java b/src/at/bitfire/davdroid/webdav/TlsSniSocketFactory.java index c8c9e98e..6c866d31 100644 --- a/src/at/bitfire/davdroid/webdav/TlsSniSocketFactory.java +++ b/src/at/bitfire/davdroid/webdav/TlsSniSocketFactory.java @@ -38,8 +38,6 @@ public class TlsSniSocketFactory implements LayeredConnectionSocketFactory { private final static SSLCertificateSocketFactory sslSocketFactory = (SSLCertificateSocketFactory) SSLCertificateSocketFactory.getDefault(0); private final static HostnameVerifier hostnameVerifier = new BrowserCompatHostnameVerifier(); - - // Plain TCP/IP (layer below TLS) @Override public Socket createSocket(HttpContext context) throws IOException { @@ -48,7 +46,7 @@ public class TlsSniSocketFactory implements LayeredConnectionSocketFactory { @Override public Socket connectSocket(int timeout, Socket socket, HttpHost host, InetSocketAddress remoteAddr, InetSocketAddress localAddr, HttpContext context) throws IOException { - // we don't need the non-SSL socket + // we'll rather create a new socket socket.close(); // create and connect SSL socket, but don't do hostname/certificate verification yet