Merge branch 'fragments-ui' of
authorLennart Rosam <lennart@familie-rosam.de>
Sun, 15 Apr 2012 10:41:36 +0000 (12:41 +0200)
committerLennart Rosam <lennart@familie-rosam.de>
Sun, 15 Apr 2012 10:41:36 +0000 (12:41 +0200)
ssh://git@gitorious.org/owncloud/android.git into fragments-ui

Conflicts:
src/eu/alefzero/owncloud/datamodel/OCFile.java

12 files changed:
res/layout/account_setup.xml
res/values/strings.xml
src/eu/alefzero/owncloud/authenticator/AuthUtils.java
src/eu/alefzero/owncloud/datamodel/DataStorageManager.java [new file with mode: 0644]
src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java [new file with mode: 0644]
src/eu/alefzero/owncloud/datamodel/OCFile.java
src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java
src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java
src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
src/eu/alefzero/owncloud/ui/adapter/FileListListAdapter.java
src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java

index 277ef36..9868b27 100644 (file)
                                        android:hint="@string/setup_hint_show_password"\r
                                        android:textColor="@android:color/black"\r
                                        android:onClick="onCheckboxClick"/>\r
+            </TableRow>\r
+            <TableRow android:id="@+id/tableRow6"\r
+                android:layout_width="fill_parent"\r
+                android:layout_height="wrap_content"\r
+                android:gravity="center_horizontal"\r
+                android:weightSum="1.0">\r
                 \r
+                <CheckBox\r
+          android:id="@+id/use_ssl"\r
+          android:layout_width="fill_parent"\r
+          android:layout_height="wrap_content"\r
+          android:layout_weight=".75"\r
+          android:hint="@string/use_ssl"\r
+          android:textColor="@android:color/black"\r
+          android:onClick="onCheckboxClick"/>\r
             </TableRow>\r
         </TableLayout>\r
 \r
index fc3fb85..7a2768f 100644 (file)
@@ -51,4 +51,5 @@
     <string name="uploader_upload_failed">Upload failed: </string>
     <string name="common_choose_account">Choose account</string>
     <string name="sync_string_contacts">Contacts</string>
+    <string name="use_ssl">Use Secure Connection</string>
 </resources>
index e3fc32c..8287e12 100644 (file)
@@ -244,6 +244,9 @@ public class AuthUtils {
                                  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
diff --git a/src/eu/alefzero/owncloud/datamodel/DataStorageManager.java b/src/eu/alefzero/owncloud/datamodel/DataStorageManager.java
new file mode 100644 (file)
index 0000000..1df12fd
--- /dev/null
@@ -0,0 +1,36 @@
+/* ownCloud Android client application
+ *   Copyright (C) 2012  Bartek Przybylski
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package eu.alefzero.owncloud.datamodel;
+
+import java.util.Vector;
+
+public interface DataStorageManager {
+
+  public OCFile getFileByPath(String path);
+  
+  public OCFile getFileById(long id);
+
+  public boolean fileExists(String path);
+  
+  public boolean fileExists(long id);
+  
+  public boolean saveFile(OCFile file);
+  
+  public Vector<OCFile> getDirectoryContent(OCFile f);
+}
diff --git a/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java b/src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java
new file mode 100644 (file)
index 0000000..3821278
--- /dev/null
@@ -0,0 +1,253 @@
+/* ownCloud Android client application
+ *   Copyright (C) 2012  Bartek Przybylski
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package eu.alefzero.owncloud.datamodel;
+
+import java.util.Vector;
+
+import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
+import android.accounts.Account;
+import android.content.ContentProviderClient;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.RemoteException;
+import android.util.Log;
+
+public class FileDataStorageManager implements DataStorageManager {
+
+  private ContentResolver mContentResolver;
+  private ContentProviderClient mContentProvider;
+  private Account mAccount;
+  
+  private static String TAG = "FileDataStorageManager";
+  
+  public FileDataStorageManager(Account account, ContentResolver cr) {
+    mContentProvider = null;
+    mContentResolver = cr;
+    mAccount = account;
+  }
+  
+  public FileDataStorageManager(Account account, ContentProviderClient cp) {
+    mContentProvider = cp;
+    mContentResolver = null;
+    mAccount = account;
+  }
+  
+  @Override
+  public OCFile getFileByPath(String path) {
+    Cursor c = getCursorForValue(ProviderTableMeta.FILE_PATH, path);
+    if (c.moveToFirst())
+      return createFileInstance(c);
+    return null;
+  }
+
+  @Override
+  public OCFile getFileById(long id) {
+    Cursor c = getCursorForValue(ProviderTableMeta._ID, String.valueOf(id));
+    if (c.moveToFirst())
+      return createFileInstance(c);
+    return null;
+  }
+
+  @Override
+  public boolean fileExists(long id) {
+    return fileExists(ProviderTableMeta._ID, String.valueOf(id));
+  }
+
+  @Override
+  public boolean fileExists(String path) {
+    return fileExists(ProviderTableMeta.FILE_PATH, path);
+  }
+
+  @Override
+  public boolean saveFile(OCFile file) {
+    boolean overriden = false;
+    ContentValues cv = new ContentValues();
+    cv.put(ProviderTableMeta.FILE_MODIFIED, file.getModificationTimestamp());
+    cv.put(ProviderTableMeta.FILE_CREATION, file.getCreationTimestamp());
+    cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, file.getFileLength());
+    cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, file.getMimetype());
+    cv.put(ProviderTableMeta.FILE_NAME, file.getFileName());
+    if (file.getParentId() != 0)
+      cv.put(ProviderTableMeta.FILE_PARENT, file.getParentId());
+    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) {
+        getContentResolver().update(ProviderTableMeta.CONTENT_URI,
+                                    cv,
+                                    ProviderTableMeta._ID + "=?",
+                                    new String[] {String.valueOf(file.getFileId())});
+      } else {
+        try {
+          getContentProvider().update(ProviderTableMeta.CONTENT_URI,
+                                      cv,
+                                      ProviderTableMeta._ID + "=?",
+                                      new String[] {String.valueOf(file.getFileId())});
+        } catch (RemoteException e) {
+          Log.e(TAG, "Fail to insert insert file to database " + e.getMessage());
+        }
+      }
+    } else {
+      Uri result_uri = null;
+      if (getContentResolver() != null) {
+        result_uri = getContentResolver().insert(ProviderTableMeta.CONTENT_URI_FILE, cv);
+      } else {
+        try {
+          result_uri = getContentProvider().insert(ProviderTableMeta.CONTENT_URI_FILE, cv);
+        } 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())
+      for (OCFile f : getDirectoryContent(file))
+        saveFile(f);
+    
+    return overriden;
+  }
+
+  public void setAccount(Account account) {
+    mAccount = account;
+  }
+  
+  public Account getAccount() {
+    return mAccount;
+  }
+  
+  public void setContentResolver(ContentResolver cr) {
+    mContentResolver = cr;
+  }
+  
+  public ContentResolver getContentResolver() {
+    return mContentResolver;
+  }
+  
+  public void setContentProvider(ContentProviderClient cp) {
+    mContentProvider = cp;
+  }
+  
+  public ContentProviderClient getContentProvider() {
+    return mContentProvider;
+  }
+
+  public Vector<OCFile> getDirectoryContent(OCFile f) {
+    if (f.isDirectory() && f.getFileId() != -1) {
+      Vector<OCFile> ret = new Vector<OCFile>();
+
+      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);
+        } catch (RemoteException e) {
+          Log.e(TAG, e.getMessage());
+          return ret;
+        }
+      } else {
+        c = getContentResolver().query(req_uri, null, null, null, null);
+      }
+
+      if (c.moveToFirst()) {
+        do {
+          OCFile child = createFileInstance(c);
+          ret.add(child);
+        } while (c.moveToNext());
+      }
+      
+      c.close();
+      return ret;
+    }
+    return null;
+  }
+
+  
+  private boolean fileExists(String cmp_key, String value) {
+    Cursor c;
+    if (getContentResolver() != null) {
+      c = getContentResolver().query(ProviderTableMeta.CONTENT_URI,
+                                    null,
+                                    cmp_key + "=?",
+                                    new String[] {value},
+                                    null);
+    } else {
+      try {
+        c = getContentProvider().query(ProviderTableMeta.CONTENT_URI,
+                                      null,
+                                      cmp_key + "=?",
+                                      new String[] {value},
+                                      null);
+      } catch (RemoteException e) {
+        Log.e(TAG, "Couldn't determine file existance, assuming non existance: " + e.getMessage());
+        return false;
+      }
+    }
+    return c.moveToFirst();
+  }
+  
+  private Cursor getCursorForValue(String key, String value) {
+    Cursor c = null;
+    if (getContentResolver() != null) {
+      c = getContentResolver().query(ProviderTableMeta.CONTENT_URI,
+                                     null,
+                                     key + "=?",
+                                     new String[] {value},
+                                     null);
+    } else {
+      try {
+        c = getContentProvider().query(ProviderTableMeta.CONTENT_URI,
+                                       null,
+                                       key + "=?",
+                                       new String[]{value},
+                                       null);
+      } catch (RemoteException e) {
+        Log.e(TAG, "Could not get file details: " + e.getMessage());
+        c = null;
+      }
+    }
+    return c;
+  }
+
+  private OCFile createFileInstance(Cursor c) {
+    OCFile file = null;
+    if (c != null) {
+      file = new OCFile(c.getString(c.getColumnIndex(ProviderTableMeta.FILE_PATH)));
+      file.setFileId(c.getLong(c.getColumnIndex(ProviderTableMeta._ID)));
+      file.setParentId(c.getLong(c.getColumnIndex(ProviderTableMeta.FILE_PARENT)));
+      file.setStoragePath(c.getString(c.getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH)));
+      file.setMimetype(c.getString(c.getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE)));
+      file.setFileLength(c.getLong(c.getColumnIndex(ProviderTableMeta.FILE_CONTENT_LENGTH)));
+      file.setCreationTimestamp(c.getLong(c.getColumnIndex(ProviderTableMeta.FILE_CREATION)));
+      file.setModificationTimestamp(c.getLong(c.getColumnIndex(ProviderTableMeta.FILE_MODIFIED)));
+    }
+    return file;
+  }
+
+}
index 4c74ad3..62bf065 100644 (file)
 package eu.alefzero.owncloud.datamodel;
 
 import java.io.File;
-import java.util.Vector;
-
-import android.accounts.Account;
-import android.content.ContentProviderClient;
-import android.content.ContentResolver;
-import android.content.ContentValues;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.RemoteException;
-import android.util.Log;
-import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
 
 public class OCFile {
-       private static String TAG = "OCFile";
-
-       private long id;
-       private long parentId;
-       private long length;
-       private long creationTimestamp;
-       private long modifiedTimestamp;
-       private String remotePath;
-       private String localStoragePath;
-       private String mimeType;
 
-       private ContentResolver contentResolver;
-       private ContentProviderClient providerClient;
-       private Account account;
-       
-       private OCFile(ContentProviderClient providerClient, Account account) {
-               this.account = account;
-               this.providerClient = providerClient;
-               resetData();
-       }
+       private long id_;
+       private long parent_id_;
+       private long length_;
+       private long creation_timestamp_;
+       private long modified_timestamp_;
+       private String path_;
+       private String storage_path_;
+       private String mimetype_;
+       private boolean update_while_saving_;
 
-       private OCFile(ContentResolver contentResolver, Account account) {
-               this.account = account;
-               this.contentResolver = contentResolver;
-               resetData();
-       }
-       
        /**
-        * Query the database for a {@link OCFile} belonging to a given account 
-        * and id.
+        * Create new {@link OCFile} with given path
         * 
-        * @param resolver The {@link ContentResolver} to use
-        * @param account The {@link Account} the {@link OCFile} belongs to
-        * @param id The ID the file has in the database
-        */
-       public OCFile(ContentResolver resolver, Account account, long id) {
-               this.contentResolver = resolver;
-               this.account = account;
-               Cursor c = this.contentResolver.query(ProviderTableMeta.CONTENT_URI_FILE,
-                               null, ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND "
-                                               + ProviderTableMeta._ID + "=?", new String[] {
-                                               this.account.name, String.valueOf(id) }, null);
-               if (c.moveToFirst())
-                       setFileData(c);
-       }
-
-       /**
-        * Query the database for a {@link OCFile} belonging to a given account
-        * and that matches remote path
-        * 
-        * @param contentResolver The {@link ContentResolver} to use
-        * @param account The {@link Account} the {@link OCFile} belongs to
         * @param path The remote path of the file
         */
-       public OCFile(ContentResolver contentResolver, Account account, String path) {
-               this.contentResolver = contentResolver;
-               this.account = account;
-
-               Cursor c = this.contentResolver.query(ProviderTableMeta.CONTENT_URI_FILE,
-                               null, ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND "
-                                               + ProviderTableMeta.FILE_PATH + "=?", new String[] {
-                                               this.account.name, path }, null);
-               if (c.moveToFirst()) {
-                       setFileData(c);
-                       if (remotePath != null)
-                               remotePath = path;
-               }
-       }
-       
-       public OCFile(ContentProviderClient cp, Account account, String path) {
-               this.providerClient = cp;
-               this.account = account;
-
-               try {
-                       Cursor c = this.providerClient.query(ProviderTableMeta.CONTENT_URI_FILE, null,
-                                       ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND "
-                                                       + ProviderTableMeta.FILE_PATH + "=?", new String[] {
-                                                       this.account.name, path }, null);
-                       if (c.moveToFirst()) {
-                               setFileData(c);
-                               if (remotePath != null)
-                                       remotePath = path;
-                       }
-               } catch (RemoteException e) {
-                       Log.d(TAG, e.getMessage());
-               }
-       }
-
-       /**
-        * Creates a new {@link OCFile}
-        *  
-        * @param providerClient The {@link ContentProviderClient} to use
-        * @param account The {@link Account} that this file belongs to
-        * @param path The remote path
-        * @param length The file size in bytes 
-        * @param creation_timestamp The UNIX timestamp of the creation date
-        * @param modified_timestamp The UNIX timestamp of the modification date
-        * @param mimetype The mimetype to set
-        * @param parent_id The parent folder of that file
-        * @return A new instance of {@link OCFile}
-        */
-       public static OCFile createNewFile(ContentProviderClient providerClient,
-                       Account account, String path, long length, long creation_timestamp,
-                       long modified_timestamp, String mimetype, long parent_id) {
-               OCFile new_file = new OCFile(providerClient, account);
-
-               try {
-                       Cursor c = new_file.providerClient.query(ProviderTableMeta.CONTENT_URI_FILE,
-                                       null, ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND "
-                                                       + ProviderTableMeta.FILE_PATH + "=?", new String[] {
-                                                       new_file.account.name, path }, null);
-                       if (c.moveToFirst())
-                               new_file.setFileData(c);
-                       c.close();
-               } catch (RemoteException e) {
-                       Log.e(TAG, e.getMessage());
-               }
-
-               new_file.remotePath = path;
-               new_file.length = length;
-               new_file.creationTimestamp = creation_timestamp;
-               new_file.modifiedTimestamp = modified_timestamp;
-               new_file.mimeType = mimetype;
-               new_file.parentId = parent_id;
-
-               return new_file;
+       public OCFile(String path) {
+         resetData();
+         update_while_saving_ = false;
+               path_ = path;
        }
 
        /**
-        * Creates a new {@link OCFile}
-        * 
-        * @param contentResolver The {@link ContentResolver} to use
-        * @param account The {@link Account} that this file belongs to
-        * @param path The remote path
-        * @param length The file size in bytes
-        * @param creation_timestamp The UNIX timestamp of the creation date
-        * @param modified_timestamp The UNIX timestamp of the modification date 
-        * @param mimetype The mimetype to set
-        * @param parent_id The parent folder of that file
-        * @return A new instance of {@link OCFile}
-        */
-       public static OCFile createNewFile(ContentResolver contentResolver,
-                       Account account, String path, int length, int creation_timestamp,
-                       int modified_timestamp, String mimetype, long parent_id) {
-               OCFile new_file = new OCFile(contentResolver, account);
-               Cursor c = new_file.contentResolver.query(
-                               ProviderTableMeta.CONTENT_URI_FILE, null,
-                               ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND "
-                                               + ProviderTableMeta.FILE_PATH + "=?", new String[] {
-                                               new_file.account.name, path }, null);
-               if (c.moveToFirst())
-                       new_file.setFileData(c);
-               c.close();
-
-               new_file.remotePath = path;
-               new_file.length = length;
-               new_file.creationTimestamp = creation_timestamp;
-               new_file.modifiedTimestamp = modified_timestamp;
-               new_file.mimeType = mimetype;
-               new_file.parentId = parent_id;
-
-               return new_file;
-       }
-
-
-       /**
         * Gets the ID of the file
         * 
         * @return the file ID
         */
        public long getFileId() {
-               return id;
+               return id_;
        }
 
        /**
@@ -212,7 +58,7 @@ public class OCFile {
         * @return The path
         */
        public String getPath() {
-               return remotePath;
+               return path_;
        }
 
        /**
@@ -222,7 +68,7 @@ public class OCFile {
         * @return true, if the file exists in the database
         */
        public boolean fileExists() {
-               return id != -1;
+               return id_ != -1;
        }
 
        /**
@@ -231,7 +77,7 @@ public class OCFile {
         * @return true if it is a directory
         */
        public boolean isDirectory() {
-               return mimeType != null && mimeType.equals("DIR");
+               return mimetype_ != null && mimetype_.equals("DIR");
        }
 
        /**
@@ -240,7 +86,7 @@ public class OCFile {
         * @return true if it is
         */
        public boolean isDownloaded() {
-               return localStoragePath != null;
+               return storage_path_ != null;
        }
 
        /**
@@ -249,7 +95,7 @@ public class OCFile {
         * @return The local path to the file
         */
        public String getStoragePath() {
-               return localStoragePath;
+               return storage_path_;
        }
 
        /**
@@ -259,7 +105,7 @@ public class OCFile {
         *            to set
         */
        public void setStoragePath(String storage_path) {
-               localStoragePath = storage_path;
+               storage_path_ = storage_path;
        }
 
        /**
@@ -268,7 +114,7 @@ public class OCFile {
         * @return A UNIX timestamp of the time that file was created
         */
        public long getCreationTimestamp() {
-               return creationTimestamp;
+               return creation_timestamp_;
        }
 
        /**
@@ -278,7 +124,7 @@ public class OCFile {
         *            to set
         */
        public void setCreationTimestamp(long creation_timestamp) {
-               creationTimestamp = creation_timestamp;
+               creation_timestamp_ = creation_timestamp;
        }
 
        /**
@@ -287,7 +133,7 @@ public class OCFile {
         * @return A UNIX timestamp of the modification time
         */
        public long getModificationTimestamp() {
-               return modifiedTimestamp;
+               return modified_timestamp_;
        }
 
        /**
@@ -297,7 +143,7 @@ public class OCFile {
         *            to set
         */
        public void setModificationTimestamp(long modification_timestamp) {
-               modifiedTimestamp = modification_timestamp;
+               modified_timestamp_ = modification_timestamp;
        }
 
        /**
@@ -306,8 +152,8 @@ public class OCFile {
         * @return The name of the file
         */
        public String getFileName() {
-               if (remotePath != null) {
-                       File f = new File(remotePath);
+               if (path_ != null) {
+                       File f = new File(path_);
                        return f.getName().equals("") ? "/" : f.getName();
                }
                return null;
@@ -319,158 +165,64 @@ public class OCFile {
         * @return the Mimetype as a String
         */
        public String getMimetype() {
-               return mimeType;
-       }
-
-       /**
-        * Instruct the file to save itself to the database
-        */
-       public void save() {
-               ContentValues cv = new ContentValues();
-               cv.put(ProviderTableMeta.FILE_MODIFIED, modifiedTimestamp);
-               cv.put(ProviderTableMeta.FILE_CREATION, creationTimestamp);
-               cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, length);
-               cv.put(ProviderTableMeta.FILE_CONTENT_TYPE, mimeType);
-               cv.put(ProviderTableMeta.FILE_NAME, getFileName());
-               if (parentId != 0)
-                       cv.put(ProviderTableMeta.FILE_PARENT, parentId);
-               cv.put(ProviderTableMeta.FILE_PATH, remotePath);
-               cv.put(ProviderTableMeta.FILE_STORAGE_PATH, localStoragePath);
-               cv.put(ProviderTableMeta.FILE_ACCOUNT_OWNER, account.name);
-
-               if (fileExists()) {
-                       if (providerClient != null) {
-                               try {
-                                       providerClient.update(ProviderTableMeta.CONTENT_URI, cv,
-                                                       ProviderTableMeta._ID + "=?",
-                                                       new String[] { String.valueOf(id) });
-                               } catch (RemoteException e) {
-                                       Log.e(TAG, e.getMessage());
-                                       return;
-                               }
-                       } else {
-                               contentResolver.update(ProviderTableMeta.CONTENT_URI, cv,
-                                               ProviderTableMeta._ID + "=?",
-                                               new String[] { String.valueOf(id) });
-                       }
-               } else {
-                       Uri new_entry = null;
-                       if (providerClient != null) {
-                               try {
-                                       new_entry = providerClient.insert(ProviderTableMeta.CONTENT_URI_FILE,
-                                                       cv);
-                               } catch (RemoteException e) {
-                                       Log.e(TAG, e.getMessage());
-                                       id = -1;
-                                       return;
-                               }
-                       } else {
-                               new_entry = contentResolver.insert(
-                                               ProviderTableMeta.CONTENT_URI_FILE, cv);
-                       }
-                       try {
-                               String p = new_entry.getEncodedPath();
-                               id = Integer.parseInt(p.substring(p.lastIndexOf('/') + 1));
-                       } catch (NumberFormatException e) {
-                               Log.e(TAG,
-                                               "Can't retrieve file id from uri: "
-                                                               + new_entry.toString() + ", reason: "
-                                                               + e.getMessage());
-                               id = -1;
-                       }
-               }
-       }
-
-       /**
-        * List the directory content
-        * 
-        * @return The directory content or null, if the file is not a directory
-        */
-       public Vector<OCFile> getDirectoryContent() {
-               if (isDirectory() && id != -1) {
-                       Vector<OCFile> ret = new Vector<OCFile>();
-
-                       Uri req_uri = Uri.withAppendedPath(
-                                       ProviderTableMeta.CONTENT_URI_DIR, String.valueOf(id));
-                       Cursor c = null;
-                       if (providerClient != null) {
-                               try {
-                                       c = providerClient.query(req_uri, null, null, null, null);
-                               } catch (RemoteException e) {
-                                       Log.e(TAG, e.getMessage());
-                                       return ret;
-                               }
-                       } else {
-                               c = contentResolver.query(req_uri, null, null, null, null);
-                       }
-
-                       if (c.moveToFirst())
-                               do {
-                                       OCFile child = new OCFile(providerClient, account);
-                                       child.setFileData(c);
-                                       ret.add(child);
-                               } while (c.moveToNext());
-
-                       c.close();
-                       return ret;
-               }
-               return null;
+               return mimetype_;
        }
 
        /**
         * Adds a file to this directory. If this file is not a directory, an
         * exception gets thrown.
         * 
-        * @param file
-        *            to add
-        * @throws IllegalStateException
-        *             if you try to add a something and this is not a directory
+        * @param file to add
+        * @throws IllegalStateException if you try to add a something and this is not a directory
         */
        public void addFile(OCFile file) throws IllegalStateException {
                if (isDirectory()) {
-                       file.parentId = id;
-                       file.save();
+                       file.parent_id_ = id_;
+                       update_while_saving_ = true;
                        return;
                }
-               throw new IllegalStateException(
-                               "This is not a directory where you can add stuff to!");
+               throw new IllegalStateException("This is not a directory where you can add stuff to!");
        }
 
        /**
         * Used internally. Reset all file properties
         */
        private void resetData() {
-               id = -1;
-               remotePath = null;
-               parentId = 0;
-               localStoragePath = null;
-               mimeType = null;
-               length = 0;
-               creationTimestamp = 0;
-               modifiedTimestamp = 0;
+               id_ = -1;
+               path_ = null;
+               parent_id_ = 0;
+               storage_path_ = null;
+               mimetype_ = null;
+               length_ = 0;
+               creation_timestamp_ = 0;
+               modified_timestamp_ = 0;
        }
 
-       /**
-        * Used internally. Set properties based on the information in a {@link android.database.Cursor}
-        * @param c the Cursor containing the information
-        */
-       private void setFileData(Cursor c) {
-               resetData();
-               if (c != null) {
-                       id = c.getLong(c.getColumnIndex(ProviderTableMeta._ID));
-                       remotePath = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_PATH));
-                       parentId = c.getLong(c
-                                       .getColumnIndex(ProviderTableMeta.FILE_PARENT));
-                       localStoragePath = c.getString(c
-                                       .getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH));
-                       mimeType = c.getString(c
-                                       .getColumnIndex(ProviderTableMeta.FILE_CONTENT_TYPE));
-                       length = c.getLong(c
-                                       .getColumnIndex(ProviderTableMeta.FILE_CONTENT_LENGTH));
-                       creationTimestamp = c.getLong(c
-                                       .getColumnIndex(ProviderTableMeta.FILE_CREATION));
-                       modifiedTimestamp = c.getLong(c
-                                       .getColumnIndex(ProviderTableMeta.FILE_MODIFIED));
-               }
+       public void setFileId(long file_id) {
+         id_ = file_id;
        }
+       
+       public void setMimetype(String mimetype) {
+         mimetype_ = mimetype;
+       }
+       
+       public void setParentId(long parent_id) {
+         parent_id_ = parent_id;
+       }
+       
+       public void setFileLength(long file_len) {
+         length_ = file_len;
+       }
+       
+  public long getFileLength() {
+    return length_;
+  }
+  
+  public long getParentId() {
+    return parent_id_;
+  }
+  
+  public boolean needsUpdatingWhileSaving() {
+    return update_while_saving_;
+  }
 }
index 41a0503..698fda8 100644 (file)
@@ -44,6 +44,7 @@ import android.net.Uri;
 import android.text.TextUtils;\r
 import android.util.Log;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
+import eu.alefzero.owncloud.datamodel.DataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.webdav.HttpPropFind;\r
 import eu.alefzero.webdav.TreeNode;\r
@@ -65,6 +66,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
        private Account account;\r
        private ContentProviderClient contentProvider;\r
        private Date lastUpdated;\r
+       private DataStorageManager mStoreManager;\r
 \r
        private HttpHost mHost;\r
        private WebdavClient mClient = null;\r
@@ -107,6 +109,14 @@ public abstract class AbstractOwnCloudSyncAdapter extends
                this.lastUpdated = lastUpdated;\r
        }\r
 \r
+       public void setStorageManager(DataStorageManager storage_manager) {\r
+         mStoreManager = storage_manager;\r
+       }\r
+       \r
+       public DataStorageManager getStorageManager() {\r
+         return mStoreManager;\r
+       }\r
+       \r
        protected ConnectionKeepAliveStrategy getKeepAliveStrategy() {\r
                return new ConnectionKeepAliveStrategy() {\r
                        public long getKeepAliveDuration(HttpResponse response,\r
@@ -206,12 +216,13 @@ public abstract class AbstractOwnCloudSyncAdapter extends
                        long mod = n.getProperty(NodeProperty.LAST_MODIFIED_DATE) == null ? 0\r
                                        : Long.parseLong(n\r
                                                        .getProperty(NodeProperty.LAST_MODIFIED_DATE));\r
-                       OCFile file = new OCFile(getContentProvider(), getAccount(),\r
-                                       n.getProperty(NodeProperty.PATH));\r
-                       if (file.fileExists() && file.getModificationTimestamp() >= mod) {\r
+                       \r
+                       OCFile file = getStorageManager().getFileByPath(n.getProperty(NodeProperty.PATH));\r
+                       if (file != null && file.fileExists() && file.getModificationTimestamp() >= mod) {\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
@@ -221,10 +232,13 @@ public abstract class AbstractOwnCloudSyncAdapter extends
                                long create = n.getProperty(NodeProperty.CREATE_DATE) == null ? 0\r
                                                : Long.parseLong(n\r
                                                                .getProperty(NodeProperty.CREATE_DATE));\r
-                               file = OCFile.createNewFile(getContentProvider(), getAccount(),\r
-                                               n.getProperty(NodeProperty.PATH), len, create, mod,\r
-                                               n.getProperty(NodeProperty.RESOURCE_TYPE), parent_id);\r
-                               file.save();\r
+\r
+                               file.setFileLength(len);\r
+                               file.setCreationTimestamp(create);\r
+                               file.setModificationTimestamp(mod);\r
+                               file.setMimetype(n.getProperty(NodeProperty.RESOURCE_TYPE));\r
+                               file.setParentId(parent_id);\r
+                               getStorageManager().saveFile(file);\r
                                if (override_parent) {\r
                                        parent_id = file.getFileId();\r
                                        override_parent = false;\r
index 43b1547..02920a1 100644 (file)
@@ -34,6 +34,7 @@ import android.net.Uri;
 import android.os.Bundle;\r
 import android.os.RemoteException;\r
 import android.util.Log;\r
+import eu.alefzero.owncloud.datamodel.FileDataStorageManager;\r
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;\r
 import eu.alefzero.webdav.HttpPropFind;\r
 import eu.alefzero.webdav.TreeNode;\r
@@ -64,6 +65,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
                try {\r
                        this.setAccount(account);\r
                        this.setContentProvider(provider);\r
+                       this.setStorageManager(new FileDataStorageManager(account, getContentProvider()));\r
 \r
                        HttpPropFind query = this.getPropFindQuery();\r
                        query.setEntity(new StringEntity(WebdavUtils.prepareXmlForPropFind()));\r
index f134630..b6c9dda 100644 (file)
@@ -54,10 +54,15 @@ import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
 public class AuthenticatorActivity extends AccountAuthenticatorActivity {\r
     private Thread mAuthThread;\r
     private final Handler mHandler = new Handler();\r
+    private boolean mUseSSLConnection;\r
 \r
     public static final String PARAM_USERNAME = "param_Username";\r
     public static final String PARAM_HOSTNAME = "param_Hostname";\r
 \r
+    public AuthenticatorActivity() {\r
+      mUseSSLConnection = false;\r
+    }\r
+    \r
     @Override\r
     protected void onCreate(Bundle savedInstanceState) {\r
         super.onCreate(savedInstanceState);\r
@@ -162,12 +167,15 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
             url_text.setTextColor(Color.RED);\r
             hasErrors = true;\r
         } else {\r
-            url_text.setTextColor(Color.BLACK);\r
+            url_text.setTextColor(android.R.color.primary_text_light);\r
         }\r
         try {\r
             String url_str = url_text.getText().toString();\r
             if (!url_str.startsWith("http://") &&\r
                     !url_str.startsWith("https://")) {\r
+              if (mUseSSLConnection)\r
+                url_str = "https://" + url_str;\r
+              else\r
                 url_str = "http://" + url_str;\r
             }\r
             uri = new URL(url_str);\r
@@ -182,18 +190,33 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
             username_text.setTextColor(Color.RED);\r
             hasErrors = true;\r
         } else {\r
-            username_text.setTextColor(Color.BLACK);\r
+            username_text.setTextColor(android.R.color.primary_text_light);\r
         }\r
 \r
         if (password_text.getText().toString().trim().length() == 0) {\r
             password_text.setTextColor(Color.RED);\r
             hasErrors = true;\r
         } else {\r
-            password_text.setTextColor(Color.BLACK);\r
+            password_text.setTextColor(android.R.color.primary_text_light);\r
         }\r
         if (hasErrors) {\r
             return;\r
         }\r
+        \r
+        int new_port = uri.getPort();\r
+        if (new_port == -1) {\r
+          if (mUseSSLConnection)\r
+            new_port = 443;\r
+          else\r
+            new_port = 80;\r
+        }\r
+        \r
+        try {\r
+          uri = new URL(uri.getProtocol(), uri.getHost(), new_port, uri.getPath());\r
+        } catch (MalformedURLException e) {\r
+          e.printStackTrace(); // should not happend\r
+        }\r
+        \r
         showDialog(0);\r
         mAuthThread = AuthUtils.attemptAuth(uri,\r
                 username_text.getText().toString(),\r
@@ -205,17 +228,26 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
     /**\r
      * Handles the show password checkbox\r
      * @author robstar\r
+     * @author aqu\r
      * @param view\r
      */\r
     public void onCheckboxClick(View view) {\r
-       CheckBox checkbox = (CheckBox) findViewById(R.id.show_password);\r
-       TextView password_text = (TextView) findViewById(R.id.account_password);\r
-       \r
-       if(checkbox.isChecked()) {\r
-               password_text.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);\r
-       } else {\r
-               password_text.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);\r
-       }\r
+      switch (view.getId()) {\r
+        case R.id.show_password:\r
+          TextView password_text = (TextView) findViewById(R.id.account_password);\r
+          \r
+          if(((CheckBox)view).isChecked()) {\r
+            password_text.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);\r
+          } else {\r
+            password_text.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);\r
+          }\r
+        break;\r
+        case R.id.use_ssl:\r
+          mUseSSLConnection = ((CheckBox)view).isChecked();\r
+        break;\r
+        default:\r
+          Log.d("AuthActivity", "Clicked invalid view with id: " + view.getId());\r
+      }\r
        \r
     }\r
 }\r
index 10a8671..5ae763c 100644 (file)
@@ -45,6 +45,8 @@ import com.actionbarsherlock.view.MenuItem;
 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.authenticator.AuthUtils;\r
+import eu.alefzero.owncloud.datamodel.DataStorageManager;\r
+import eu.alefzero.owncloud.datamodel.FileDataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.owncloud.ui.fragment.FileListFragment;\r
 import eu.alefzero.webdav.WebdavClient;\r
@@ -59,6 +61,7 @@ import eu.alefzero.webdav.WebdavClient;
 public class FileDisplayActivity extends SherlockFragmentActivity implements\r
                OnNavigationListener {\r
        private ArrayAdapter<String> mDirectories;\r
+       private DataStorageManager mStorageManager;\r
 \r
        private static final int DIALOG_CHOOSE_ACCOUNT = 0;\r
 \r
@@ -92,12 +95,15 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                                for (int i = mDirectories.getCount() - 2; i >= 0; --i) {\r
                                        path += "/" + mDirectories.getItem(i);\r
                                }\r
-                               OCFile parent = new OCFile(getContentResolver(), a, path + "/");\r
-                               path += "/" + s + "/";\r
+                               OCFile parent = mStorageManager.getFileByPath(path + "/");\r
+                               path += s + "/";\r
                                Thread thread = new Thread(new DirectoryCreator(path, a));\r
                                thread.start();\r
-                               OCFile.createNewFile(getContentResolver(), a, path, 0, 0, 0,\r
-                                               "DIR", parent.getFileId()).save();\r
+                               \r
+                               OCFile new_file = new OCFile(path);\r
+                               new_file.setMimetype("DIR");\r
+                               new_file.setParentId(parent.getParentId());\r
+                               mStorageManager.saveFile(new_file);\r
 \r
                                dialog.dismiss();\r
                        }\r
@@ -118,6 +124,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                                R.layout.sherlock_spinner_dropdown_item);\r
                mDirectories.add("/");\r
                setContentView(R.layout.files);\r
+               mStorageManager = new FileDataStorageManager(AuthUtils.getCurrentOwnCloudAccount(this), getContentResolver());\r
                ActionBar action_bar = getSupportActionBar();\r
                action_bar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);\r
                action_bar.setDisplayShowTitleEnabled(false);\r
@@ -272,4 +279,4 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 \r
                \r
        }\r
-}
\ No newline at end of file
+}
index fa72803..d0d102a 100644 (file)
@@ -21,6 +21,7 @@ import java.util.Vector;
 \r
 import eu.alefzero.owncloud.DisplayUtils;\r
 import eu.alefzero.owncloud.R;\r
+import eu.alefzero.owncloud.datamodel.DataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 \r
 import android.content.Context;\r
@@ -42,10 +43,12 @@ public class FileListListAdapter implements ListAdapter {
   private Context mContext;\r
   private OCFile mFile;\r
   private Vector<OCFile> mFiles;\r
+  private DataStorageManager mStorageManager;\r
   \r
-  public FileListListAdapter(OCFile file, Context context) {\r
+  public FileListListAdapter(OCFile file, DataStorageManager storage_man, Context context) {\r
     mFile = file;\r
-    mFiles = mFile.getDirectoryContent();\r
+    mStorageManager = storage_man;\r
+    mFiles = mStorageManager.getDirectoryContent(mFile);\r
     mContext = context;\r
   }\r
   \r
index a8bc9d3..fa3e904 100644 (file)
@@ -23,10 +23,13 @@ import java.util.Vector;
 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 eu.alefzero.owncloud.authenticator.AuthUtils;\r
+import eu.alefzero.owncloud.datamodel.DataStorageManager;\r
+import eu.alefzero.owncloud.datamodel.FileDataStorageManager;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.owncloud.ui.FragmentListView;\r
 import eu.alefzero.owncloud.ui.activity.FileDetailActivity;\r
@@ -42,6 +45,7 @@ public class FileListFragment extends FragmentListView {
   private Account mAccount;\r
   private Stack<String> mDirNames;\r
   private Vector<OCFile> mFiles;\r
+  private DataStorageManager mStorageManager;\r
 \r
   public FileListFragment() {\r
     mDirNames = new Stack<String>();\r
@@ -53,8 +57,6 @@ public class FileListFragment extends FragmentListView {
 \r
     mAccount = AuthUtils.getCurrentOwnCloudAccount(getActivity());\r
     populateFileList();\r
-    // TODO: Remove this testing stuff\r
-    //addContact(mAccount, "Bartek Przybylski", "czlowiek");\r
   }\r
   \r
   @Override\r
@@ -77,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
+    Log.e("ASD", mAccount+"");\r
     i.putExtra("ACCOUNT", mAccount);\r
     FileDetailFragment fd = (FileDetailFragment) getFragmentManager().findFragmentById(R.id.fileDetail);\r
     if (fd != null) {\r
@@ -100,11 +103,12 @@ public class FileListFragment extends FragmentListView {
   private void populateFileList() {\r
     String s = "/";\r
     for (String a : mDirNames)\r
-      s+= a+"/";\r
+      s+= a + "/";\r
 \r
-    OCFile file = new OCFile(getActivity().getContentResolver(), mAccount, s);\r
-    mFiles = file.getDirectoryContent();\r
-    setListAdapter(new FileListListAdapter(file, getActivity()));\r
+    mStorageManager = new FileDataStorageManager(mAccount, getActivity().getContentResolver());\r
+    OCFile file = mStorageManager.getFileByPath(s);\r
+    mFiles = mStorageManager.getDirectoryContent(file);\r
+    setListAdapter(new FileListListAdapter(file, mStorageManager, getActivity()));\r
   }\r
   \r
   //TODO: Delete this testing stuff.\r