Merge branch 'develop' into refactor_remote_operation_to_create_folder

[pub/Android/ownCloud.git] / src / com / owncloud / android / Uploader.java

diff --git a/src/com/owncloud/android/Uploader.java b/src/com/owncloud/android/Uploader.java
index ddd3f4c..29a4d6a 100644 (file)
--- a/src/com/owncloud/android/Uploader.java
+++ b/src/com/owncloud/android/Uploader.java
@@ -28,11 +28,9 @@ import java.util.Vector;
 
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountAuthenticator;
 
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.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.FileUploader;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.files.services.FileUploader;

-import com.owncloud.android.ui.CustomButton;

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


@@ -57,12 +55,12 @@ import android.view.View;
 import android.view.Window;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;
 import android.view.Window;
 import android.widget.AdapterView;
 import android.widget.AdapterView.OnItemClickListener;

+import android.widget.Button;

 import android.widget.EditText;
 import android.widget.SimpleAdapter;
 import android.widget.Toast;
 
 
 import android.widget.EditText;
 import android.widget.SimpleAdapter;
 import android.widget.Toast;
 
 

-

 /**
  * This can be used to upload things to an ownCloud instance.
  * 
 /**
  * This can be used to upload things to an ownCloud instance.
  * 


@@ -78,7 +76,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
     private ArrayList<Parcelable> mStreamsToUpload;
     private boolean mCreateDir;
     private String mUploadPath;
     private ArrayList<Parcelable> mStreamsToUpload;
     private boolean mCreateDir;
     private String mUploadPath;

-    private DataStorageManager mStorageManager;
+    private FileDataStorageManager mStorageManager;

     private OCFile mFile;
 
     private final static int DIALOG_NO_ACCOUNT = 0;
     private OCFile mFile;
 
     private final static int DIALOG_NO_ACCOUNT = 0;


@@ -231,12 +229,12 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         // click on folder in the list
         Log_OC.d(TAG, "on item click");
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         // click on folder in the list
         Log_OC.d(TAG, "on item click");

-        Vector<OCFile> tmpfiles = mStorageManager.getDirectoryContent(mFile);
+        Vector<OCFile> tmpfiles = mStorageManager.getFolderContent(mFile);

         if (tmpfiles.size() <= 0) return;
         // filter on dirtype
         Vector<OCFile> files = new Vector<OCFile>();
         for (OCFile f : tmpfiles)
         if (tmpfiles.size() <= 0) return;
         // filter on dirtype
         Vector<OCFile> files = new Vector<OCFile>();
         for (OCFile f : tmpfiles)

-            if (f.isDirectory())
+            if (f.isFolder())

                 files.add(f);
         if (files.size() < position) {
             throw new IndexOutOfBoundsException("Incorrect item selected");
                 files.add(f);
         if (files.size() < position) {
             throw new IndexOutOfBoundsException("Incorrect item selected");


@@ -296,11 +294,11 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
         
         mFile = mStorageManager.getFileByPath(full_path);
         if (mFile != null) {
         
         mFile = mStorageManager.getFileByPath(full_path);
         if (mFile != null) {

-            Vector<OCFile> files = mStorageManager.getDirectoryContent(mFile);
+            Vector<OCFile> files = mStorageManager.getFolderContent(mFile);

             List<HashMap<String, Object>> data = new LinkedList<HashMap<String,Object>>();
             for (OCFile f : files) {
                 HashMap<String, Object> h = new HashMap<String, Object>();
             List<HashMap<String, Object>> data = new LinkedList<HashMap<String,Object>>();
             for (OCFile f : files) {
                 HashMap<String, Object> h = new HashMap<String, Object>();

-                if (f.isDirectory()) {
+                if (f.isFolder()) {

                     h.put("dirname", f.getFileName());
                     data.add(h);
                 }
                     h.put("dirname", f.getFileName());
                     data.add(h);
                 }


@@ -311,7 +309,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
                                                 new String[] {"dirname"},
                                                 new int[] {R.id.textView1});
             setListAdapter(sa);
                                                 new String[] {"dirname"},
                                                 new int[] {R.id.textView1});
             setListAdapter(sa);

-            CustomButton btn = (CustomButton) findViewById(R.id.uploader_choose_folder);
+            Button btn = (Button) findViewById(R.id.uploader_choose_folder);

             btn.setOnClickListener(this);
             getListView().setOnItemClickListener(this);
         }
             btn.setOnClickListener(this);
             getListView().setOnItemClickListener(this);
         }