mirror of
https://github.com/etesync/android
synced 2024-11-22 16:08:13 +00:00
Version bump to 0.5.11-alpha
This commit is contained in:
rfc2822
parent
65f7053c02
commit
4c05dd1e45
@ -1,8 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="at.bitfire.davdroid"
|
||||
android:versionCode="33"
|
||||
android:versionName="0.5.10.2" android:installLocation="internalOnly">
|
||||
android:versionCode="34"
|
||||
android:versionName="0.5.11" android:installLocation="internalOnly">
|
||||
|
||||
<uses-sdk
|
||||
android:minSdkVersion="14"
|
||||
|
||||
14
README.md
14
README.md
@ -1,13 +1,15 @@
|
||||
|
||||
Please see the [DAVdroid Web site](http://davdroid.bitfire.at).
|
||||
Please see the [DAVdroid Web site](http://davdroid.bitfire.at) for more information.
|
||||
|
||||
Twitter: https://twitter.com/davdroidapp
|
||||
|
||||
|
||||
USED THIRD-PARTY LIBRARIES
|
||||
==========================
|
||||
|
||||
* [Apache HttpClient](http://hc.apache.org) ([Apache License](http://www.apache.org/licenses/))
|
||||
* [iCal4j](http://ical4j.sourceforge.net/) ([New BSD License](http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE))
|
||||
* [ez-vcard](https://code.google.com/p/ez-vcard/) ([New BSD License](http://opensource.org/licenses/BSD-3-Clause))
|
||||
* [Simple XML Serialization](http://simple.sourceforge.net/) ([Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0))
|
||||
* [Project Lombok](http://projectlombok.org/) ([MIT License](http://opensource.org/licenses/mit-license.php))
|
||||
* [Apache HttpClient](http://hc.apache.org) ([httpclientandroidlib](https://code.google.com/p/httpclientandroidlib/) flavour) – [Apache License](http://www.apache.org/licenses/)
|
||||
* [iCal4j](http://ical4j.sourceforge.net/) – [New BSD License](http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE)
|
||||
* [ez-vcard](https://code.google.com/p/ez-vcard/) – [New BSD License](http://opensource.org/licenses/BSD-3-Clause)
|
||||
* [Simple XML Serialization](http://simple.sourceforge.net/) – [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0)
|
||||
* [Project Lombok](http://projectlombok.org/) – [MIT License](http://opensource.org/licenses/mit-license.php)
|
||||
|
||||
|
||||
@ -88,14 +88,16 @@
|
||||
Sofern Google Play oder Samsung Store andere Bedingungen benötigen, gelten für über den jeweiligen Markt heruntergeladene
|
||||
Apps diese Bedingungen.</p>
|
||||
|
||||
<p>Übersetzungen: Französisch von Unbekannt, Spanisch von <a href="https://github.com/xphnx">@xphnx</a></p>
|
||||
<p>Übersetzungen: Französisch von Unbekannt, Katalanisch von <a href="https://github.com/pokoli">@pokoli</a>,
|
||||
Spanisch von <a href="https://github.com/xphnx">@xphnx</a></p>
|
||||
|
||||
<h2>Benutzte Bibliotheken</h2>
|
||||
<h2>Verwendete Bibliotheken</h2>
|
||||
<p>
|
||||
* <a href="http://ical4j.sourceforge.net/">iCal4j<a> (<a href="http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE">New BSD License</a>)<br/>
|
||||
* <a href="https://code.google.com/p/ez-vcard/">ez-vcard</a> (<a href="http://opensource.org/licenses/BSD-3-Clause">New BSD License</a>)<br/>
|
||||
* <a href="http://simple.sourceforge.net/">Simple XML Serialization</a> (<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>)<br/>
|
||||
* <a href="http://projectlombok.org/">Project Lombok</a> (<a href="http://opensource.org/licenses/mit-license.php">MIT License</a>)</p>
|
||||
* <a href="http://hc.apache.org">Apache HttpClient</a> (mittels <a href="https://code.google.com/p/httpclientandroidlib/">httpclientandroidlib</a>) – <a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a><br/>
|
||||
* <a href="http://ical4j.sourceforge.net/">iCal4j<a> – <a href="http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE">New BSD License</a><br/>
|
||||
* <a href="https://code.google.com/p/ez-vcard/">ez-vcard</a> – <a href="http://opensource.org/licenses/BSD-3-Clause">New BSD License</a><br/>
|
||||
* <a href="http://simple.sourceforge.net/">Simple XML Serialization</a> – <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
|
||||
* <a href="http://projectlombok.org/">Project Lombok</a> – <a href="http://opensource.org/licenses/mit-license.php">MIT License</a></p>
|
||||
]]></string>
|
||||
<string name="account_details">Konto-Details</string>
|
||||
<string name="account_name">Kontoname:</string>
|
||||
|
||||
@ -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.</p>
|
||||
|
||||
<p>Translations: French by unknown contributor, Spanish by <a href="https://github.com/xphnx">@xphnx</a></p>
|
||||
<p>Translations: Catalanian by <a href="https://github.com/pokoli">@pokoli</a>, French by unknown contributor,
|
||||
Spanish by <a href="https://github.com/xphnx">@xphnx</a></p>
|
||||
|
||||
<h2>Used third-party libraries</h2>
|
||||
<p>
|
||||
* <a href="http://ical4j.sourceforge.net/">iCal4j<a> (<a href="http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE">New BSD License</a>)<br/>
|
||||
* <a href="https://code.google.com/p/ez-vcard/">ez-vcard</a> (<a href="http://opensource.org/licenses/BSD-3-Clause">New BSD License</a>)<br/>
|
||||
* <a href="http://simple.sourceforge.net/">Simple XML Serialization</a> (<a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>)<br/>
|
||||
* <a href="http://projectlombok.org/">Project Lombok</a> (<a href="http://opensource.org/licenses/mit-license.php">MIT License</a>)</p>
|
||||
* <a href="http://hc.apache.org">Apache HttpClient</a> (<a href="https://code.google.com/p/httpclientandroidlib/">httpclientandroidlib</a> flavour) – <a href="http://www.apache.org/licenses/">Apache License, Version 2.0</a><br/>
|
||||
* <a href="http://ical4j.sourceforge.net/">iCal4j<a> – <a href="http://sourceforge.net/p/ical4j/ical4j/ci/default/tree/LICENSE">New BSD License</a>)<br/>
|
||||
* <a href="https://code.google.com/p/ez-vcard/">ez-vcard</a> – <a href="http://opensource.org/licenses/BSD-3-Clause">New BSD License</a><br/>
|
||||
* <a href="http://simple.sourceforge.net/">Simple XML Serialization</a> – <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a><br/>
|
||||
* <a href="http://projectlombok.org/">Project Lombok</a> – <a href="http://opensource.org/licenses/mit-license.php">MIT License</a></p>
|
||||
]]></string>
|
||||
|
||||
<string name="account_details">Account details</string>
|
||||
|
||||
@ -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",
|
||||
|
||||
|
||||
@ -39,8 +39,6 @@ public class TlsSniSocketFactory implements LayeredConnectionSocketFactory {
|
||||
private final static HostnameVerifier hostnameVerifier = new BrowserCompatHostnameVerifier();
|
||||
|
||||
|
||||
// Plain TCP/IP (layer below TLS)
|
||||
|
||||
@Override
|
||||
public Socket createSocket(HttpContext context) throws IOException {
|
||||
return sslSocketFactory.createSocket();
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user