Merge branch 'master' of ssh://git@gitorious.org/owncloud/android-devel.git

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / ui / activity / FileDisplayActivity.java

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index 7f92d5a..a7dc0b8 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -20,8 +20,6 @@ package eu.alefzero.owncloud.ui.activity;
 \r
 import java.io.File;\r
 import java.net.URLDecoder;\r
-import java.net.URLEncoder;\r
-\r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import android.app.AlertDialog;\r
@@ -62,7 +60,6 @@ import eu.alefzero.owncloud.datamodel.OCFile;
 import eu.alefzero.owncloud.files.services.FileUploader;\r
 import eu.alefzero.owncloud.syncadapter.FileSyncService;\r
 import eu.alefzero.owncloud.ui.fragment.FileListFragment;\r
-import eu.alefzero.owncloud.utils.OwnCloudVersion;\r
 import eu.alefzero.webdav.WebdavClient;\r
 \r
 /**\r
@@ -84,8 +81,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     \r
     private static final int DIALOG_SETUP_ACCOUNT = 0;\r
     private static final int DIALOG_CREATE_DIR = 1;\r
-\r
-    private static final int REQUEST_ACCOUNT_SETUP = 0;\r
     private static final int ACTION_SELECT_FILE = 1;\r
 \r
     public void pushPath(String path) {\r
@@ -175,8 +170,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
         requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);\r
         setProgressBarIndeterminateVisibility(false);\r
-        // if (getSupportFragmentManager().findFragmentById(R.id.fileList) ==\r
-        // null)\r
+        \r
         setContentView(R.layout.files);\r
 \r
     }\r
@@ -282,7 +276,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 mDirectories.insert(s, 0);\r
             FileListFragment fileListFramgent = (FileListFragment) getSupportFragmentManager()\r
                     .findFragmentById(R.id.fileList);\r
-            if (fileListFramgent != null) fileListFramgent.populateFileList();\r
+            if (fileListFramgent != null) fileListFramgent.listDirectory();\r
         }\r
 \r
         mStorageManager = new FileDataStorageManager(\r
@@ -464,7 +458,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 FileListFragment fileListFramgent = (FileListFragment) getSupportFragmentManager()\r
                         .findFragmentById(R.id.fileList);\r
                 if (fileListFramgent != null)\r
-                    fileListFramgent.populateFileList();\r
+                    fileListFramgent.listDirectory();\r
             }\r
         }\r
 \r