X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/8ec6915a58779eb43f1446100cb6fa477c206529..5f61cb15552eb2fda01716078a9191b88cebf764:/src/eu/alefzero/webdav/WebdavClient.java diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java index 722614ee..f7cc060e 100644 --- a/src/eu/alefzero/webdav/WebdavClient.java +++ b/src/eu/alefzero/webdav/WebdavClient.java @@ -15,181 +15,154 @@ * along with this program. If not, see . * */ -package eu.alefzero.webdav; - -import java.io.BufferedInputStream; -import java.io.BufferedOutputStream; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.OutputStreamWriter; - -import org.apache.http.HttpHost; -import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; -import org.apache.http.HttpVersion; -import org.apache.http.auth.AuthScope; -import org.apache.http.auth.UsernamePasswordCredentials; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.client.methods.HttpPut; -import org.apache.http.conn.ClientConnectionManager; -import org.apache.http.conn.params.ConnManagerPNames; -import org.apache.http.conn.params.ConnPerRouteBean; -import org.apache.http.conn.scheme.PlainSocketFactory; -import org.apache.http.conn.scheme.Scheme; -import org.apache.http.conn.scheme.SchemeRegistry; -import org.apache.http.conn.ssl.SSLSocketFactory; -import org.apache.http.entity.FileEntity; -import org.apache.http.entity.mime.content.FileBody; -import org.apache.http.impl.auth.BasicScheme; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; -import org.apache.http.params.BasicHttpParams; -import org.apache.http.params.HttpParams; -import org.apache.http.params.HttpProtocolParams; -import org.apache.http.protocol.BasicHttpContext; - -import eu.alefzero.owncloud.authenticator.EasySSLSocketFactory; -import eu.alefzero.webdav.HttpMkCol; - -import android.net.Uri; -import android.util.Log; - -public class WebdavClient { - private DefaultHttpClient mHttpClient; - private BasicHttpContext mHttpContext; - private HttpHost mTargetHost; - private SchemeRegistry mSchemeRegistry; - private Uri mUri; - final private static String TAG = "WebdavClient"; - - public DefaultHttpClient getHttpClient() { - return mHttpClient; - } - public HttpHost getTargetHost() { - return mTargetHost; - } - - public WebdavClient(Uri uri) { - mUri = uri; - mSchemeRegistry = new SchemeRegistry(); - setupHttpClient(); - } - - public void setCredentials(String username, String password) { - // determine default port for http or https - int targetPort = mTargetHost.getPort() == -1 ? - ( mUri.getScheme().equals("https") ? 443 : 80) - : mUri.getPort(); - - mHttpClient.getCredentialsProvider().setCredentials( - new AuthScope(mUri.getHost(), targetPort), - new UsernamePasswordCredentials(username, password)); - BasicScheme basicAuth = new BasicScheme(); - mHttpContext.setAttribute("preemptive-auth", basicAuth); - } - - public void allowUnsignedCertificates() { - // https - mSchemeRegistry.register(new Scheme("https", new EasySSLSocketFactory(), 443)); - } - - public boolean downloadFile(String filepath, File targetPath) { - HttpGet get = new HttpGet(mUri.toString() + filepath.replace(" ", "%20")); - get.setHeader("Host", mUri.getHost()); - get.setHeader("User-Agent", "Android-ownCloud"); - - try { - HttpResponse response = mHttpClient.execute(mTargetHost, get, mHttpContext); - if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) { - return false; - } - BufferedInputStream bis = new BufferedInputStream(response.getEntity().getContent()); - FileOutputStream fos = new FileOutputStream(targetPath); - - byte[] bytes = new byte[512]; - int readResult; - while ((readResult = bis.read(bytes)) != -1) fos.write(bytes, 0, readResult); - - } catch (IOException e) { - e.printStackTrace(); - return false; - } - return true; - } - - public boolean putFile(String localFile, - String remoteTarget, - String contentType) { - boolean result = true; - HttpPut method = new HttpPut(mUri.toString() + remoteTarget.replace(" ", "%20")); - method.setHeader("Content-type", contentType); - method.setHeader("Host", mUri.getHost()); - method.setHeader("User-Agent", "Android-ownCloud"); - - try { - FileBody fb = new FileBody(new File(localFile, contentType)); - final FileEntity fileEntity = new FileEntity(new File(localFile), contentType); - - method.setEntity(fileEntity); - Log.i(TAG, "executing:" + method.getRequestLine().toString()); - - mHttpClient.execute(mTargetHost, method, mHttpContext); - /*mHandler.post(new Runnable() { - public void run() { - Uploader.this.PartialupdateUpload(c.getString(c.getColumnIndex(Media.DATA)), - c.getString(c.getColumnIndex(Media.DISPLAY_NAME)), - mUploadPath + (mUploadPath.equals("/")?"":"/"), - fileEntity.getContentType().getValue(), - fileEntity.getContentLength()+""); - } - }); - Log.i(TAG, "Uploading, done"); -*/ - Log.i(TAG, "Uploading, done"); - } catch (final Exception e) { - Log.i(TAG, ""+e.getMessage()); - result = false; - } - - return result; - } - - public boolean createDirectory(String path) { - HttpMkCol method = new HttpMkCol(mUri.toString() + path + "/"); - method.setHeader("User-Agent", "Android-ownCloud"); - - try { - mHttpClient.execute(mTargetHost, method, mHttpContext); - Log.i(TAG, "Creating dir completed"); - } catch (final Exception e) { - e.printStackTrace(); - return false; - } - return true; - } - - private void setupHttpClient() { - // http scheme - mSchemeRegistry.register(new Scheme("http", PlainSocketFactory.getSocketFactory(), 80)); - mSchemeRegistry.register(new Scheme("https", SSLSocketFactory.getSocketFactory(), 443)); - - HttpParams params = new BasicHttpParams(); - params.setParameter(ConnManagerPNames.MAX_TOTAL_CONNECTIONS, 30); - params.setParameter(ConnManagerPNames.MAX_CONNECTIONS_PER_ROUTE, new ConnPerRouteBean(30)); - params.setParameter(HttpProtocolParams.USE_EXPECT_CONTINUE, false); - HttpProtocolParams.setVersion(params, HttpVersion.HTTP_1_1); - - mHttpContext = new BasicHttpContext(); - ClientConnectionManager cm = new ThreadSafeClientConnManager(params, mSchemeRegistry); - - int port = mUri.getPort() == -1 ? - mUri.getScheme().equals("https") ? 443 : 80 - : mUri.getPort(); - - mTargetHost = new HttpHost(mUri.getHost(), port, mUri.getScheme()); - - mHttpClient = new DefaultHttpClient(cm, params); - } -} +package eu.alefzero.webdav; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.net.URLDecoder; +import java.net.URLEncoder; + +import org.apache.commons.httpclient.Credentials; +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.UsernamePasswordCredentials; +import org.apache.commons.httpclient.auth.AuthScope; +import org.apache.commons.httpclient.methods.GetMethod; +import org.apache.commons.httpclient.methods.HeadMethod; +import org.apache.commons.httpclient.methods.PutMethod; +import org.apache.commons.httpclient.methods.RequestEntity; +import org.apache.commons.httpclient.params.HttpMethodParams; +import org.apache.commons.httpclient.protocol.Protocol; +import org.apache.http.HttpStatus; +import org.apache.jackrabbit.webdav.client.methods.MkColMethod; + +import eu.alefzero.owncloud.authenticator.EasySSLSocketFactory; + +import android.net.Uri; +import android.util.Log; + +public class WebdavClient extends HttpClient { + private Uri mUri; + private Credentials mCredentials; + final private static String TAG = "WebdavClient"; + private static final String USER_AGENT = "Android-ownCloud"; + private OnUploadProgressListener mUploadProgressListener; + + public WebdavClient(Uri uri) { + mUri = uri; + getParams().setParameter(HttpMethodParams.USER_AGENT, USER_AGENT); + } + + public void setCredentials(String username, String password) { + getParams().setAuthenticationPreemptive(true); + getState().setCredentials(AuthScope.ANY, + getCredentials(username, password)); + } + + private Credentials getCredentials(String username, String password) { + if (mCredentials == null) + mCredentials = new UsernamePasswordCredentials(username, password); + return mCredentials; + } + + public void allowUnsignedCertificates() { + // https + Protocol.registerProtocol("https", new Protocol("https", + new EasySSLSocketFactory(), 443)); + } + + public boolean downloadFile(String filepath, File targetPath) { + // HttpGet get = new HttpGet(mUri.toString() + filepath.replace(" ", + // "%20")); + String[] splitted_filepath = filepath.split("/"); + filepath = ""; + for (String s : splitted_filepath) { + if (s.equals("")) continue; + filepath += "/" + URLEncoder.encode(s); + } + + Log.e("ASD", mUri.toString() + filepath.replace(" ", "%20") + ""); + GetMethod get = new GetMethod(mUri.toString() + + filepath.replace(" ", "%20")); + + // get.setHeader("Host", mUri.getHost()); + // get.setHeader("User-Agent", "Android-ownCloud"); + + try { + int status = executeMethod(get); + Log.e(TAG, "status return: " + status); + if (status != HttpStatus.SC_OK) { + return false; + } + BufferedInputStream bis = new BufferedInputStream( + get.getResponseBodyAsStream()); + FileOutputStream fos = new FileOutputStream(targetPath); + + byte[] bytes = new byte[512]; + int readResult; + while ((readResult = bis.read(bytes)) != -1) + fos.write(bytes, 0, readResult); + + } catch (IOException e) { + e.printStackTrace(); + return false; + } + return true; + } + + public void setUploadListener(OnUploadProgressListener listener) { + mUploadProgressListener = listener; + } + + public boolean putFile(String localFile, String remoteTarget, + String contentType) { + boolean result = true; + + try { + Log.e("ASD", contentType + ""); + File f = new File(localFile); + FileRequestEntity entity = new FileRequestEntity(f, contentType); + entity.setOnUploadProgressListener(mUploadProgressListener); + Log.e("ASD", f.exists() + " " + entity.getContentLength()); + PutMethod put = new PutMethod(mUri.toString() + remoteTarget); + put.setRequestEntity(entity); + Log.d(TAG, "" + put.getURI().toString()); + int status = executeMethod(put); + Log.d(TAG, "PUT method return with status " + status); + + Log.i(TAG, "Uploading, done"); + } catch (final Exception e) { + Log.i(TAG, "" + e.getMessage()); + result = false; + } + + return result; + } + + public int tryToLogin() { + int r = 0; + HeadMethod head = new HeadMethod(mUri.toString()); + try { + r = executeMethod(head); + } catch (Exception e) { + Log.e(TAG, "Error: " + e.getMessage()); + } + return r; + } + + public boolean createDirectory(String path) { + try { + MkColMethod mkcol = new MkColMethod(mUri.toString() + "/" + path + + "/"); + int status = executeMethod(mkcol); + Log.d(TAG, "Status returned " + status); + Log.d(TAG, "uri: " + mkcol.getURI().toString()); + Log.i(TAG, "Creating dir completed"); + } catch (final Exception e) { + e.printStackTrace(); + return false; + } + return true; + } +}