fix invalid list get in filelist

diff --git a/src/eu/alefzero/owncloud/datamodel/OCFile.java b/src/eu/alefzero/owncloud/datamodel/OCFile.java
index 8ea784c..20e30fe 100644 (file)
--- a/src/eu/alefzero/owncloud/datamodel/OCFile.java
+++ b/src/eu/alefzero/owncloud/datamodel/OCFile.java
@@ -23,7 +23,7 @@ import java.util.Vector;
 
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
 import android.accounts.Account;
 
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
 import android.accounts.Account;

-import android.content.ContentProvider;
+import android.content.ContentResolver;

 import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;


@@ -41,10 +41,10 @@ public class OCFile {
   private String storage_path_;
   private String mimetype_;
   
   private String storage_path_;
   private String mimetype_;
   

-  private ContentProvider cp_;
+  private ContentResolver cp_;

   private Account account_;
   
   private Account account_;
   

-  public OCFile(ContentProvider cp, Account account, long id) {
+  public OCFile(ContentResolver cp, Account account, long id) {

     cp_ = cp;
     account_ = account;
     Cursor c = cp_.query(ProviderTableMeta.CONTENT_URI_FILE,
     cp_ = cp;
     account_ = account;
     Cursor c = cp_.query(ProviderTableMeta.CONTENT_URI_FILE,


@@ -57,7 +57,7 @@ public class OCFile {
       setFileData(c);
   }
   
       setFileData(c);
   }
   

-  public OCFile(ContentProvider cp, Account account, String path) {
+  public OCFile(ContentResolver cp, Account account, String path) {

     cp_ = cp;
     account_ = account;
     Cursor c = cp_.query(ProviderTableMeta.CONTENT_URI_FILE,
     cp_ = cp;
     account_ = account;
     Cursor c = cp_.query(ProviderTableMeta.CONTENT_URI_FILE,


@@ -151,7 +151,7 @@ public class OCFile {
     file.save();
   }
 
     file.save();
   }
 

-  private OCFile(ContentProvider cp, Account account) {
+  private OCFile(ContentResolver cp, Account account) {

     account_ = account;
     cp_ = cp;
   }
     account_ = account;
     cp_ = cp;
   }

diff --git a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
index ef9da41..dc18a5b 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
@@ -110,7 +110,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                                cv.put(ProviderTableMeta.FILE_PATH, n.getProperty(NodeProperty.PATH));\r
                                cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, this.getAccount().name);\r
                                Uri entry = this.getContentProvider().insert(ProviderTableMeta.CONTENT_URI_FILE, cv);\r
                                cv.put(ProviderTableMeta.FILE_PATH, n.getProperty(NodeProperty.PATH));\r
                                cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, this.getAccount().name);\r
                                Uri entry = this.getContentProvider().insert(ProviderTableMeta.CONTENT_URI_FILE, cv);\r

-                               Log.d(TAG, "Inserting new entry " + path + name);\r
+                               Log.d(TAG, "Inserting new entry " + path);\r

                                c = this.getContentProvider().query(entry, null, null, null, null);\r
                                c.moveToFirst();\r
                        }\r
                                c = this.getContentProvider().query(entry, null, null, null, null);\r
                                c.moveToFirst();\r
                        }\r

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index e13ce67..d138ee5 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -140,6 +140,6 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
       super.onBackPressed();\r
       return;\r
     }\r
       super.onBackPressed();\r
       return;\r
     }\r

-    ((FileList)getSupportFragmentManager().findFragmentById(id.file_list_container)).onBackPressed();\r
+    ((FileList)getSupportFragmentManager().findFragmentById(R.id.fileList)).onBackPressed();\r

   }\r
 }
\ No newline at end of file
   }\r
 }
\ No newline at end of file

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileList.java b/src/eu/alefzero/owncloud/ui/fragment/FileList.java
index 969f44f..cf5eaf3 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileList.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileList.java
@@ -22,6 +22,7 @@ import java.util.Stack;
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import android.app.Service;\r
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import android.app.Service;\r

+import android.app.DownloadManager.Query;\r

 import android.content.Intent;\r
 import android.database.Cursor;\r
 import android.net.Uri;\r
 import android.content.Intent;\r
 import android.database.Cursor;\r
 import android.net.Uri;\r


@@ -32,6 +33,7 @@ import android.widget.AdapterView;
 import android.widget.TextView;\r
 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import android.widget.TextView;\r
 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r

+import eu.alefzero.owncloud.datamodel.OCFile;\r

 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;\r
 import eu.alefzero.owncloud.ui.FragmentListView;\r
 import eu.alefzero.owncloud.ui.activity.FileDetailActivity;\r
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;\r
 import eu.alefzero.owncloud.ui.FragmentListView;\r
 import eu.alefzero.owncloud.ui.activity.FileDetailActivity;\r


@@ -101,8 +103,13 @@ public class FileList extends FragmentListView {
   }\r
 \r
   private void populateFileList() {\r
   }\r
 \r
   private void populateFileList() {\r

-    Log.d("ASD", mAccount.name + "");\r

     if (mParentsIds.empty()) {\r
     if (mParentsIds.empty()) {\r

+      OCFile file = new OCFile(getActivity().getContentResolver(), mAccount, "/");\r
+      Log.d("ASD", file.getFileName()+"");\r
+      Log.d("ASD", file.getFileId()+"");\r
+      if (file.getDirectoryContent() != null)\r
+      Log.d("ASD", file.getDirectoryContent().size()+"");\r
+      \r

       mCursor = getActivity().getContentResolver().query(ProviderTableMeta.CONTENT_URI,\r
         null,\r
         ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?",\r
       mCursor = getActivity().getContentResolver().query(ProviderTableMeta.CONTENT_URI,\r
         null,\r
         ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?",\r

diff --git a/src/eu/alefzero/webdav/TreeNode.java b/src/eu/alefzero/webdav/TreeNode.java
index a031eb1..2919acc 100644 (file)
--- a/src/eu/alefzero/webdav/TreeNode.java
+++ b/src/eu/alefzero/webdav/TreeNode.java
@@ -74,6 +74,7 @@ public class TreeNode {
       String name = propertyMap_.get(NodeProperty.NAME);
       name = name.replace(oc_path, "");
       String path = "";
       String name = propertyMap_.get(NodeProperty.NAME);
       name = name.replace(oc_path, "");
       String path = "";

+      String name2 = name;

       if (name.endsWith("/")) {
         name = name.substring(0, name.length()-1);
       }
       if (name.endsWith("/")) {
         name = name.substring(0, name.length()-1);
       }


@@ -87,7 +88,7 @@ public class TreeNode {
       propertyMap_.remove(NodeProperty.NAME);
       propertyMap_.put(NodeProperty.NAME, name);
       propertyMap_.remove(NodeProperty.PATH);
       propertyMap_.remove(NodeProperty.NAME);
       propertyMap_.put(NodeProperty.NAME, name);
       propertyMap_.remove(NodeProperty.PATH);

-      propertyMap_.put(NodeProperty.PATH, path);
+      propertyMap_.put(NodeProperty.PATH, name2);

       Log.i("TreeNode", toString());
       return path;
     }
       Log.i("TreeNode", toString());
       return path;
     }