fix file display, fix syncing, fix authenticator & other stuff

diff --git a/src/eu/alefzero/owncloud/authenticator/AuthUtils.java b/src/eu/alefzero/owncloud/authenticator/AuthUtils.java
index e3fc32c..8287e12 100644 (file)
--- a/src/eu/alefzero/owncloud/authenticator/AuthUtils.java
+++ b/src/eu/alefzero/owncloud/authenticator/AuthUtils.java
@@ -244,6 +244,9 @@ public class AuthUtils {
                                  break;\r
                          }\r
                  }\r
                                  break;\r
                          }\r
                  }\r

+         } else if (ocAccounts.length != 0) {\r
+           // we at least need to take first account as fallback\r
+           defaultAccount = ocAccounts[0];\r

          }\r
          \r
        return defaultAccount;\r
          }\r
          \r
        return defaultAccount;\r

diff --git a/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java b/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java
index 827435f..3821278 100644 (file)
--- a/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java
+++ b/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java
@@ -90,7 +90,7 @@ public class FileDataStorageManager implements DataStorageManager {
     cv.put(ProviderTableMeta.FILE_PATH, file.getPath());
     cv.put(ProviderTableMeta.FILE_STORAGE_PATH, file.getStoragePath());
     cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, mAccount.name);
     cv.put(ProviderTableMeta.FILE_PATH, file.getPath());
     cv.put(ProviderTableMeta.FILE_STORAGE_PATH, file.getStoragePath());
     cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, mAccount.name);

-    
+

     if (fileExists(file.getPath())) {
       overriden = true;
       if (getContentResolver() != null) {
     if (fileExists(file.getPath())) {
       overriden = true;
       if (getContentResolver() != null) {


@@ -109,15 +109,20 @@ public class FileDataStorageManager implements DataStorageManager {
         }
       }
     } else {
         }
       }
     } else {

+      Uri result_uri = null;

       if (getContentResolver() != null) {
       if (getContentResolver() != null) {

-        getContentResolver().insert(ProviderTableMeta.CONTENT_URI_FILE, cv);
+        result_uri = getContentResolver().insert(ProviderTableMeta.CONTENT_URI_FILE, cv);

       } else {
         try {
       } else {
         try {

-          getContentProvider().insert(ProviderTableMeta.CONTENT_URI_FILE, cv);
+          result_uri = getContentProvider().insert(ProviderTableMeta.CONTENT_URI_FILE, cv);

         } catch (RemoteException e) {
           Log.e(TAG, "Fail to insert insert file to database " + e.getMessage());
         }
       }
         } catch (RemoteException e) {
           Log.e(TAG, "Fail to insert insert file to database " + e.getMessage());
         }
       }

+      if (result_uri != null) {
+        long new_id = Long.parseLong(result_uri.getPathSegments().get(1));
+        file.setFileId(new_id);
+      }

     }
     
     if (file.isDirectory() && file.needsUpdatingWhileSaving())
     }
     
     if (file.isDirectory() && file.needsUpdatingWhileSaving())


@@ -158,6 +163,7 @@ public class FileDataStorageManager implements DataStorageManager {
       Uri req_uri = Uri.withAppendedPath(
           ProviderTableMeta.CONTENT_URI_DIR, String.valueOf(f.getFileId()));
       Cursor c = null;
       Uri req_uri = Uri.withAppendedPath(
           ProviderTableMeta.CONTENT_URI_DIR, String.valueOf(f.getFileId()));
       Cursor c = null;

+      

       if (getContentProvider() != null) {
         try {
           c = getContentProvider().query(req_uri, null, null, null, null);
       if (getContentProvider() != null) {
         try {
           c = getContentProvider().query(req_uri, null, null, null, null);


@@ -169,12 +175,13 @@ public class FileDataStorageManager implements DataStorageManager {
         c = getContentResolver().query(req_uri, null, null, null, null);
       }
 
         c = getContentResolver().query(req_uri, null, null, null, null);
       }
 

-      if (c.moveToFirst())
+      if (c.moveToFirst()) {

         do {
           OCFile child = createFileInstance(c);
           ret.add(child);
         } while (c.moveToNext());
         do {
           OCFile child = createFileInstance(c);
           ret.add(child);
         } while (c.moveToNext());

-
+      }
+      

       c.close();
       return ret;
     }
       c.close();
       return ret;
     }

diff --git a/src/eu/alefzero/owncloud/datamodel/OCFile.java b/src/eu/alefzero/owncloud/datamodel/OCFile.java
index 62705f1..62bf065 100644 (file)
--- a/src/eu/alefzero/owncloud/datamodel/OCFile.java
+++ b/src/eu/alefzero/owncloud/datamodel/OCFile.java
@@ -38,9 +38,9 @@ public class OCFile {
         * @param path The remote path of the file
         */
        public OCFile(String path) {
         * @param path The remote path of the file
         */
        public OCFile(String path) {

+         resetData();

          update_while_saving_ = false;
                path_ = path;
          update_while_saving_ = false;
                path_ = path;

-               resetData();

        }
 
        /**
        }
 
        /**

diff --git a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
index a3eead9..698fda8 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -222,6 +222,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
                                Log.d(TAG, "No update for file/dir " + file.getFileName()\r
                                                + " is needed");\r
                        } else {\r
                                Log.d(TAG, "No update for file/dir " + file.getFileName()\r
                                                + " is needed");\r
                        } else {\r

+                         file = new OCFile(n.getProperty(NodeProperty.PATH));\r

                                Log.d(TAG, "File " + n.getProperty(NodeProperty.PATH)\r
                                                + " will be "\r
                                                + (file.fileExists() ? "updated" : "created"));\r
                                Log.d(TAG, "File " + n.getProperty(NodeProperty.PATH)\r
                                                + " will be "\r
                                                + (file.fileExists() ? "updated" : "created"));\r


@@ -231,7 +232,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
                                long create = n.getProperty(NodeProperty.CREATE_DATE) == null ? 0\r
                                                : Long.parseLong(n\r
                                                                .getProperty(NodeProperty.CREATE_DATE));\r
                                long create = n.getProperty(NodeProperty.CREATE_DATE) == null ? 0\r
                                                : Long.parseLong(n\r
                                                                .getProperty(NodeProperty.CREATE_DATE));\r

-                               file = new OCFile(n.getProperty(NodeProperty.PATH));\r
+\r

                                file.setFileLength(len);\r
                                file.setCreationTimestamp(create);\r
                                file.setModificationTimestamp(mod);\r
                                file.setFileLength(len);\r
                                file.setCreationTimestamp(create);\r
                                file.setModificationTimestamp(mod);\r

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
index 3f762da..fa3e904 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
@@ -23,6 +23,7 @@ import java.util.Vector;
 import android.accounts.Account;\r
 import android.content.Intent;\r
 import android.os.Bundle;\r
 import android.accounts.Account;\r
 import android.content.Intent;\r
 import android.os.Bundle;\r

+import android.util.Log;\r

 import android.view.View;\r
 import android.widget.AdapterView;\r
 import eu.alefzero.owncloud.R;\r
 import android.view.View;\r
 import android.widget.AdapterView;\r
 import eu.alefzero.owncloud.R;\r


@@ -56,8 +57,6 @@ public class FileListFragment extends FragmentListView {
 \r
     mAccount = AuthUtils.getCurrentOwnCloudAccount(getActivity());\r
     populateFileList();\r
 \r
     mAccount = AuthUtils.getCurrentOwnCloudAccount(getActivity());\r
     populateFileList();\r

-    // TODO: Remove this testing stuff\r
-    //addContact(mAccount, "Bartek Przybylski", "czlowiek");\r

   }\r
   \r
   @Override\r
   }\r
   \r
   @Override\r


@@ -80,6 +79,7 @@ public class FileListFragment extends FragmentListView {
     i.putExtra("FILE_NAME", file.getFileName());\r
     i.putExtra("FULL_PATH", file.getPath());\r
     i.putExtra("FILE_ID", id_);\r
     i.putExtra("FILE_NAME", file.getFileName());\r
     i.putExtra("FULL_PATH", file.getPath());\r
     i.putExtra("FILE_ID", id_);\r

+    Log.e("ASD", mAccount+"");\r

     i.putExtra("ACCOUNT", mAccount);\r
     FileDetailFragment fd = (FileDetailFragment) getFragmentManager().findFragmentById(R.id.fileDetail);\r
     if (fd != null) {\r
     i.putExtra("ACCOUNT", mAccount);\r
     FileDetailFragment fd = (FileDetailFragment) getFragmentManager().findFragmentById(R.id.fileDetail);\r
     if (fd != null) {\r


@@ -103,10 +103,10 @@ public class FileListFragment extends FragmentListView {
   private void populateFileList() {\r
     String s = "/";\r
     for (String a : mDirNames)\r
   private void populateFileList() {\r
     String s = "/";\r
     for (String a : mDirNames)\r

-      s+= a+"/";\r
+      s+= a + "/";\r

 \r
     mStorageManager = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
 \r
     mStorageManager = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r

-    OCFile file = new OCFile(s);\r
+    OCFile file = mStorageManager.getFileByPath(s);\r

     mFiles = mStorageManager.getDirectoryContent(file);\r
     setListAdapter(new FileListListAdapter(file, mStorageManager, getActivity()));\r
   }\r
     mFiles = mStorageManager.getDirectoryContent(file);\r
     setListAdapter(new FileListListAdapter(file, mStorageManager, getActivity()));\r
   }\r