flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-08 00:16:09 +00:00
Code Issues Releases Wiki Activity

Solve conflicts

Browse Source
This commit is contained in:
davigonz 2018-05-18 14:12:37 +02:00
parent 3125c8047c
commit ff6adc4cf9
6 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java
View File

@ -35,6 +35,8 @@ import java.util.List;
import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
import com.owncloud.android.lib.common.OwnCloudClientFactory;
import com.owncloud.android.lib.common.OwnCloudClient;
import com.owncloud.android.lib.refactor.OCContext;
import com.owncloud.android.lib.refactor.account.OCAccount;
import com.owncloud.android.lib.refactor.authentication.credentials.OwnCloudCredentialsFactory;
import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
import com.owncloud.android.lib.refactor.OwnCloudContext;
@ -68,7 +70,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
private OwnCloudClient mClient;
private OwnCloudContext mOCContext;
private OCContext mOCContext;
private FilesArrayAdapter mFilesAdapter;
@ -83,7 +85,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
mHandler = new Handler();
Uri serverUri = Uri.parse(getString(R.string.server_base_url));
// mClient = OwnCloudClientFactory.createOwnCloudClient(serverUri, this, true);
mClient = OwnCloudClientFactory.createOwnCloudClient(serverUri, this, true);
// mClient.setCredentials(
// OwnCloudCredentialsFactory.newBasicCredentials(
// getString(R.string.username),
@ -91,13 +93,14 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
// )
// );
mOCContext = new OwnCloudContext.Builder()
.setBaseUri(serverUri)
.setCredentials(OwnCloudCredentialsFactory.newBasicCredentials(
getString(R.string.username),
getString(R.string.password)
))
.build();
OCAccount ocAccount = new OCAccount(serverUri,
OwnCloudCredentialsFactory.newBasicCredentials(
getString(R.string.username),
getString(R.string.password)
)
);
mOCContext = new OCContext(ocAccount);
mFilesAdapter = new FilesArrayAdapter(this, R.layout.file_in_list);
((ListView)findViewById(R.id.list_view)).setAdapter(mFilesAdapter);
@ -293,5 +296,4 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
}
});
}
}
}

3
src/com/owncloud/android/lib/refactor/OCContext.java
View File

@ -2,7 +2,6 @@ package com.owncloud.android.lib.refactor;
import com.owncloud.android.lib.refactor.account.OCAccount;
public class OCContext {
private static final String TAG = OCContext.class.toString();
@ -25,4 +24,4 @@ public class OCContext {
public OCAccount getOCAccount() {
return mOCAccount;
}
}
}

13
src/com/owncloud/android/lib/refactor/RemoteOperation.java
View File

@ -9,6 +9,7 @@ import okhttp3.Request;
public abstract class RemoteOperation {
private final OCContext mContext;
private static OkHttpClient httpClient = null;
private static final String WEBDAV_PATH_4_0 = "/remote.php/dav";
protected RemoteOperation(OCContext context) {
mContext = context;
@ -22,19 +23,23 @@ public abstract class RemoteOperation {
public abstract RemoteOperationResult exec();
public OCContext getOCContext() {
protected OCContext getOCContext() {
return mContext;
}
public OkHttpClient getClient() {
protected OkHttpClient getClient() {
return httpClient;
}
public Uri.Builder getBaseUriBuilder() {
protected Uri.Builder getBaseUriBuilder() {
return mContext.getOCAccount().getBaseUri().buildUpon();
}
public Request.Builder getRequestBuilder() {
protected Uri.Builder getWebDAVUriBuilder() {
return getBaseUriBuilder().appendEncodedPath(WEBDAV_PATH_4_0);
}
protected Request.Builder getRequestBuilder() {
Request.Builder builder = new Request.Builder();
for(Map.Entry<String, String> header

1
src/com/owncloud/android/lib/refactor/account/OCAccount.java
View File

@ -150,5 +150,4 @@ public class OCAccount {
return null;
}
}
}

4
src/com/owncloud/android/lib/refactor/authentication/oauth/operations/OAuth2GetAccessTokenOperation.java
View File

@ -54,10 +54,8 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation {
private final String mClientSecret;
private final String mRedirectUri;
private final String mAccessTokenEndpointPath;
private final OAuth2ResponseParser mResponseParser;
public OAuth2GetAccessTokenOperation(
OCContext context,
String grantType,
@ -130,4 +128,4 @@ public class OAuth2GetAccessTokenOperation extends RemoteOperation {
return new RemoteOperationResult(e);
}
}
}
}

2
src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java
View File

@ -26,7 +26,7 @@ public class PropfindOperation extends RemoteOperation {
public RemoteOperationResult exec() {
DavResource davResource = new DavResource(
getClient(),
HttpUrl.parse(getOCContext().getWebdavUri() + WebdavUtils.encodePath(mRemotePath)),
HttpUrl.parse(getWebDAVUriBuilder() + WebdavUtils.encodePath(mRemotePath)),
null);
try {