Adding cancellation to uploads (WIP)

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

diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
index aca4d89..7382d79 100644 (file)
--- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@ -88,6 +88,7 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements
         setContentView(R.layout.upload_files_layout);
         mFileListFragment = (LocalFileListFragment) getSupportFragmentManager().findFragmentById(R.id.local_files_list);
         
         setContentView(R.layout.upload_files_layout);
         mFileListFragment = (LocalFileListFragment) getSupportFragmentManager().findFragmentById(R.id.local_files_list);
         

+        

         // Set input controllers
         mCancelBtn = (Button) findViewById(R.id.upload_files_btn_cancel);
         mCancelBtn.setOnClickListener(this);
         // Set input controllers
         mCancelBtn = (Button) findViewById(R.id.upload_files_btn_cancel);
         mCancelBtn.setOnClickListener(this);


@@ -164,17 +165,6 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements
         Log.d(TAG, "onSaveInstanceState() end");
     }
 
         Log.d(TAG, "onSaveInstanceState() end");
     }
 

-    @Override
-    protected void onResume() {
-        Log.d(TAG, "onResume() start");
-        super.onResume();
-
-        // List current directory
-        mFileListFragment.listDirectory(mCurrentDir);
-            
-        Log.d(TAG, "onResume() end");
-    }
-

     
     /**
      * Pushes a directory to the drop down list
     
     /**
      * Pushes a directory to the drop down list


@@ -244,6 +234,14 @@ public class UploadFilesActivity extends SherlockFragmentActivity implements
     public void onFileClick(File file) {
         // nothing to do
     }
     public void onFileClick(File file) {
         // nothing to do
     }

+    
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public File getInitialDirectory() {
+        return mCurrentDir;
+    }

 
 
     /**
 
 
     /**