From 68d4c74fdaba1dcbf135b4b84adfd7def15f2730 Mon Sep 17 00:00:00 2001 From: masensio Date: Mon, 16 Sep 2013 10:54:20 +0200 Subject: [PATCH] OC-1321: fix renaming problem: parent and children --- src/com/owncloud/android/datamodel/FileDataStorageManager.java | 8 ++++---- src/com/owncloud/android/providers/FileContentProvider.java | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java index 32e9cc09..f4611936 100644 --- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java +++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java @@ -557,16 +557,16 @@ public class FileDataStorageManager implements DataStorageManager { try { c = getContentProvider().query(ProviderTableMeta.CONTENT_URI, null, - ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND " + ProviderTableMeta._ID + "=?", - new String[] { mAccount.name, String.valueOf(dir.getFileId()) }, null); + ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND " + ProviderTableMeta.FILE_PATH + " LIKE ? ", + new String[] { mAccount.name, dir.getRemotePath() + "%" }, ProviderTableMeta.FILE_PATH + " ASC "); } catch (RemoteException e) { Log_OC.e(TAG, e.getMessage()); } } else { c = getContentResolver().query(ProviderTableMeta.CONTENT_URI, null, - ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND " + ProviderTableMeta._ID + "=?", - new String[] { mAccount.name, String.valueOf(dir.getFileId()) }, null); + ProviderTableMeta.FILE_ACCOUNT_OWNER + "=? AND " + ProviderTableMeta.FILE_PATH + " LIKE ? ", + new String[] { mAccount.name, dir.getRemotePath() + "%" }, ProviderTableMeta.FILE_PATH + " ASC "); } /// 2. prepare a batch of update operations to change all the descendants diff --git a/src/com/owncloud/android/providers/FileContentProvider.java b/src/com/owncloud/android/providers/FileContentProvider.java index e77556e1..bd2b8072 100644 --- a/src/com/owncloud/android/providers/FileContentProvider.java +++ b/src/com/owncloud/android/providers/FileContentProvider.java @@ -187,6 +187,8 @@ public class FileContentProvider extends ContentProvider { } SQLiteDatabase db = mDbHelper.getReadableDatabase(); + // DB case_sensitive + db.execSQL("PRAGMA case_sensitive_like = true"); Cursor c = sqlQuery.query(db, projection, selection, selectionArgs, null, null, order); -- 2.11.0