X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/7d84fd0c9f15227bc65a2ae00a74e1cfd8f8d33b..5665d9c306165c144fc60b9749ac184cb32369c0:/src/com/owncloud/android/network/OwnCloudClientUtils.java diff --git a/src/com/owncloud/android/network/OwnCloudClientUtils.java b/src/com/owncloud/android/network/OwnCloudClientUtils.java index c4462188..a3f322b9 100644 --- a/src/com/owncloud/android/network/OwnCloudClientUtils.java +++ b/src/com/owncloud/android/network/OwnCloudClientUtils.java @@ -1,9 +1,9 @@ /* ownCloud Android client application - * Copyright (C) 2011 Bartek Przybylski + * Copyright (C) 2012-2013 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or + * the Free Software Foundation, either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -162,32 +162,6 @@ public class OwnCloudClientUtils { /** - * Allows or disallows self-signed certificates in ownCloud servers to reach - * - * @param allow 'True' to allow, 'false' to disallow - */ - public static void allowSelfsignedCertificates(boolean allow) { - Protocol pr = null; - try { - pr = Protocol.getProtocol("https"); - if (pr != null && mDefaultHttpsProtocol == null) { - mDefaultHttpsProtocol = pr; - } - } catch (IllegalStateException e) { - // nothing to do here; really - } - boolean isAllowed = (pr != null && pr.getSocketFactory() instanceof EasySSLSocketFactory); - if (allow && !isAllowed) { - Protocol.registerProtocol("https", new Protocol("https", new EasySSLSocketFactory(), 443)); - } else if (!allow && isAllowed) { - if (mDefaultHttpsProtocol != null) { - Protocol.registerProtocol("https", mDefaultHttpsProtocol); - } - } - } - - - /** * Registers or unregisters the proper components for advanced SSL handling. * @throws IOException */