Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e4988825 authored by vince-bourgmayer's avatar vince-bourgmayer
Browse files

change getOCClientTask to remove test credential

parent ecb50eb6

.idea/misc.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
      </value>

    </option>

  </component>

  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">

  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">

    <output url="file://$PROJECT_DIR$/build/classes" />

  </component>

  <component name="ProjectType">

android-nc-lib @ 96e4eb0b

Original line number Diff line number Diff line 
Subproject commit 44094659dac07d2df4927dede4ec90b83084a024
 
Subproject commit 96e4eb0b8e8683f0fb80d1f449da4ffcfd7a0a7a

app/src/main/java/io/eelo/drive/operations/ListRemoteFileOperation_v2.java

+0 −2
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ import android.content.Context; 
import android.util.Log;



import com.owncloud.android.lib.common.OwnCloudClient;

import com.owncloud.android.lib.common.network.WebdavEntry;

import com.owncloud.android.lib.common.operations.RemoteOperation;

import com.owncloud.android.lib.common.operations.RemoteOperationResult;

import com.owncloud.android.lib.resources.files.LightReadFolderRemoteOperation;
@@ -20,7 +19,6 @@ import com.owncloud.android.lib.resources.files.model.RemoteFile; 


import org.apache.jackrabbit.webdav.property.DavPropertyName;



import java.io.File;

import java.util.ArrayList;

import java.util.List;

import java.util.ListIterator;

app/src/main/java/io/eelo/drive/services/OperationManagerService.java

+5 −1
Original line number Diff line number Diff line
@@ -264,7 +264,10 @@ public class OperationManagerService extends Service implements OnRemoteOperatio 
                    break;

                case ETAG_UNCHANGED:

                    //Case specific to DownloadFileOperation

                    Log.e(CURRENTTAG, operationClassName+" : Sync_conflict: File is already up to date");

                    Log.e(CURRENTTAG, operationClassName+" : Etag Unchanged: File is already up to date");

                    break;

                default:

                    Log.e( CURRENTTAG, operationClassName+" : "+result.getCode() );

                    break;



            } //Close switch
@@ -272,6 +275,7 @@ public class OperationManagerService extends Service implements OnRemoteOperatio 
        this.lockedfilePath.remove( ((ComparableOperation) operation ).getLocalPath() );

    }





    /**

     * Function called when client instance is build

     * @param result OwnCloudClient's instance

app/src/main/java/io/eelo/drive/utils/GetOCClientTask.java

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ public class GetOCClientTask extends AsyncTask<Object, Void, OwnCloudClient> { 
        Uri serverUri;

        try {

             serverUri = Uri.parse(AccountUtils.getBaseUrlForAccount(context, account));



        }catch (Exception e){

            Log.e(TAG, "Can\'t parse serverPath to Uri : "+e.toString() );

            return null;
@@ -54,6 +55,8 @@ public class GetOCClientTask extends AsyncTask<Object, Void, OwnCloudClient> { 


        OwnCloudClient oc = OwnCloudClientFactory.createOwnCloudClient(serverUri, context, true);

        oc.setCredentials(new OwnCloudBasicCredentials(account.name, AccountManager.get(context).getPassword(account) ) );





        return oc;

    }