X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/21c34ee6d477a95f911b4e93333d8bf1aacacbb4..1e59a632bcedc56845e6494f244e79d76a1f8b8a:/src/com/owncloud/android/providers/FileContentProvider.java diff --git a/src/com/owncloud/android/providers/FileContentProvider.java b/src/com/owncloud/android/providers/FileContentProvider.java index 03d51c9f..7e45f523 100644 --- a/src/com/owncloud/android/providers/FileContentProvider.java +++ b/src/com/owncloud/android/providers/FileContentProvider.java @@ -107,6 +107,8 @@ public class FileContentProvider extends ContentProvider { ProviderTableMeta.FILE_UPDATE_THUMBNAIL); mFileProjectionMap.put(ProviderTableMeta.FILE_IS_DOWNLOADING, ProviderTableMeta.FILE_IS_DOWNLOADING); + mFileProjectionMap.put(ProviderTableMeta.FILE_IN_CONFLICT, + ProviderTableMeta.FILE_IN_CONFLICT); } private static final int SINGLE_FILE = 1; @@ -634,7 +636,8 @@ public class FileContentProvider extends ContentProvider { + ProviderTableMeta.FILE_PERMISSIONS + " TEXT null," + ProviderTableMeta.FILE_REMOTE_ID + " TEXT null," + ProviderTableMeta.FILE_UPDATE_THUMBNAIL + " INTEGER," //boolean - + ProviderTableMeta.FILE_IS_DOWNLOADING + " INTEGER);" //boolean + + ProviderTableMeta.FILE_IS_DOWNLOADING + " INTEGER," //boolean + + ProviderTableMeta.FILE_IN_CONFLICT + " INTEGER);" //boolean ); // Create table ocshares @@ -834,6 +837,24 @@ public class FileContentProvider extends ContentProvider { if (!upgraded) Log_OC.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion + ", newVersion == " + newVersion); + + if (oldVersion < 11 && newVersion >= 11) { + Log_OC.i("SQL", "Entering in the #11 ADD in onUpgrade"); + db.beginTransaction(); + try { + db .execSQL("ALTER TABLE " + ProviderTableMeta.FILE_TABLE_NAME + + " ADD COLUMN " + ProviderTableMeta.FILE_IN_CONFLICT + " INTEGER " + + " DEFAULT 0"); + upgraded = true; + db.setTransactionSuccessful(); + } finally { + db.endTransaction(); + } + } + if (!upgraded) + Log_OC.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion + + ", newVersion == " + newVersion); + } } @@ -854,7 +875,7 @@ public class FileContentProvider extends ContentProvider { // get accounts from AccountManager ; we can't be sure if accounts in it are updated or not although // we know the update was previously done in {link @FileActivity#onCreate} because the changes through // AccountManager are not synchronous - Account[] accounts = AccountManager.get(getContext()).getAccountsByType( + Account[] accounts = AccountManager.get(getContext()).getAccountsByType( MainApp.getAccountType()); String serverUrl, username, oldAccountName, newAccountName; for (Account account : accounts) { @@ -888,9 +909,9 @@ public class FileContentProvider extends ContentProvider { db.endTransaction(); } } - } catch (Exception e) { - Log_OC.e(TAG, "Exception upgrading account names or paths in database", e); - } + } catch (Exception e) { + Log_OC.e(TAG, "Exception upgrading account names or paths in database", e); + } }