Merge branch 'fragments-ui' of

ssh://git@gitorious.org/owncloud/android.git into fragments-ui

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

res/layout/account_setup.xml

@@ -134,7 +134,21 @@
 					android:hint="@string/setup_hint_show_password"
 					android:textColor="@android:color/black"
 					android:onClick="onCheckboxClick"/>
+            </TableRow>
+            <TableRow android:id="@+id/tableRow6"
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:weightSum="1.0">
                 
+                <CheckBox
+          android:id="@+id/use_ssl"
+          android:layout_width="fill_parent"
+          android:layout_height="wrap_content"
+          android:layout_weight=".75"
+          android:hint="@string/use_ssl"
+          android:textColor="@android:color/black"
+          android:onClick="onCheckboxClick"/>
             </TableRow>
         </TableLayout>
 

res/values/strings.xml

@@ -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>

src/eu/alefzero/owncloud/authenticator/AuthUtils.java

@@ -244,6 +244,9 @@ public class AuthUtils {
 				  break;
 			  }
 		  }
+	  } else if (ocAccounts.length != 0) {
+	    // we at least need to take first account as fallback
+	    defaultAccount = ocAccounts[0];
 	  }
 	  
 	return defaultAccount;

src/eu/alefzero/owncloud/datamodel/DataStorageManager.java

@@ -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);
+}

src/eu/alefzero/owncloud/datamodel/FileDataStorageManager.java

@@ -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;
+  }
+
+}

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

@@ -19,191 +19,37 @@
 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_;
+  }
 }

src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java

@@ -44,6 +44,7 @@ import android.net.Uri;
 import android.text.TextUtils;
 import android.util.Log;
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
+import eu.alefzero.owncloud.datamodel.DataStorageManager;
 import eu.alefzero.owncloud.datamodel.OCFile;
 import eu.alefzero.webdav.HttpPropFind;
 import eu.alefzero.webdav.TreeNode;
@@ -65,6 +66,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends
 	private Account account;
 	private ContentProviderClient contentProvider;
 	private Date lastUpdated;
+	private DataStorageManager mStoreManager;
 
 	private HttpHost mHost;
 	private WebdavClient mClient = null;
@@ -107,6 +109,14 @@ public abstract class AbstractOwnCloudSyncAdapter extends
 		this.lastUpdated = lastUpdated;
 	}
 
+	public void setStorageManager(DataStorageManager storage_manager) {
+	  mStoreManager = storage_manager;
+	}
+	
+	public DataStorageManager getStorageManager() {
+	  return mStoreManager;
+	}
+	
 	protected ConnectionKeepAliveStrategy getKeepAliveStrategy() {
 		return new ConnectionKeepAliveStrategy() {
 			public long getKeepAliveDuration(HttpResponse response,
@@ -206,12 +216,13 @@ public abstract class AbstractOwnCloudSyncAdapter extends
 			long mod = n.getProperty(NodeProperty.LAST_MODIFIED_DATE) == null ? 0
 					: Long.parseLong(n
 							.getProperty(NodeProperty.LAST_MODIFIED_DATE));
-			OCFile file = new OCFile(getContentProvider(), getAccount(),
-					n.getProperty(NodeProperty.PATH));
-			if (file.fileExists() && file.getModificationTimestamp() >= mod) {
+			
+			OCFile file = getStorageManager().getFileByPath(n.getProperty(NodeProperty.PATH));
+			if (file != null && file.fileExists() && file.getModificationTimestamp() >= mod) {
 				Log.d(TAG, "No update for file/dir " + file.getFileName()
 						+ " is needed");
 			} else {
+			  file = new OCFile(n.getProperty(NodeProperty.PATH));
 				Log.d(TAG, "File " + n.getProperty(NodeProperty.PATH)
 						+ " will be "
 						+ (file.fileExists() ? "updated" : "created"));
@@ -221,10 +232,13 @@ public abstract class AbstractOwnCloudSyncAdapter extends
 				long create = n.getProperty(NodeProperty.CREATE_DATE) == null ? 0
 						: Long.parseLong(n
 								.getProperty(NodeProperty.CREATE_DATE));
-				file = OCFile.createNewFile(getContentProvider(), getAccount(),
-						n.getProperty(NodeProperty.PATH), len, create, mod,
-						n.getProperty(NodeProperty.RESOURCE_TYPE), parent_id);
-				file.save();
+
+				file.setFileLength(len);
+				file.setCreationTimestamp(create);
+				file.setModificationTimestamp(mod);
+				file.setMimetype(n.getProperty(NodeProperty.RESOURCE_TYPE));
+				file.setParentId(parent_id);
+				getStorageManager().saveFile(file);
 				if (override_parent) {
 					parent_id = file.getFileId();
 					override_parent = false;

src/eu/alefzero/owncloud/syncadapter/FileSyncAdapter.java

@@ -34,6 +34,7 @@ import android.net.Uri;
 import android.os.Bundle;
 import android.os.RemoteException;
 import android.util.Log;
+import eu.alefzero.owncloud.datamodel.FileDataStorageManager;
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
 import eu.alefzero.webdav.HttpPropFind;
 import eu.alefzero.webdav.TreeNode;
@@ -64,6 +65,7 @@ public class FileSyncAdapter extends AbstractOwnCloudSyncAdapter {
 		try {
 			this.setAccount(account);
 			this.setContentProvider(provider);
+			this.setStorageManager(new FileDataStorageManager(account, getContentProvider()));
 
 			HttpPropFind query = this.getPropFindQuery();
 			query.setEntity(new StringEntity(WebdavUtils.prepareXmlForPropFind()));

src/eu/alefzero/owncloud/ui/activity/AuthenticatorActivity.java

@@ -54,10 +54,15 @@ import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
 public class AuthenticatorActivity extends AccountAuthenticatorActivity {
     private Thread mAuthThread;
     private final Handler mHandler = new Handler();
+    private boolean mUseSSLConnection;
 
     public static final String PARAM_USERNAME = "param_Username";
     public static final String PARAM_HOSTNAME = "param_Hostname";
 
+    public AuthenticatorActivity() {
+      mUseSSLConnection = false;
+    }
+    
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -162,12 +167,15 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
             url_text.setTextColor(Color.RED);
             hasErrors = true;
         } else {
-            url_text.setTextColor(Color.BLACK);
+            url_text.setTextColor(android.R.color.primary_text_light);
         }
         try {
             String url_str = url_text.getText().toString();
             if (!url_str.startsWith("http://") &&
                     !url_str.startsWith("https://")) {
+              if (mUseSSLConnection)
+                url_str = "https://" + url_str;
+              else
                 url_str = "http://" + url_str;
             }
             uri = new URL(url_str);
@@ -182,18 +190,33 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
             username_text.setTextColor(Color.RED);
             hasErrors = true;
         } else {
-            username_text.setTextColor(Color.BLACK);
+            username_text.setTextColor(android.R.color.primary_text_light);
         }
 
         if (password_text.getText().toString().trim().length() == 0) {
             password_text.setTextColor(Color.RED);
             hasErrors = true;
         } else {
-            password_text.setTextColor(Color.BLACK);
+            password_text.setTextColor(android.R.color.primary_text_light);
         }
         if (hasErrors) {
             return;
         }
+        
+        int new_port = uri.getPort();
+        if (new_port == -1) {
+          if (mUseSSLConnection)
+            new_port = 443;
+          else
+            new_port = 80;
+        }
+        
+        try {
+          uri = new URL(uri.getProtocol(), uri.getHost(), new_port, uri.getPath());
+        } catch (MalformedURLException e) {
+          e.printStackTrace(); // should not happend
+        }
+        
         showDialog(0);
         mAuthThread = AuthUtils.attemptAuth(uri,
                 username_text.getText().toString(),
@@ -205,17 +228,26 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity {
     /**
      * Handles the show password checkbox
      * @author robstar
+     * @author aqu
      * @param view
      */
     public void onCheckboxClick(View view) {
-    	CheckBox checkbox = (CheckBox) findViewById(R.id.show_password);
-    	TextView password_text = (TextView) findViewById(R.id.account_password);
-    	
-    	if(checkbox.isChecked()) {
-    		password_text.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);
-    	} else {
-    		password_text.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
-    	}
+      switch (view.getId()) {
+        case R.id.show_password:
+          TextView password_text = (TextView) findViewById(R.id.account_password);
+          
+          if(((CheckBox)view).isChecked()) {
+            password_text.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD);
+          } else {
+            password_text.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD);
+          }
+        break;
+        case R.id.use_ssl:
+          mUseSSLConnection = ((CheckBox)view).isChecked();
+        break;
+        default:
+          Log.d("AuthActivity", "Clicked invalid view with id: " + view.getId());
+      }
     	
     }
 }

src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java

@@ -45,6 +45,8 @@ import com.actionbarsherlock.view.MenuItem;
 import eu.alefzero.owncloud.R;
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;
 import eu.alefzero.owncloud.authenticator.AuthUtils;
+import eu.alefzero.owncloud.datamodel.DataStorageManager;
+import eu.alefzero.owncloud.datamodel.FileDataStorageManager;
 import eu.alefzero.owncloud.datamodel.OCFile;
 import eu.alefzero.owncloud.ui.fragment.FileListFragment;
 import eu.alefzero.webdav.WebdavClient;
@@ -59,6 +61,7 @@ import eu.alefzero.webdav.WebdavClient;
 public class FileDisplayActivity extends SherlockFragmentActivity implements
 		OnNavigationListener {
 	private ArrayAdapter<String> mDirectories;
+	private DataStorageManager mStorageManager;
 
 	private static final int DIALOG_CHOOSE_ACCOUNT = 0;
 
@@ -92,12 +95,15 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 				for (int i = mDirectories.getCount() - 2; i >= 0; --i) {
 					path += "/" + mDirectories.getItem(i);
 				}
-				OCFile parent = new OCFile(getContentResolver(), a, path + "/");
-				path += "/" + s + "/";
+				OCFile parent = mStorageManager.getFileByPath(path + "/");
+				path += s + "/";
 				Thread thread = new Thread(new DirectoryCreator(path, a));
 				thread.start();
-				OCFile.createNewFile(getContentResolver(), a, path, 0, 0, 0,
-						"DIR", parent.getFileId()).save();
+				
+				OCFile new_file = new OCFile(path);
+				new_file.setMimetype("DIR");
+				new_file.setParentId(parent.getParentId());
+				mStorageManager.saveFile(new_file);
 
 				dialog.dismiss();
 			}
@@ -118,6 +124,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 				R.layout.sherlock_spinner_dropdown_item);
 		mDirectories.add("/");
 		setContentView(R.layout.files);
+		mStorageManager = new FileDataStorageManager(AuthUtils.getCurrentOwnCloudAccount(this), getContentResolver());
 		ActionBar action_bar = getSupportActionBar();
 		action_bar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
 		action_bar.setDisplayShowTitleEnabled(false);
@@ -272,4 +279,4 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
 
 		
 	}
-}
+}

src/eu/alefzero/owncloud/ui/adapter/FileListListAdapter.java

@@ -21,6 +21,7 @@ import java.util.Vector;
 
 import eu.alefzero.owncloud.DisplayUtils;
 import eu.alefzero.owncloud.R;
+import eu.alefzero.owncloud.datamodel.DataStorageManager;
 import eu.alefzero.owncloud.datamodel.OCFile;
 
 import android.content.Context;
@@ -42,10 +43,12 @@ public class FileListListAdapter implements ListAdapter {
   private Context mContext;
   private OCFile mFile;
   private Vector<OCFile> mFiles;
+  private DataStorageManager mStorageManager;
   
-  public FileListListAdapter(OCFile file, Context context) {
+  public FileListListAdapter(OCFile file, DataStorageManager storage_man, Context context) {
     mFile = file;
-    mFiles = mFile.getDirectoryContent();
+    mStorageManager = storage_man;
+    mFiles = mStorageManager.getDirectoryContent(mFile);
     mContext = context;
   }
   

src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java

@@ -23,10 +23,13 @@ import java.util.Vector;
 import android.accounts.Account;
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.AdapterView;
 import eu.alefzero.owncloud.R;
 import eu.alefzero.owncloud.authenticator.AuthUtils;
+import eu.alefzero.owncloud.datamodel.DataStorageManager;
+import eu.alefzero.owncloud.datamodel.FileDataStorageManager;
 import eu.alefzero.owncloud.datamodel.OCFile;
 import eu.alefzero.owncloud.ui.FragmentListView;
 import eu.alefzero.owncloud.ui.activity.FileDetailActivity;
@@ -42,6 +45,7 @@ public class FileListFragment extends FragmentListView {
   private Account mAccount;
   private Stack<String> mDirNames;
   private Vector<OCFile> mFiles;
+  private DataStorageManager mStorageManager;
 
   public FileListFragment() {
     mDirNames = new Stack<String>();
@@ -53,8 +57,6 @@ public class FileListFragment extends FragmentListView {
 
     mAccount = AuthUtils.getCurrentOwnCloudAccount(getActivity());
     populateFileList();
-    // TODO: Remove this testing stuff
-    //addContact(mAccount, "Bartek Przybylski", "czlowiek");
   }
   
   @Override
@@ -77,6 +79,7 @@ public class FileListFragment extends FragmentListView {
     i.putExtra("FILE_NAME", file.getFileName());
     i.putExtra("FULL_PATH", file.getPath());
     i.putExtra("FILE_ID", id_);
+    Log.e("ASD", mAccount+"");
     i.putExtra("ACCOUNT", mAccount);
     FileDetailFragment fd = (FileDetailFragment) getFragmentManager().findFragmentById(R.id.fileDetail);
     if (fd != null) {
@@ -100,11 +103,12 @@ public class FileListFragment extends FragmentListView {
   private void populateFileList() {
     String s = "/";
     for (String a : mDirNames)
-      s+= a+"/";
+      s+= a + "/";
 
-    OCFile file = new OCFile(getActivity().getContentResolver(), mAccount, s);
-    mFiles = file.getDirectoryContent();
-    setListAdapter(new FileListListAdapter(file, getActivity()));
+    mStorageManager = new FileDataStorageManager(mAccount, getActivity().getContentResolver());
+    OCFile file = mStorageManager.getFileByPath(s);
+    mFiles = mStorageManager.getDirectoryContent(file);
+    setListAdapter(new FileListListAdapter(file, mStorageManager, getActivity()));
   }
   
   //TODO: Delete this testing stuff.