From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sat, 7 Apr 2012 14:26:32 +0000 (+0200)
Subject: fix invalid list get in filelist
X-Git-Tag: oc-android-1.4.3~469
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a9e9751f6b33638a101825a134e74092071afb88

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 8ea784c3..20e30fe2 100644
--- 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 android.content.ContentProvider;
+import android.content.ContentResolver;
 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 ContentProvider cp_;
+  private ContentResolver cp_;
   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,
@@ -57,7 +57,7 @@ public class OCFile {
       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,
@@ -151,7 +151,7 @@ public class OCFile {
     file.save();
   }
 
-  private OCFile(ContentProvider cp, Account account) {
+  private OCFile(ContentResolver cp, Account account) {
     account_ = account;
     cp_ = cp;
   }
diff --git a/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
index ef9da411..dc18a5b1 100644
--- 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));
 				cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, this.getAccount().name);
 				Uri entry = this.getContentProvider().insert(ProviderTableMeta.CONTENT_URI_FILE, cv);
-				Log.d(TAG, "Inserting new entry " + path + name);
+				Log.d(TAG, "Inserting new entry " + path);
 				c = this.getContentProvider().query(entry, null, null, null, null);
 				c.moveToFirst();
 			}
diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index e13ce678..d138ee58 100644
--- 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();
       return;
     }
-    ((FileList)getSupportFragmentManager().findFragmentById(id.file_list_container)).onBackPressed();
+    ((FileList)getSupportFragmentManager().findFragmentById(R.id.fileList)).onBackPressed();
   }
 }
\ 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 969f44f2..cf5eaf38 100644
--- 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;
 import android.accounts.AccountManager;
 import android.app.Service;
+import android.app.DownloadManager.Query;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
@@ -32,6 +33,7 @@ import android.widget.AdapterView;
 import android.widget.TextView;
 import eu.alefzero.owncloud.R;
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
+import eu.alefzero.owncloud.datamodel.OCFile;
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
 import eu.alefzero.owncloud.ui.FragmentListView;
 import eu.alefzero.owncloud.ui.activity.FileDetailActivity;
@@ -101,8 +103,13 @@ public class FileList extends FragmentListView {
   }
 
   private void populateFileList() {
-    Log.d("ASD", mAccount.name + "");
     if (mParentsIds.empty()) {
+      OCFile file = new OCFile(getActivity().getContentResolver(), mAccount, "/");
+      Log.d("ASD", file.getFileName()+"");
+      Log.d("ASD", file.getFileId()+"");
+      if (file.getDirectoryContent() != null)
+      Log.d("ASD", file.getDirectoryContent().size()+"");
+      
       mCursor = getActivity().getContentResolver().query(ProviderTableMeta.CONTENT_URI,
         null,
         ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?",
diff --git a/src/eu/alefzero/webdav/TreeNode.java b/src/eu/alefzero/webdav/TreeNode.java
index a031eb14..2919acce 100644
--- 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 name2 = name;
       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_.put(NodeProperty.PATH, path);
+      propertyMap_.put(NodeProperty.PATH, name2);
       Log.i("TreeNode", toString());
       return path;
     }