Projects >> owncloud-android >>51302a638677b16c5faac6242da44080794f537e

Chunk
Conflicting content 
public class OCFile {

<<<<<<< HEAD
	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 OCFile(ContentResolver contentResolver, Account account) {
		this.account = account;
		this.contentResolver = contentResolver;
		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_;

>>>>>>> ff36d908024994abe425351ba4f01b9cf805d1e3
	/**
	 * Create new {@link OCFile} with given path
	 *
Solution content 
public class OCFile {

	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_;

	/**
	 * Create new {@link OCFile} with given path
	 *
File
OCFile.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method declaration
Chunk
Conflicting content 
	/**
	 * Create new {@link OCFile} with given path
	 * 
<<<<<<< HEAD
	 * @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;
	}

	/**
	 * 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;
	}


	/**
=======
	 * @param path The remote path of the file
	 */
	public OCFile(String path) {
	  resetData();
	  update_while_saving_ = false;
		path_ = path;
	}

	/**
>>>>>>> ff36d908024994abe425351ba4f01b9cf805d1e3
	 * Gets the ID of the file
	 * 
	 * @return the file ID
Solution content 
	/**
	 * Create new {@link OCFile} with given path
	 * 
	 * @param path The remote path of the file
	 */
	public OCFile(String path) {
	  resetData();
	  update_while_saving_ = false;
		path_ = path;
	}

	/**
	 * Gets the ID of the file
	 * 
	 * @return the file ID
File
OCFile.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
	/**
	 * List the directory content
	 * 
	}

	/**
<<<<<<< HEAD
	 * 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;
			}
		}
	}
	 * @return The directory content or null, if the file is not a directory
	 */
	public Vector getDirectoryContent() {
		if (isDirectory() && id != -1) {
			Vector ret = new Vector();

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

	/**
=======
>>>>>>> ff36d908024994abe425351ba4f01b9cf805d1e3
	 * Adds a file to this directory. If this file is not a directory, an
	 * exception gets thrown.
	 *
Solution content 
	}

	/**
	 * Adds a file to this directory. If this file is not a directory, an
	 * exception gets thrown.
	 *
File
OCFile.java
Developer's decision
Version 2
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
	 */
	public void addFile(OCFile file) throws IllegalStateException {
		if (isDirectory()) {
<<<<<<< HEAD
			file.parentId = id;
			file.save();
=======
			file.parent_id_ = id_;
			update_while_saving_ = true;
>>>>>>> ff36d908024994abe425351ba4f01b9cf805d1e3
			return;
		}
		throw new IllegalStateException("This is not a directory where you can add stuff to!");
Solution content 
	 */
	public void addFile(OCFile file) throws IllegalStateException {
		if (isDirectory()) {
			file.parent_id_ = id_;
			update_while_saving_ = true;
			return;
		}
		throw new IllegalStateException("This is not a directory where you can add stuff to!");
File
OCFile.java
Developer's decision
Version 2
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
		modifiedTimestamp = 0;
	}

<<<<<<< HEAD
	/**
	 * 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;
>>>>>>> ff36d908024994abe425351ba4f01b9cf805d1e3
	}
	
	public void setMimetype(String mimetype) {
Solution content 
	}

	public void setFileId(long file_id) {
	  id_ = file_id;
	}
	
	public void setMimetype(String mimetype) {
File
OCFile.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment
If statement
Method invocation
Method signature
Variable