Solve conflicts

sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java

@@ -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()
+		OCAccount ocAccount = new OCAccount(serverUri,
-                .setBaseUri(serverUri)
+				OwnCloudCredentialsFactory.newBasicCredentials(
-                .setCredentials(OwnCloudCredentialsFactory.newBasicCredentials(
     					getString(R.string.username),
     					getString(R.string.password)
-                ))
+				)
-                .build();
+		);
+
+    	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,
             }
         });
 	}
-
 }

src/com/owncloud/android/lib/refactor/OCContext.java

@@ -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();
 

src/com/owncloud/android/lib/refactor/RemoteOperation.java

@@ -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

src/com/owncloud/android/lib/refactor/account/OCAccount.java

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

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

@@ -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,

src/com/owncloud/android/lib/refactor/operations/PropfindOperation.java

@@ -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 {