import java.util.ArrayList;
import java.util.HashMap;
-import com.owncloud.android.Log_OC;
+import com.owncloud.android.R;
import com.owncloud.android.db.ProviderMeta;
import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
+import com.owncloud.android.lib.resources.shares.ShareType;
+import com.owncloud.android.utils.Log_OC;
+
import android.content.ContentProvider;
private DataBaseHelper mDbHelper;
- private static HashMap<String, String> mProjectionMap;
+ // Projection for filelist table
+ private static HashMap<String, String> mFileProjectionMap;
static {
- mProjectionMap = new HashMap<String, String>();
- mProjectionMap.put(ProviderTableMeta._ID, ProviderTableMeta._ID);
- mProjectionMap.put(ProviderTableMeta.FILE_PARENT,
+ mFileProjectionMap = new HashMap<String, String>();
+ mFileProjectionMap.put(ProviderTableMeta._ID, ProviderTableMeta._ID);
+ mFileProjectionMap.put(ProviderTableMeta.FILE_PARENT,
ProviderTableMeta.FILE_PARENT);
- mProjectionMap.put(ProviderTableMeta.FILE_PATH,
+ mFileProjectionMap.put(ProviderTableMeta.FILE_PATH,
ProviderTableMeta.FILE_PATH);
- mProjectionMap.put(ProviderTableMeta.FILE_NAME,
+ mFileProjectionMap.put(ProviderTableMeta.FILE_NAME,
ProviderTableMeta.FILE_NAME);
- mProjectionMap.put(ProviderTableMeta.FILE_CREATION,
+ mFileProjectionMap.put(ProviderTableMeta.FILE_CREATION,
ProviderTableMeta.FILE_CREATION);
- mProjectionMap.put(ProviderTableMeta.FILE_MODIFIED,
+ mFileProjectionMap.put(ProviderTableMeta.FILE_MODIFIED,
ProviderTableMeta.FILE_MODIFIED);
- mProjectionMap.put(ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA,
+ mFileProjectionMap.put(ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA,
ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA);
- mProjectionMap.put(ProviderTableMeta.FILE_CONTENT_LENGTH,
+ mFileProjectionMap.put(ProviderTableMeta.FILE_CONTENT_LENGTH,
ProviderTableMeta.FILE_CONTENT_LENGTH);
- mProjectionMap.put(ProviderTableMeta.FILE_CONTENT_TYPE,
+ mFileProjectionMap.put(ProviderTableMeta.FILE_CONTENT_TYPE,
ProviderTableMeta.FILE_CONTENT_TYPE);
- mProjectionMap.put(ProviderTableMeta.FILE_STORAGE_PATH,
+ mFileProjectionMap.put(ProviderTableMeta.FILE_STORAGE_PATH,
ProviderTableMeta.FILE_STORAGE_PATH);
- mProjectionMap.put(ProviderTableMeta.FILE_LAST_SYNC_DATE,
+ mFileProjectionMap.put(ProviderTableMeta.FILE_LAST_SYNC_DATE,
ProviderTableMeta.FILE_LAST_SYNC_DATE);
- mProjectionMap.put(ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA,
+ mFileProjectionMap.put(ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA,
ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA);
- mProjectionMap.put(ProviderTableMeta.FILE_KEEP_IN_SYNC,
+ mFileProjectionMap.put(ProviderTableMeta.FILE_KEEP_IN_SYNC,
ProviderTableMeta.FILE_KEEP_IN_SYNC);
- mProjectionMap.put(ProviderTableMeta.FILE_ACCOUNT_OWNER,
+ mFileProjectionMap.put(ProviderTableMeta.FILE_ACCOUNT_OWNER,
ProviderTableMeta.FILE_ACCOUNT_OWNER);
- mProjectionMap.put(ProviderTableMeta.FILE_ETAG,
+ mFileProjectionMap.put(ProviderTableMeta.FILE_ETAG,
ProviderTableMeta.FILE_ETAG);
+ mFileProjectionMap.put(ProviderTableMeta.FILE_SHARE_BY_LINK,
+ ProviderTableMeta.FILE_SHARE_BY_LINK);
+ mFileProjectionMap.put(ProviderTableMeta.FILE_PUBLIC_LINK,
+ ProviderTableMeta.FILE_PUBLIC_LINK);
}
private static final int SINGLE_FILE = 1;
private static final int DIRECTORY = 2;
private static final int ROOT_DIRECTORY = 3;
- private static final UriMatcher mUriMatcher;
-
- public static final String METHOD_UPDATE_FOLDER_SIZE = "updateFolderSize";
+ private static final int SHARES = 4;
+ // Projection for ocshares table
+ private static HashMap<String, String> mOCSharesProjectionMap;
static {
- mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
- mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, null, ROOT_DIRECTORY);
- mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, "file/", SINGLE_FILE);
- mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, "file/#", SINGLE_FILE);
- mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, "dir/", DIRECTORY);
- mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, "dir/#", DIRECTORY);
+ mOCSharesProjectionMap = new HashMap<String, String>();
+ mOCSharesProjectionMap.put(ProviderTableMeta._ID, ProviderTableMeta._ID);
+ mOCSharesProjectionMap.put(ProviderTableMeta.OCSHARES_FILE_SOURCE,
+ ProviderTableMeta.OCSHARES_FILE_SOURCE);
+ mOCSharesProjectionMap.put(ProviderTableMeta.OCSHARES_ITEM_SOURCE,
+ ProviderTableMeta.OCSHARES_ITEM_SOURCE);
+ mOCSharesProjectionMap.put(ProviderTableMeta.OCSHARES_SHARE_TYPE,
+ ProviderTableMeta.OCSHARES_SHARE_TYPE);
+ mOCSharesProjectionMap.put(ProviderTableMeta.OCSHARES_SHARE_WITH,
+ ProviderTableMeta.OCSHARES_SHARE_WITH);
+ mOCSharesProjectionMap.put(ProviderTableMeta.OCSHARES_PATH,
+ ProviderTableMeta.OCSHARES_PATH);
+ mOCSharesProjectionMap.put(ProviderTableMeta.OCSHARES_PERMISSIONS,
+ ProviderTableMeta.OCSHARES_PERMISSIONS);
+ mOCSharesProjectionMap.put(ProviderTableMeta.OCSHARES_SHARED_DATE,
+ ProviderTableMeta.OCSHARES_SHARED_DATE);
+ mOCSharesProjectionMap.put(ProviderTableMeta.OCSHARES_EXPIRATION_DATE,
+ ProviderTableMeta.OCSHARES_EXPIRATION_DATE);
+ mOCSharesProjectionMap.put(ProviderTableMeta.OCSHARES_TOKEN,
+ ProviderTableMeta.OCSHARES_TOKEN);
+ mOCSharesProjectionMap.put(ProviderTableMeta.OCSHARES_SHARE_WITH_DISPLAY_NAME,
+ ProviderTableMeta.OCSHARES_SHARE_WITH_DISPLAY_NAME);
+ mOCSharesProjectionMap.put(ProviderTableMeta.OCSHARES_IS_DIRECTORY,
+ ProviderTableMeta.OCSHARES_IS_DIRECTORY);
+ mOCSharesProjectionMap.put(ProviderTableMeta.OCSHARES_USER_ID,
+ ProviderTableMeta.OCSHARES_USER_ID);
+ mOCSharesProjectionMap.put(ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED,
+ ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED);
+ mOCSharesProjectionMap.put(ProviderTableMeta.OCSHARES_ACCOUNT_OWNER,
+ ProviderTableMeta.OCSHARES_ACCOUNT_OWNER);
}
-
+
+ private UriMatcher mUriMatcher;
+
@Override
public int delete(Uri uri, String where, String[] whereArgs) {
//Log_OC.d(TAG, "Deleting " + uri + " at provider " + this);
return count;
}
-
private int delete(SQLiteDatabase db, Uri uri, String where, String[] whereArgs) {
int count = 0;
switch (mUriMatcher.match(uri)) {
}
Log_OC.d(TAG, "Removing FILE " + remotePath);
*/
- count = db.delete(ProviderTableMeta.DB_NAME,
+ count = db.delete(ProviderTableMeta.FILE_TABLE_NAME,
ProviderTableMeta._ID
+ "="
+ uri.getPathSegments().get(1)
}
Log_OC.d(TAG, "Removing DIRECTORY " + folderName + " (or maybe not) ");
*/
- count += db.delete(ProviderTableMeta.DB_NAME,
+ count += db.delete(ProviderTableMeta.FILE_TABLE_NAME,
ProviderTableMeta._ID
+ "="
+ uri.getPathSegments().get(1)
break;
case ROOT_DIRECTORY:
//Log_OC.d(TAG, "Removing ROOT!");
- count = db.delete(ProviderTableMeta.DB_NAME, where, whereArgs);
+ count = db.delete(ProviderTableMeta.FILE_TABLE_NAME, where, whereArgs);
+ break;
+ case SHARES:
+ count = db.delete(ProviderTableMeta.OCSHARES_TABLE_NAME, where, whereArgs);
break;
default:
//Log_OC.e(TAG, "Unknown uri " + uri);
}
private Uri insert(SQLiteDatabase db, Uri uri, ContentValues values) {
- if (mUriMatcher.match(uri) != SINGLE_FILE &&
- mUriMatcher.match(uri) != ROOT_DIRECTORY) {
- //Log_OC.e(TAG, "Inserting invalid URI: " + uri);
- throw new IllegalArgumentException("Unknown uri id: " + uri);
- }
+ switch (mUriMatcher.match(uri)){
+ case ROOT_DIRECTORY:
+ case SINGLE_FILE:
+ String remotePath = values.getAsString(ProviderTableMeta.FILE_PATH);
+ String accountName = values.getAsString(ProviderTableMeta.FILE_ACCOUNT_OWNER);
+ String[] projection = new String[] {ProviderTableMeta._ID, ProviderTableMeta.FILE_PATH, ProviderTableMeta.FILE_ACCOUNT_OWNER };
+ String where = ProviderTableMeta.FILE_PATH + "=? AND " + ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?";
+ String[] whereArgs = new String[] {remotePath, accountName};
+ Cursor doubleCheck = query(db, uri, projection, where, whereArgs, null);
+ if (doubleCheck == null || !doubleCheck.moveToFirst()) { // ugly patch; serious refactorization is needed to reduce work in FileDataStorageManager and bring it to FileContentProvider
+ long rowId = db.insert(ProviderTableMeta.FILE_TABLE_NAME, null, values);
+ if (rowId > 0) {
+ Uri insertedFileUri = ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_FILE, rowId);
+ //Log_OC.d(TAG, "Inserted " + values.getAsString(ProviderTableMeta.FILE_PATH) + " at provider " + this);
+ return insertedFileUri;
+ } else {
+ //Log_OC.d(TAG, "Error while inserting " + values.getAsString(ProviderTableMeta.FILE_PATH) + " at provider " + this);
+ throw new SQLException("ERROR " + uri);
+ }
+ } else {
+ // file is already inserted; race condition, let's avoid a duplicated entry
+ Uri insertedFileUri = ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_FILE, doubleCheck.getLong(doubleCheck.getColumnIndex(ProviderTableMeta._ID)));
+ doubleCheck.close();
- long rowId = db.insert(ProviderTableMeta.DB_NAME, null, values);
- if (rowId > 0) {
- Uri insertedFileUri = ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_FILE, rowId);
- //Log_OC.d(TAG, "Inserted " + values.getAsString(ProviderTableMeta.FILE_PATH) + " at provider " + this);
- return insertedFileUri;
- } else {
- //Log_OC.d(TAG, "Error while inserting " + values.getAsString(ProviderTableMeta.FILE_PATH) + " at provider " + this);
- throw new SQLException("ERROR " + uri);
+ return insertedFileUri;
+ }
+
+ case SHARES:
+ String path = values.getAsString(ProviderTableMeta.OCSHARES_PATH);
+ String accountNameShare= values.getAsString(ProviderTableMeta.OCSHARES_ACCOUNT_OWNER);
+ String[] projectionShare = new String[] {ProviderTableMeta._ID, ProviderTableMeta.OCSHARES_PATH, ProviderTableMeta.OCSHARES_ACCOUNT_OWNER };
+ String whereShare = ProviderTableMeta.OCSHARES_PATH + "=? AND " + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER + "=?";
+ String[] whereArgsShare = new String[] {path, accountNameShare};
+ Uri insertedShareUri = null;
+ Cursor doubleCheckShare = query(db, uri, projectionShare, whereShare, whereArgsShare, null);
+ if (doubleCheckShare == null || !doubleCheckShare.moveToFirst()) { // ugly patch; serious refactorization is needed to reduce work in FileDataStorageManager and bring it to FileContentProvider
+ long rowId = db.insert(ProviderTableMeta.OCSHARES_TABLE_NAME, null, values);
+ if (rowId >0) {
+ insertedShareUri = ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_SHARE, rowId);
+ } else {
+ throw new SQLException("ERROR " + uri);
+
+ }
+ } else {
+ // file is already inserted; race condition, let's avoid a duplicated entry
+ insertedShareUri = ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_SHARE, doubleCheckShare.getLong(doubleCheckShare.getColumnIndex(ProviderTableMeta._ID)));
+ doubleCheckShare.close();
+ }
+ updateFilesTableAccordingToShareInsertion(db, uri, values);
+ return insertedShareUri;
+
+
+ default:
+ throw new IllegalArgumentException("Unknown uri id: " + uri);
}
+
+ }
+
+ private void updateFilesTableAccordingToShareInsertion(SQLiteDatabase db, Uri uri, ContentValues shareValues) {
+ ContentValues fileValues = new ContentValues();
+ fileValues.put(ProviderTableMeta.FILE_SHARE_BY_LINK,
+ ShareType.PUBLIC_LINK.getValue() == shareValues.getAsInteger(ProviderTableMeta.OCSHARES_SHARE_TYPE)? 1 : 0);
+ String whereShare = ProviderTableMeta.FILE_PATH + "=? AND " + ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?";
+ String[] whereArgsShare = new String[] {
+ shareValues.getAsString(ProviderTableMeta.OCSHARES_PATH),
+ shareValues.getAsString(ProviderTableMeta.OCSHARES_ACCOUNT_OWNER)
+ };
+ db.update(ProviderTableMeta.FILE_TABLE_NAME, fileValues, whereShare, whereArgsShare);
}
-
+
@Override
public boolean onCreate() {
mDbHelper = new DataBaseHelper(getContext());
+
+ String authority = getContext().getResources().getString(R.string.authority);
+ mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+ mUriMatcher.addURI(authority, null, ROOT_DIRECTORY);
+ mUriMatcher.addURI(authority, "file/", SINGLE_FILE);
+ mUriMatcher.addURI(authority, "file/#", SINGLE_FILE);
+ mUriMatcher.addURI(authority, "dir/", DIRECTORY);
+ mUriMatcher.addURI(authority, "dir/#", DIRECTORY);
+ mUriMatcher.addURI(authority, "shares/", SHARES);
+ mUriMatcher.addURI(authority, "shares/#", SHARES);
+
return true;
}
private Cursor query(SQLiteDatabase db, Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
SQLiteQueryBuilder sqlQuery = new SQLiteQueryBuilder();
- sqlQuery.setTables(ProviderTableMeta.DB_NAME);
- sqlQuery.setProjectionMap(mProjectionMap);
+ sqlQuery.setTables(ProviderTableMeta.FILE_TABLE_NAME);
+ sqlQuery.setProjectionMap(mFileProjectionMap);
switch (mUriMatcher.match(uri)) {
case ROOT_DIRECTORY:
+ uri.getPathSegments().get(1));
}
break;
+ case SHARES:
+ sqlQuery.setTables(ProviderTableMeta.OCSHARES_TABLE_NAME);
+ sqlQuery.setProjectionMap(mOCSharesProjectionMap);
+ if (uri.getPathSegments().size() > 1) {
+ sqlQuery.appendWhere(ProviderTableMeta._ID + "="
+ + uri.getPathSegments().get(1));
+ }
+ break;
default:
throw new IllegalArgumentException("Unknown uri id: " + uri);
}
String order;
if (TextUtils.isEmpty(sortOrder)) {
- order = ProviderTableMeta.DEFAULT_SORT_ORDER;
+ if (mUriMatcher.match(uri) == SHARES) {
+ order = ProviderTableMeta.OCSHARES_DEFAULT_SORT_ORDER;
+ } else {
+
+ order = ProviderTableMeta.FILE_DEFAULT_SORT_ORDER;
+ }
} else {
order = sortOrder;
}
// DB case_sensitive
db.execSQL("PRAGMA case_sensitive_like = true");
Cursor c = sqlQuery.query(db, projection, selection, selectionArgs, null, null, order);
- if (mUriMatcher.match(uri) == DIRECTORY && c != null && c.moveToFirst()) {
- long size = 0;
- while (!c.isAfterLast()) {
- size += c.getLong(c.getColumnIndex(ProviderTableMeta.FILE_CONTENT_LENGTH));
- c.moveToNext();
- }
- ContentValues cv = new ContentValues();
- cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, size);
- db.update(ProviderTableMeta.DB_NAME, cv, ProviderTableMeta._ID + "=?", new String[] {uri.getPathSegments().get(1)});
- }
-
c.setNotificationUri(getContext().getContentResolver(), uri);
return c;
}
}
+
private int update(SQLiteDatabase db, Uri uri, ContentValues values, String selection, String[] selectionArgs) {
switch (mUriMatcher.match(uri)) {
case DIRECTORY:
- return updateFolderSize(db, selectionArgs[0]);
+ return 0; //updateFolderSize(db, selectionArgs[0]);
+ case SHARES:
+ return db.update(ProviderTableMeta.OCSHARES_TABLE_NAME, values, selection, selectionArgs);
default:
- return db.update(ProviderTableMeta.DB_NAME, values, selection, selectionArgs);
+ return db.update(ProviderTableMeta.FILE_TABLE_NAME, values, selection, selectionArgs);
}
}
-
+ /*
private int updateFolderSize(SQLiteDatabase db, String folderId) {
int count = 0;
- Uri selectUri = Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_DIR, folderId);
- String[] selectProjection = new String[] { ProviderTableMeta.FILE_CONTENT_LENGTH };
- String selectWhere = ProviderTableMeta.FILE_PARENT + "=?";
- String updateWhere = ProviderTableMeta._ID + "=?";
String [] whereArgs = new String[] { folderId };
- Cursor childrenLengths = query(db, selectUri, selectProjection, selectWhere, whereArgs, null);
- if (childrenLengths != null && childrenLengths.moveToFirst()) {
- long size = 0;
- while (!childrenLengths.isAfterLast()) {
- size += childrenLengths.getLong(childrenLengths.getColumnIndex(ProviderTableMeta.FILE_CONTENT_LENGTH));
- childrenLengths.moveToNext();
+
+ // read current size saved for the folder
+ long folderSize = 0;
+ long folderParentId = -1;
+ Uri selectFolderUri = Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_FILE, folderId);
+ String[] folderProjection = new String[] { ProviderTableMeta.FILE_CONTENT_LENGTH, ProviderTableMeta.FILE_PARENT};
+ String folderWhere = ProviderTableMeta._ID + "=?";
+ Cursor folderCursor = query(db, selectFolderUri, folderProjection, folderWhere, whereArgs, null);
+ if (folderCursor != null && folderCursor.moveToFirst()) {
+ folderSize = folderCursor.getLong(folderCursor.getColumnIndex(ProviderTableMeta.FILE_CONTENT_LENGTH));;
+ folderParentId = folderCursor.getLong(folderCursor.getColumnIndex(ProviderTableMeta.FILE_PARENT));;
+ }
+ folderCursor.close();
+
+ // read and sum sizes of children
+ long childrenSize = 0;
+ Uri selectChildrenUri = Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_DIR, folderId);
+ String[] childrenProjection = new String[] { ProviderTableMeta.FILE_CONTENT_LENGTH, ProviderTableMeta.FILE_PARENT};
+ String childrenWhere = ProviderTableMeta.FILE_PARENT + "=?";
+ Cursor childrenCursor = query(db, selectChildrenUri, childrenProjection, childrenWhere, whereArgs, null);
+ if (childrenCursor != null && childrenCursor.moveToFirst()) {
+ while (!childrenCursor.isAfterLast()) {
+ childrenSize += childrenCursor.getLong(childrenCursor.getColumnIndex(ProviderTableMeta.FILE_CONTENT_LENGTH));
+ childrenCursor.moveToNext();
}
+ }
+ childrenCursor.close();
+
+ // update if needed
+ if (folderSize != childrenSize) {
+ Log_OC.d("FileContentProvider", "Updating " + folderSize + " to " + childrenSize);
ContentValues cv = new ContentValues();
- cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, size);
- count = db.update(ProviderTableMeta.DB_NAME, cv, updateWhere, whereArgs);
+ cv.put(ProviderTableMeta.FILE_CONTENT_LENGTH, childrenSize);
+ count = db.update(ProviderTableMeta.FILE_TABLE_NAME, cv, folderWhere, whereArgs);
+
+ // propagate update until root
+ if (folderParentId > FileDataStorageManager.ROOT_PARENT_ID) {
+ Log_OC.d("FileContentProvider", "Propagating update to " + folderParentId);
+ updateFolderSize(db, String.valueOf(folderParentId));
+ } else {
+ Log_OC.d("FileContentProvider", "NOT propagating to " + folderParentId);
+ }
+ } else {
+ Log_OC.d("FileContentProvider", "NOT updating, sizes are " + folderSize + " and " + childrenSize);
}
return count;
}
-
+*/
@Override
public ContentProviderResult[] applyBatch (ArrayList<ContentProviderOperation> operations) throws OperationApplicationException {
- //Log.d(TAG, "applying batch in provider " + this + " (temporary: " + isTemporary() + ")" );
+ Log_OC.d("FileContentProvider", "applying batch in provider " + this + " (temporary: " + isTemporary() + ")" );
ContentProviderResult[] results = new ContentProviderResult[operations.size()];
int i=0;
} finally {
db.endTransaction();
}
- //Log.d(TAG, "applied batch in provider " + this);
+ Log_OC.d("FileContentProvider", "applied batch in provider " + this);
return results;
}
public void onCreate(SQLiteDatabase db) {
// files table
Log_OC.i("SQL", "Entering in onCreate");
- db.execSQL("CREATE TABLE " + ProviderTableMeta.DB_NAME + "("
+ db.execSQL("CREATE TABLE " + ProviderTableMeta.FILE_TABLE_NAME + "("
+ ProviderTableMeta._ID + " INTEGER PRIMARY KEY, "
+ ProviderTableMeta.FILE_NAME + " TEXT, "
+ ProviderTableMeta.FILE_PATH + " TEXT, "
+ ProviderTableMeta.FILE_KEEP_IN_SYNC + " INTEGER, "
+ ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA + " INTEGER, "
+ ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA + " INTEGER, "
- + ProviderTableMeta.FILE_ETAG + " TEXT );"
+ + ProviderTableMeta.FILE_ETAG + " TEXT, "
+ + ProviderTableMeta.FILE_SHARE_BY_LINK + " INTEGER, "
+ + ProviderTableMeta.FILE_PUBLIC_LINK + " TEXT );"
);
+
+ // Create table ocshares
+ db.execSQL("CREATE TABLE " + ProviderTableMeta.OCSHARES_TABLE_NAME + "("
+ + ProviderTableMeta._ID + " INTEGER PRIMARY KEY, "
+ + ProviderTableMeta.OCSHARES_FILE_SOURCE + " INTEGER, "
+ + ProviderTableMeta.OCSHARES_ITEM_SOURCE + " INTEGER, "
+ + ProviderTableMeta.OCSHARES_SHARE_TYPE + " INTEGER, "
+ + ProviderTableMeta.OCSHARES_SHARE_WITH + " TEXT, "
+ + ProviderTableMeta.OCSHARES_PATH + " TEXT, "
+ + ProviderTableMeta.OCSHARES_PERMISSIONS+ " INTEGER, "
+ + ProviderTableMeta.OCSHARES_SHARED_DATE + " INTEGER, "
+ + ProviderTableMeta.OCSHARES_EXPIRATION_DATE + " INTEGER, "
+ + ProviderTableMeta.OCSHARES_TOKEN + " TEXT, "
+ + ProviderTableMeta.OCSHARES_SHARE_WITH_DISPLAY_NAME + " TEXT, "
+ + ProviderTableMeta.OCSHARES_IS_DIRECTORY + " INTEGER, " // boolean
+ + ProviderTableMeta.OCSHARES_USER_ID + " INTEGER, "
+ + ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED + " INTEGER,"
+ + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER + " TEXT );" );
}
@Override
boolean upgraded = false;
if (oldVersion == 1 && newVersion >= 2) {
Log_OC.i("SQL", "Entering in the #1 ADD in onUpgrade");
- db.execSQL("ALTER TABLE " + ProviderTableMeta.DB_NAME +
+ db.execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
" ADD COLUMN " + ProviderTableMeta.FILE_KEEP_IN_SYNC + " INTEGER " +
" DEFAULT 0");
upgraded = true;
Log_OC.i("SQL", "Entering in the #2 ADD in onUpgrade");
db.beginTransaction();
try {
- db.execSQL("ALTER TABLE " + ProviderTableMeta.DB_NAME +
+ db.execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
" ADD COLUMN " + ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA + " INTEGER " +
" DEFAULT 0");
// assume there are not local changes pending to upload
- db.execSQL("UPDATE " + ProviderTableMeta.DB_NAME +
+ db.execSQL("UPDATE " + ProviderTableMeta.FILE_TABLE_NAME +
" SET " + ProviderTableMeta.FILE_LAST_SYNC_DATE_FOR_DATA + " = " + System.currentTimeMillis() +
" WHERE " + ProviderTableMeta.FILE_STORAGE_PATH + " IS NOT NULL");
Log_OC.i("SQL", "Entering in the #3 ADD in onUpgrade");
db.beginTransaction();
try {
- db .execSQL("ALTER TABLE " + ProviderTableMeta.DB_NAME +
+ db .execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
" ADD COLUMN " + ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA + " INTEGER " +
" DEFAULT 0");
- db.execSQL("UPDATE " + ProviderTableMeta.DB_NAME +
+ db.execSQL("UPDATE " + ProviderTableMeta.FILE_TABLE_NAME +
" SET " + ProviderTableMeta.FILE_MODIFIED_AT_LAST_SYNC_FOR_DATA + " = " + ProviderTableMeta.FILE_MODIFIED +
" WHERE " + ProviderTableMeta.FILE_STORAGE_PATH + " IS NOT NULL");
Log_OC.i("SQL", "Entering in the #4 ADD in onUpgrade");
db.beginTransaction();
try {
- db .execSQL("ALTER TABLE " + ProviderTableMeta.DB_NAME +
+ db .execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
" ADD COLUMN " + ProviderTableMeta.FILE_ETAG + " TEXT " +
" DEFAULT NULL");
}
if (!upgraded)
Log_OC.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion + ", newVersion == " + newVersion);
+
+ if (oldVersion < 6 && newVersion >= 6) {
+ Log_OC.i("SQL", "Entering in the #5 ADD in onUpgrade");
+ db.beginTransaction();
+ try {
+ db .execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
+ " ADD COLUMN " + ProviderTableMeta.FILE_SHARE_BY_LINK + " INTEGER " +
+ " DEFAULT 0");
+
+ db .execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME +
+ " ADD COLUMN " + ProviderTableMeta.FILE_PUBLIC_LINK + " TEXT " +
+ " DEFAULT NULL");
+
+ // Create table ocshares
+ db.execSQL("CREATE TABLE " + ProviderTableMeta.OCSHARES_TABLE_NAME + "("
+ + ProviderTableMeta._ID + " INTEGER PRIMARY KEY, "
+ + ProviderTableMeta.OCSHARES_FILE_SOURCE + " INTEGER, "
+ + ProviderTableMeta.OCSHARES_ITEM_SOURCE + " INTEGER, "
+ + ProviderTableMeta.OCSHARES_SHARE_TYPE + " INTEGER, "
+ + ProviderTableMeta.OCSHARES_SHARE_WITH + " TEXT, "
+ + ProviderTableMeta.OCSHARES_PATH + " TEXT, "
+ + ProviderTableMeta.OCSHARES_PERMISSIONS+ " INTEGER, "
+ + ProviderTableMeta.OCSHARES_SHARED_DATE + " INTEGER, "
+ + ProviderTableMeta.OCSHARES_EXPIRATION_DATE + " INTEGER, "
+ + ProviderTableMeta.OCSHARES_TOKEN + " TEXT, "
+ + ProviderTableMeta.OCSHARES_SHARE_WITH_DISPLAY_NAME + " TEXT, "
+ + ProviderTableMeta.OCSHARES_IS_DIRECTORY + " INTEGER, " // boolean
+ + ProviderTableMeta.OCSHARES_USER_ID + " INTEGER, "
+ + ProviderTableMeta.OCSHARES_ID_REMOTE_SHARED + " INTEGER,"
+ + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER + " TEXT );" );
+
+ upgraded = true;
+ db.setTransactionSuccessful();
+ } finally {
+ db.endTransaction();
+ }
+ }
+ if (!upgraded)
+ Log_OC.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion + ", newVersion == " + newVersion);
}
}
projects / pub / Android / ownCloud.git / blobdiff