Using default singleton OwnCloudClientManager instead of holding a reference in appli...

[pub/Android/ownCloud.git] / src / com / owncloud / android / services / OperationsService.java

diff --git a/src/com/owncloud/android/services/OperationsService.java b/src/com/owncloud/android/services/OperationsService.java
index 3670881..3c56dea 100644 (file)
--- a/src/com/owncloud/android/services/OperationsService.java
+++ b/src/com/owncloud/android/services/OperationsService.java
@@ -26,7 +26,9 @@ import java.util.concurrent.ConcurrentMap;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;

+import com.owncloud.android.lib.common.OwnCloudAccount;

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

+import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;

 import com.owncloud.android.lib.common.OwnCloudCredentials;
 import com.owncloud.android.lib.common.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;
 import com.owncloud.android.lib.common.OwnCloudCredentials;
 import com.owncloud.android.lib.common.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.accounts.AccountUtils.AccountNotFoundException;


@@ -80,7 +82,6 @@ public class OperationsService extends Service {
     public static final String EXTRA_RESULT = "RESULT";
     
     // TODO review if ALL OF THEM are necessary
     public static final String EXTRA_RESULT = "RESULT";
     
     // TODO review if ALL OF THEM are necessary

-    public static final String EXTRA_WEBDAV_PATH = "WEBDAV_PATH";

     public static final String EXTRA_SUCCESS_IF_ABSENT = "SUCCESS_IF_ABSENT";
     public static final String EXTRA_USERNAME = "USERNAME";
     public static final String EXTRA_PASSWORD = "PASSWORD";
     public static final String EXTRA_SUCCESS_IF_ABSENT = "SUCCESS_IF_ABSENT";
     public static final String EXTRA_USERNAME = "USERNAME";
     public static final String EXTRA_PASSWORD = "PASSWORD";


@@ -112,18 +113,16 @@ public class OperationsService extends Service {
     private static class Target {
         public Uri mServerUrl = null;
         public Account mAccount = null;
     private static class Target {
         public Uri mServerUrl = null;
         public Account mAccount = null;

-        public String mWebDavUrl = null;

         public String mUsername = null;
         public String mPassword = null;
         public String mAuthToken = null;
         public boolean mFollowRedirects = true;
         public String mCookie = null;
         
         public String mUsername = null;
         public String mPassword = null;
         public String mAuthToken = null;
         public boolean mFollowRedirects = true;
         public String mCookie = null;
         

-        public Target(Account account, Uri serverUrl, String webdavUrl, String username, String password, String authToken,
+        public Target(Account account, Uri serverUrl, String username, String password, String authToken,

                 boolean followRedirects, String cookie) {
             mAccount = account;
             mServerUrl = serverUrl;
                 boolean followRedirects, String cookie) {
             mAccount = account;
             mServerUrl = serverUrl;

-            mWebDavUrl = webdavUrl;

             mUsername = username;
             mPassword = password;
             mAuthToken = authToken;
             mUsername = username;
             mPassword = password;
             mAuthToken = authToken;


@@ -179,7 +178,7 @@ public class OperationsService extends Service {
         //Log_OC.wtf(TAG, "onDestroy init" );
         // Saving cookies
         try {
         //Log_OC.wtf(TAG, "onDestroy init" );
         // Saving cookies
         try {

-            ((MainApp)getApplicationContext()).getOwnCloudClientManager().
+            OwnCloudClientManagerFactory.getDefaultSingleton().

                 saveAllClients(this, MainApp.getAccountType());
             
             // TODO - get rid of these exceptions
                 saveAllClients(this, MainApp.getAccountType());
             
             // TODO - get rid of these exceptions


@@ -303,8 +302,6 @@ public class OperationsService extends Service {
                 } else {
                     Account account = operationIntent.getParcelableExtra(EXTRA_ACCOUNT);
                     String serverUrl = operationIntent.getStringExtra(EXTRA_SERVER_URL);
                 } else {
                     Account account = operationIntent.getParcelableExtra(EXTRA_ACCOUNT);
                     String serverUrl = operationIntent.getStringExtra(EXTRA_SERVER_URL);

-                    String webDavPath = operationIntent.getStringExtra(EXTRA_WEBDAV_PATH);
-                    String webDavUrl = serverUrl + webDavPath;

                     String username = operationIntent.getStringExtra(EXTRA_USERNAME);
                     String password = operationIntent.getStringExtra(EXTRA_PASSWORD);
                     String authToken = operationIntent.getStringExtra(EXTRA_AUTH_TOKEN);
                     String username = operationIntent.getStringExtra(EXTRA_USERNAME);
                     String password = operationIntent.getStringExtra(EXTRA_PASSWORD);
                     String authToken = operationIntent.getStringExtra(EXTRA_AUTH_TOKEN);


@@ -313,7 +310,6 @@ public class OperationsService extends Service {
                     target = new Target(
                             account, 
                             (serverUrl == null) ? null : Uri.parse(serverUrl),
                     target = new Target(
                             account, 
                             (serverUrl == null) ? null : Uri.parse(serverUrl),

-                            ((webDavPath == null) || (serverUrl == null)) ? null : webDavUrl,

                             username,
                             password,
                             authToken,
                             username,
                             password,
                             authToken,


@@ -475,10 +471,9 @@ public class OperationsService extends Service {
                 if (mLastTarget == null || !mLastTarget.equals(next.first)) {
                     mLastTarget = next.first;
                     if (mLastTarget.mAccount != null) {
                 if (mLastTarget == null || !mLastTarget.equals(next.first)) {
                     mLastTarget = next.first;
                     if (mLastTarget.mAccount != null) {

-                        mOwnCloudClient = ((MainApp)getApplicationContext()).
-                                getOwnCloudClientManager().getClientFor(
-                                        mLastTarget.mAccount, 
-                                        this);
+                        OwnCloudAccount ocAccount = new OwnCloudAccount(mLastTarget.mAccount, this);
+                        mOwnCloudClient = OwnCloudClientManagerFactory.getDefaultSingleton().
+                                getClientFor(ocAccount, this);

                         mStorageManager = 
                                 new FileDataStorageManager(
                                         mLastTarget.mAccount, 
                         mStorageManager = 
                                 new FileDataStorageManager(
                                         mLastTarget.mAccount, 


@@ -498,16 +493,10 @@ public class OperationsService extends Service {
                             credentials = OwnCloudCredentialsFactory.newSamlSsoCredentials(
                                     mLastTarget.mCookie); // SAML SSO
                         }
                             credentials = OwnCloudCredentialsFactory.newSamlSsoCredentials(
                                     mLastTarget.mCookie); // SAML SSO
                         }

-                        
-                        mOwnCloudClient = ((MainApp)getApplicationContext()).
-                                getOwnCloudClientManager().getClientFor(
-                                        mLastTarget.mServerUrl,
-                                        credentials,    // still can be null, and that is right
-                                        this);
-                        
-                        if (mLastTarget.mWebDavUrl != null) {
-                            mOwnCloudClient.setWebdavUri(Uri.parse(mLastTarget.mWebDavUrl));
-                        }
+                        OwnCloudAccount ocAccount = new OwnCloudAccount(
+                                mLastTarget.mServerUrl, credentials);
+                        mOwnCloudClient = OwnCloudClientManagerFactory.getDefaultSingleton().
+                                getClientFor(ocAccount, this);

                         mOwnCloudClient.setFollowRedirects(mLastTarget.mFollowRedirects);
                         mStorageManager = null;
                     }
                         mOwnCloudClient.setFollowRedirects(mLastTarget.mFollowRedirects);
                         mStorageManager = null;
                     }