Create observer class for parent folders

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileDisplayActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index dd2aa8b..22b2d80 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -21,8 +21,6 @@ package com.owncloud.android.ui.activity;
 import java.io.File;
 import java.io.IOException;
 
 import java.io.File;
 import java.io.IOException;
 

-import org.apache.commons.httpclient.Credentials;
-

 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.accounts.AuthenticatorException;


@@ -74,11 +72,11 @@ import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.operations.CreateFolderOperation;
 
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;
 import com.owncloud.android.operations.CreateFolderOperation;
 

+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.OwnCloudClientMap;
-import com.owncloud.android.lib.common.accounts.AccountUtils;
+import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
+import com.owncloud.android.lib.common.OwnCloudCredentials;

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

-import com.owncloud.android.lib.common.network.BearerCredentials;

 import com.owncloud.android.lib.common.network.CertificateCombinedException;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;
 import com.owncloud.android.lib.common.network.CertificateCombinedException;
 import com.owncloud.android.lib.common.operations.RemoteOperation;
 import com.owncloud.android.lib.common.operations.RemoteOperationResult;


@@ -166,11 +164,12 @@ FileFragment.ContainerActivity, OnNavigationListener, OnSslUntrustedCertListener
             requestPinCode();
         }
 
             requestPinCode();
         }
 

-        /// file observer
-        Intent observer_intent = new Intent(this, FileObserverService.class);
-        observer_intent.putExtra(FileObserverService.KEY_FILE_CMD, FileObserverService.CMD_INIT_OBSERVED_LIST);
-        startService(observer_intent);
-
+        /// grant that FileObserverService is watching favourite files
+        if (savedInstanceState != null) {
+            Intent initObserversIntent = FileObserverService.makeInitIntent(this);
+            startService(initObserversIntent);
+        }
+        

         /// Load of saved instance state
         if(savedInstanceState != null) {
             mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(FileDisplayActivity.KEY_WAITING_TO_PREVIEW);
         /// Load of saved instance state
         if(savedInstanceState != null) {
             mWaitingToPreview = (OCFile) savedInstanceState.getParcelable(FileDisplayActivity.KEY_WAITING_TO_PREVIEW);


@@ -937,24 +936,33 @@ FileFragment.ContainerActivity, OnNavigationListener, OnSslUntrustedCertListener
                                     synchResult.isIdPRedirection()                  ||
                                     (synchResult.isException() && synchResult.getException() 
                                             instanceof AuthenticatorException))) {
                                     synchResult.isIdPRedirection()                  ||
                                     (synchResult.isException() && synchResult.getException() 
                                             instanceof AuthenticatorException))) {

-                            

 
 

-                            OwnCloudClient client = OwnCloudClientMap.removeClientFor(getAccount());
+                            OwnCloudClient client = null;
+                            try {
+                                OwnCloudAccount ocAccount = 
+                                        new OwnCloudAccount(getAccount(), context);
+                                client = (OwnCloudClientManagerFactory.getDefaultSingleton().
+                                        removeClientFor(ocAccount));
+                                // TODO get rid of these exceptions
+                            } catch (AccountNotFoundException e) {
+                                e.printStackTrace();
+                            } catch (AuthenticatorException e) {
+                                e.printStackTrace();
+                            } catch (OperationCanceledException e) {
+                                e.printStackTrace();
+                            } catch (IOException e) {
+                                e.printStackTrace();
+                            }
+                            

                             if (client != null) {
                             if (client != null) {

-                                Credentials cred = client.getCredentials();
-                                String ssoSessionCookie = client.getSsoSessionCookie();
-                                if (cred != null || ssoSessionCookie != null) {
-                                    boolean bearerAuthorization = (cred != null && cred instanceof BearerCredentials);
-                                    boolean samlBasedSsoAuthorization = (cred == null && ssoSessionCookie != null);
+                                OwnCloudCredentials cred = client.getCredentials();
+                                if (cred != null) {

                                     AccountManager am = AccountManager.get(context);
                                     AccountManager am = AccountManager.get(context);

-                                
-                                    if (bearerAuthorization) {
-                                        am.invalidateAuthToken(getAccount().type, 
-                                                ((BearerCredentials)cred).getAccessToken());
-                                        
-                                    } else if (samlBasedSsoAuthorization ) {
-                                        am.invalidateAuthToken(getAccount().type, ssoSessionCookie);
-        
+                                    if (cred.authTokenExpires()) {
+                                        am.invalidateAuthToken(
+                                                getAccount().type, 
+                                                cred.getAuthToken()
+                                        );

                                     } else {
                                         am.clearPassword(getAccount());
                                     }
                                     } else {
                                         am.clearPassword(getAccount());
                                     }