diff options
| author | masensio <masensio@solidgear.es> | 2013-09-16 12:54:20 +0400 |
|---|---|---|
| committer | masensio <masensio@solidgear.es> | 2013-09-16 12:54:20 +0400 |
| commit | 68d4c74fdaba1dcbf135b4b84adfd7def15f2730 (patch) | |
| tree | becf9a73de0c306799939ebbdd9cb94edc4541f1 | |
| parent | 0b42b7b01fbd2b6185536c800e2e26b6bf40df95 (diff) | |
OC-1321: fix renaming problem: parent and childrenoc-android-1.4.5
| -rw-r--r-- | src/com/owncloud/android/datamodel/FileDataStorageManager.java | 8 | ||||
| -rw-r--r-- | 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 32e9cc0919..f461193665 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 e77556e1a4..bd2b80726e 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); |