Merge remote-tracking branch 'origin/master'

[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 ff76316..64098f7 100644 (file)
--- 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;\r
 \r
 import android.accounts.Account;\r
 import java.io.File;\r
 \r
 import android.accounts.Account;\r

-import android.accounts.AccountManager;\r

 import android.app.AlertDialog;\r
 import android.app.ProgressDialog;\r
 import android.app.AlertDialog.Builder;\r
 import android.app.AlertDialog;\r
 import android.app.ProgressDialog;\r
 import android.app.AlertDialog.Builder;\r


@@ -40,7 +39,6 @@ import android.content.res.Resources.NotFoundException;
 import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r
 import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.os.Bundle;\r

-import android.os.Environment;\r

 import android.os.Handler;\r
 import android.preference.PreferenceManager;\r
 import android.provider.MediaStore;\r
 import android.os.Handler;\r
 import android.preference.PreferenceManager;\r
 import android.provider.MediaStore;\r


@@ -61,20 +59,16 @@ import com.actionbarsherlock.view.MenuInflater;
 import com.actionbarsherlock.view.MenuItem;\r
 import com.actionbarsherlock.view.Window;\r
 import com.owncloud.android.AccountUtils;\r
 import com.actionbarsherlock.view.MenuItem;\r
 import com.actionbarsherlock.view.Window;\r
 import com.owncloud.android.AccountUtils;\r

-import com.owncloud.android.CrashHandler;\r

 import com.owncloud.android.authenticator.AccountAuthenticator;\r
 import com.owncloud.android.datamodel.DataStorageManager;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r
 import com.owncloud.android.authenticator.AccountAuthenticator;\r
 import com.owncloud.android.datamodel.DataStorageManager;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.datamodel.OCFile;\r

-import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;\r
-import com.owncloud.android.files.OwnCloudFileObserver;\r

 import com.owncloud.android.files.services.FileDownloader;\r
 import com.owncloud.android.files.services.FileDownloader;\r

-import com.owncloud.android.files.services.FileObserverService;\r

 import com.owncloud.android.files.services.FileUploader;\r
 import com.owncloud.android.files.services.FileUploader;\r

+import com.owncloud.android.network.OwnCloudClientUtils;\r

 import com.owncloud.android.syncadapter.FileSyncService;\r
 import com.owncloud.android.ui.fragment.FileDetailFragment;\r
 import com.owncloud.android.ui.fragment.OCFileListFragment;\r
 import com.owncloud.android.syncadapter.FileSyncService;\r
 import com.owncloud.android.ui.fragment.FileDetailFragment;\r
 import com.owncloud.android.ui.fragment.OCFileListFragment;\r

-import com.owncloud.android.utils.OwnCloudClientUtils;\r

 \r
 import com.owncloud.android.R;\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r
 import com.owncloud.android.R;\r
 import eu.alefzero.webdav.WebdavClient;\r


@@ -116,8 +110,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     public void onCreate(Bundle savedInstanceState) {\r
         Log.d(getClass().toString(), "onCreate() start");\r
         super.onCreate(savedInstanceState);\r
     public void onCreate(Bundle savedInstanceState) {\r
         Log.d(getClass().toString(), "onCreate() start");\r
         super.onCreate(savedInstanceState);\r

-        \r
-        Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(getApplicationContext()));\r

 \r
         /// saved instance state: keep this always before initDataFromCurrentAccount()\r
         if(savedInstanceState != null) {\r
 \r
         /// saved instance state: keep this always before initDataFromCurrentAccount()\r
         if(savedInstanceState != null) {\r


@@ -141,9 +133,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         }\r
 \r
         // file observer\r
         }\r
 \r
         // file observer\r

-        Intent observer_intent = new Intent(this, FileObserverService.class);\r
+        /*Intent observer_intent = new Intent(this, FileObserverService.class);\r

         observer_intent.putExtra(FileObserverService.KEY_FILE_CMD, FileObserverService.CMD_INIT_OBSERVED_LIST);\r
         startService(observer_intent);\r
         observer_intent.putExtra(FileObserverService.KEY_FILE_CMD, FileObserverService.CMD_INIT_OBSERVED_LIST);\r
         startService(observer_intent);\r

+        */\r

             \r
         /// USER INTERFACE\r
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
             \r
         /// USER INTERFACE\r
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r


@@ -428,7 +421,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);\r
         \r
             // List current directory\r
             registerReceiver(mDownloadFinishReceiver, downloadIntentFilter);\r
         \r
             // List current directory\r

-            mFileList.listDirectory(mCurrentDir);\r
+            //mFileList.listDirectory(mCurrentDir);\r

             \r
         } else {\r
             \r
             \r
         } else {\r
             \r


@@ -639,13 +632,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     private class DirectoryCreator implements Runnable {\r
         private String mTargetPath;\r
         private Account mAccount;\r
     private class DirectoryCreator implements Runnable {\r
         private String mTargetPath;\r
         private Account mAccount;\r

-        private AccountManager mAm;\r

         private Handler mHandler; \r
     \r
         public DirectoryCreator(String targetPath, Account account, Handler handler) {\r
             mTargetPath = targetPath;\r
             mAccount = account;\r
         private Handler mHandler; \r
     \r
         public DirectoryCreator(String targetPath, Account account, Handler handler) {\r
             mTargetPath = targetPath;\r
             mAccount = account;\r

-            mAm = (AccountManager) getSystemService(ACCOUNT_SERVICE);\r

             mHandler = handler;\r
         }\r
     \r
             mHandler = handler;\r
         }\r
     \r


@@ -866,6 +857,15 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
      * {@inheritDoc}\r
      */\r
     @Override\r
      * {@inheritDoc}\r
      */\r
     @Override\r

+    public OCFile getInitialDirectory() {\r
+        return mCurrentDir;\r
+    }\r
+    \r
+    \r
+    /**\r
+     * {@inheritDoc}\r
+     */\r
+    @Override\r

     public void onFileStateChanged() {\r
         OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
         if (fileListFragment != null) { \r
     public void onFileStateChanged() {\r
         OCFileListFragment fileListFragment = (OCFileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList);\r
         if (fileListFragment != null) { \r