X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/1ecd2b61c5956f7e21ee85d5658f4bc83032656f..7edbe05bb524b0194d7ad9fb45bfd9d8f1250d51:/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 da1668a2..64098f70 100644
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -21,7 +21,6 @@ package com.owncloud.android.ui.activity;
 import java.io.File;
 
 import android.accounts.Account;
-import android.accounts.AccountManager;
 import android.app.AlertDialog;
 import android.app.ProgressDialog;
 import android.app.AlertDialog.Builder;
@@ -60,13 +59,13 @@ import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;
 import com.actionbarsherlock.view.Window;
 import com.owncloud.android.AccountUtils;
-import com.owncloud.android.CrashHandler;
 import com.owncloud.android.authenticator.AccountAuthenticator;
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.files.services.FileUploader;
+import com.owncloud.android.network.OwnCloudClientUtils;
 import com.owncloud.android.syncadapter.FileSyncService;
 import com.owncloud.android.ui.fragment.FileDetailFragment;
 import com.owncloud.android.ui.fragment.OCFileListFragment;
@@ -107,14 +106,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     
     private static final String TAG = "FileDisplayActivity";
     
-    
     @Override
     public void onCreate(Bundle savedInstanceState) {
         Log.d(getClass().toString(), "onCreate() start");
         super.onCreate(savedInstanceState);
 
-        Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));
-
         /// saved instance state: keep this always before initDataFromCurrentAccount()
         if(savedInstanceState != null) {
             mCurrentDir = savedInstanceState.getParcelable(FileDetailFragment.EXTRA_FILE);
@@ -136,6 +132,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             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);
+        */
             
         /// USER INTERFACE
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
@@ -221,12 +222,12 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 break;
             }
             case R.id.startSync: {
-                ContentResolver.cancelSync(null, "org.owncloud");   // cancel the current synchronizations of any ownCloud account
+                ContentResolver.cancelSync(null, AccountAuthenticator.AUTH_TOKEN_TYPE);   // cancel the current synchronizations of any ownCloud account
                 Bundle bundle = new Bundle();
                 bundle.putBoolean(ContentResolver.SYNC_EXTRAS_MANUAL, true);
                 ContentResolver.requestSync(
                         AccountUtils.getCurrentOwnCloudAccount(this),
-                        "org.owncloud", bundle);
+                        AccountAuthenticator.AUTH_TOKEN_TYPE, bundle);
                 break;
             }
             case R.id.action_upload: {
@@ -420,7 +421,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);
         
             // List current directory
-            mFileList.listDirectory(mCurrentDir);
+            //mFileList.listDirectory(mCurrentDir);
             
         } else {
             
@@ -631,26 +632,17 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     private class DirectoryCreator implements Runnable {
         private String mTargetPath;
         private Account mAccount;
-        private AccountManager mAm;
         private Handler mHandler; 
     
         public DirectoryCreator(String targetPath, Account account, Handler handler) {
             mTargetPath = targetPath;
             mAccount = account;
-            mAm = (AccountManager) getSystemService(ACCOUNT_SERVICE);
             mHandler = handler;
         }
     
         @Override
         public void run() {
-            WebdavClient wdc = new WebdavClient(mAccount, getApplicationContext());
-            
-            String username = mAccount.name.substring(0,
-                    mAccount.name.lastIndexOf('@'));
-            String password = mAm.getPassword(mAccount);
-    
-            wdc.setCredentials(username, password);
-            wdc.allowSelfsignedCertificates();
+            WebdavClient wdc = OwnCloudClientUtils.createOwnCloudClient(mAccount, getApplicationContext());
             boolean created = wdc.createDirectory(mTargetPath);
             if (created) {
                 mHandler.post(new Runnable() {
@@ -865,6 +857,15 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
      * {@inheritDoc}
      */
     @Override
+    public OCFile getInitialDirectory() {
+        return mCurrentDir;
+    }
+    
+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
     public void onFileStateChanged() {
         OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);
         if (fileListFragment != null) {