X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/9d490aaab22f78311e29959b469016f31f1800cb..e1245bbda7894e1a3028d2b54a6918e4bdd46ae2:/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 c98bf3a9..9e7cd3fd 100644
--- a/src/com/owncloud/android/providers/FileContentProvider.java
+++ b/src/com/owncloud/android/providers/FileContentProvider.java
@@ -21,10 +21,12 @@ package com.owncloud.android.providers;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import com.owncloud.android.Log_OC;
+import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.db.ProviderMeta;
 import com.owncloud.android.db.ProviderMeta.ProviderTableMeta;
+import com.owncloud.android.utils.Log_OC;
+
 
 
 import android.content.ContentProvider;
@@ -91,19 +93,9 @@ public class FileContentProvider extends ContentProvider {
     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 UriMatcher mUriMatcher;
     
-    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);
-    }
-
     @Override
     public int delete(Uri uri, String where, String[] whereArgs) {
         //Log_OC.d(TAG, "Deleting " + uri + " at provider " + this);
@@ -235,14 +227,27 @@ public class FileContentProvider extends ContentProvider {
             throw new IllegalArgumentException("Unknown uri id: " + uri);
         }
 
-        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;
+        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.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);
+            }
         } else {
-            //Log_OC.d(TAG, "Error while inserting " + values.getAsString(ProviderTableMeta.FILE_PATH)  + " at provider " + this);
-            throw new SQLException("ERROR " + uri);
+            // 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();
+            return insertedFileUri;
         }
     }
 
@@ -250,6 +255,15 @@ public class FileContentProvider extends ContentProvider {
     @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);
+        
         return true;
     }