mirror of
https://github.com/owncloud/android-library.git
synced 2026-08-20 21:02:53 +00:00
Reordered packages
This commit is contained in:
David A. Velasco
@@ -0,0 +1,172 @@
|
||||
/* ownCloud Android Library is available under MIT license
|
||||
* Copyright (C) 2014 ownCloud (http://www.owncloud.org/)
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
||||
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*
|
||||
*/
|
||||
|
||||
package com.owncloud.android.lib.resources.status;
|
||||
|
||||
import org.apache.commons.httpclient.HttpStatus;
|
||||
import org.apache.commons.httpclient.methods.GetMethod;
|
||||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
|
||||
import com.owncloud.android.lib.common.OwnCloudClient;
|
||||
import com.owncloud.android.lib.common.accounts.AccountUtils;
|
||||
import com.owncloud.android.lib.common.operations.RemoteOperation;
|
||||
import com.owncloud.android.lib.common.operations.RemoteOperationResult;
|
||||
import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
|
||||
|
||||
import android.content.Context;
|
||||
import android.net.ConnectivityManager;
|
||||
import android.net.Uri;
|
||||
import android.util.Log;
|
||||
|
||||
/**
|
||||
* Checks if the server is valid and if the server supports the Share API
|
||||
*
|
||||
* @author David A. Velasco
|
||||
* @author masensio
|
||||
*
|
||||
*/
|
||||
|
||||
public class OwnCloudServerCheckOperation extends RemoteOperation {
|
||||
|
||||
/** Maximum time to wait for a response from the server when the connection is being tested, in MILLISECONDs. */
|
||||
public static final int TRY_CONNECTION_TIMEOUT = 5000;
|
||||
|
||||
private static final String TAG = OwnCloudServerCheckOperation.class.getSimpleName();
|
||||
|
||||
private static final String OCVERSION_SHARED_SUPPORTED = "5.0.13";
|
||||
|
||||
private static final String NODE_INSTALLED = "installed";
|
||||
private static final String NODE_VERSION = "version";
|
||||
private static final String NODE_VERSIONSTRING = "versionstring";
|
||||
|
||||
private String mUrl;
|
||||
private RemoteOperationResult mLatestResult;
|
||||
private Context mContext;
|
||||
private OwnCloudVersion mOCVersion;
|
||||
private OwnCloudVersion mOCVersionString;
|
||||
|
||||
public OwnCloudServerCheckOperation(String url, Context context) {
|
||||
mUrl = url;
|
||||
mContext = context;
|
||||
mOCVersion = null;
|
||||
mOCVersionString = null;
|
||||
}
|
||||
|
||||
public OwnCloudVersion getDiscoveredVersion() {
|
||||
return mOCVersion;
|
||||
}
|
||||
public boolean isSharedSupported() {
|
||||
OwnCloudVersion shareServer = new OwnCloudVersion(OCVERSION_SHARED_SUPPORTED);
|
||||
if (mOCVersionString != null) {
|
||||
return mOCVersionString.compareTo(shareServer) >= 0;
|
||||
}
|
||||
|
||||
return false;
|
||||
|
||||
}
|
||||
|
||||
private boolean tryConnection(OwnCloudClient wc, String urlSt) {
|
||||
boolean retval = false;
|
||||
GetMethod get = null;
|
||||
try {
|
||||
get = new GetMethod(urlSt);
|
||||
int status = wc.executeMethod(get, TRY_CONNECTION_TIMEOUT, TRY_CONNECTION_TIMEOUT);
|
||||
String response = get.getResponseBodyAsString();
|
||||
if (status == HttpStatus.SC_OK) {
|
||||
JSONObject json = new JSONObject(response);
|
||||
if (!json.getBoolean(NODE_INSTALLED)) {
|
||||
mLatestResult = new RemoteOperationResult(RemoteOperationResult.ResultCode.INSTANCE_NOT_CONFIGURED);
|
||||
} else {
|
||||
mOCVersion = new OwnCloudVersion(json.getString(NODE_VERSION));
|
||||
mOCVersionString = new OwnCloudVersion(json.getString(NODE_VERSIONSTRING), true);
|
||||
if (!mOCVersion.isVersionValid()) {
|
||||
mLatestResult = new RemoteOperationResult(RemoteOperationResult.ResultCode.BAD_OC_VERSION);
|
||||
|
||||
} else {
|
||||
mLatestResult = new RemoteOperationResult(urlSt.startsWith("https://") ?
|
||||
RemoteOperationResult.ResultCode.OK_SSL :
|
||||
RemoteOperationResult.ResultCode.OK_NO_SSL
|
||||
);
|
||||
|
||||
retval = true;
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
mLatestResult = new RemoteOperationResult(false, status, get.getResponseHeaders());
|
||||
}
|
||||
|
||||
} catch (JSONException e) {
|
||||
mLatestResult = new RemoteOperationResult(RemoteOperationResult.ResultCode.INSTANCE_NOT_CONFIGURED);
|
||||
|
||||
} catch (Exception e) {
|
||||
mLatestResult = new RemoteOperationResult(e);
|
||||
|
||||
} finally {
|
||||
if (get != null)
|
||||
get.releaseConnection();
|
||||
}
|
||||
|
||||
if (mLatestResult.isSuccess()) {
|
||||
Log.i(TAG, "Connection check at " + urlSt + ": " + mLatestResult.getLogMessage());
|
||||
|
||||
} else if (mLatestResult.getException() != null) {
|
||||
Log.e(TAG, "Connection check at " + urlSt + ": " + mLatestResult.getLogMessage(), mLatestResult.getException());
|
||||
|
||||
} else {
|
||||
Log.e(TAG, "Connection check at " + urlSt + ": " + mLatestResult.getLogMessage());
|
||||
}
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
private boolean isOnline() {
|
||||
ConnectivityManager cm = (ConnectivityManager) mContext
|
||||
.getSystemService(Context.CONNECTIVITY_SERVICE);
|
||||
return cm != null && cm.getActiveNetworkInfo() != null
|
||||
&& cm.getActiveNetworkInfo().isConnectedOrConnecting();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected RemoteOperationResult run(OwnCloudClient client) {
|
||||
if (!isOnline()) {
|
||||
return new RemoteOperationResult(RemoteOperationResult.ResultCode.NO_NETWORK_CONNECTION);
|
||||
}
|
||||
if (mUrl.startsWith("http://") || mUrl.startsWith("https://")) {
|
||||
tryConnection(client, mUrl + AccountUtils.STATUS_PATH);
|
||||
|
||||
} else {
|
||||
client.setWebdavUri(Uri.parse("https://" + mUrl + AccountUtils.STATUS_PATH));
|
||||
boolean httpsSuccess = tryConnection(client, "https://" + mUrl + AccountUtils.STATUS_PATH);
|
||||
if (!httpsSuccess && !mLatestResult.isSslRecoverableException()) {
|
||||
Log.d(TAG, "establishing secure connection failed, trying non secure connection");
|
||||
client.setWebdavUri(Uri.parse("http://" + mUrl + AccountUtils.STATUS_PATH));
|
||||
tryConnection(client, "http://" + mUrl + AccountUtils.STATUS_PATH);
|
||||
}
|
||||
}
|
||||
return mLatestResult;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,125 @@
|
||||
/* ownCloud Android Library is available under MIT license
|
||||
* Copyright (C) 2014 ownCloud (http://www.owncloud.org/)
|
||||
* Copyright (C) 2012 Bartek Przybylski
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
||||
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*
|
||||
*/
|
||||
|
||||
package com.owncloud.android.lib.resources.status;
|
||||
|
||||
public class OwnCloudVersion implements Comparable<OwnCloudVersion> {
|
||||
public static final OwnCloudVersion owncloud_v1 = new OwnCloudVersion(
|
||||
0x010000);
|
||||
public static final OwnCloudVersion owncloud_v2 = new OwnCloudVersion(
|
||||
0x020000);
|
||||
public static final OwnCloudVersion owncloud_v3 = new OwnCloudVersion(
|
||||
0x030000);
|
||||
public static final OwnCloudVersion owncloud_v4 = new OwnCloudVersion(
|
||||
0x040000);
|
||||
public static final OwnCloudVersion owncloud_v4_5 = new OwnCloudVersion(
|
||||
0x040500);
|
||||
|
||||
// format is in version
|
||||
// 0xAABBCC
|
||||
// for version AA.BB.CC
|
||||
// ie version 2.0.3 will be stored as 0x030003
|
||||
private int mVersion;
|
||||
private boolean mIsValid;
|
||||
|
||||
public OwnCloudVersion(int version) {
|
||||
mVersion = version;
|
||||
mIsValid = true;
|
||||
}
|
||||
|
||||
public OwnCloudVersion(String version) {
|
||||
mVersion = 0;
|
||||
mIsValid = false;
|
||||
parseVersionString(version);
|
||||
}
|
||||
|
||||
public OwnCloudVersion(String versionstring, boolean isVersionString) {
|
||||
mVersion = 0;
|
||||
mIsValid = false;
|
||||
if (isVersionString) {
|
||||
parseVersionString(versionstring);
|
||||
} else {
|
||||
parseVersion(versionstring);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public String toString() {
|
||||
return ((mVersion >> 16) % 256) + "." + ((mVersion >> 8) % 256) + "."
|
||||
+ ((mVersion) % 256);
|
||||
}
|
||||
|
||||
public boolean isVersionValid() {
|
||||
return mIsValid;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int compareTo(OwnCloudVersion another) {
|
||||
return another.mVersion == mVersion ? 0
|
||||
: another.mVersion < mVersion ? 1 : -1;
|
||||
}
|
||||
|
||||
private void parseVersion(String version) {
|
||||
try {
|
||||
String[] nums = version.split("\\.");
|
||||
if (nums.length > 0) {
|
||||
mVersion += Integer.parseInt(nums[0]);
|
||||
}
|
||||
mVersion = mVersion << 8;
|
||||
if (nums.length > 1) {
|
||||
mVersion += Integer.parseInt(nums[1]);
|
||||
}
|
||||
mVersion = mVersion << 8;
|
||||
if (nums.length > 2) {
|
||||
mVersion += Integer.parseInt(nums[2]);
|
||||
}
|
||||
mIsValid = true;
|
||||
} catch (Exception e) {
|
||||
mIsValid = false;
|
||||
}
|
||||
}
|
||||
|
||||
private void parseVersionString(String versionstring) {
|
||||
try {
|
||||
versionstring = versionstring.replaceAll("[^\\d.]", "");
|
||||
|
||||
String[] nums = versionstring.split("\\.");
|
||||
if (nums.length > 0) {
|
||||
mVersion += Integer.parseInt(nums[0]);
|
||||
}
|
||||
mVersion = mVersion << 8;
|
||||
if (nums.length > 1) {
|
||||
mVersion += Integer.parseInt(nums[1]);
|
||||
}
|
||||
mVersion = mVersion << 8;
|
||||
if (nums.length > 2) {
|
||||
mVersion += Integer.parseInt(nums[2]);
|
||||
}
|
||||
mIsValid = true;
|
||||
} catch (Exception e) {
|
||||
mIsValid = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user