Merge pull request #306 from nextcloud/cursorFix

put cursor close in finally block to make sure no resource leak occurrs

Author: tobiasKaminsky

src/com/owncloud/android/providers/FileContentProvider.java

@@ -98,19 +98,26 @@ private int delete(SQLiteDatabase db, Uri uri, String where, String[] whereArgs)
             case SINGLE_FILE:
                 Cursor c = query(db, uri, null, where, whereArgs, null);
                 String remoteId = "";
-                if (c != null && c.moveToFirst()) {
-                    remoteId = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_REMOTE_ID));
-                    //ThumbnailsCacheManager.removeFileFromCache(remoteId);
-                    c.close();
+                try {
+                    if (c != null && c.moveToFirst()) {
+                        remoteId = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_REMOTE_ID));
+                        //ThumbnailsCacheManager.removeFileFromCache(remoteId);
+                    }
+                    Log_OC.d(TAG, "Removing FILE " + remoteId);
+
+                    count = db.delete(ProviderTableMeta.FILE_TABLE_NAME,
+                            ProviderTableMeta._ID
+                                    + "="
+                                    + uri.getPathSegments().get(1)
+                                    + (!TextUtils.isEmpty(where) ? " AND (" + where + ")" : ""),
+                            whereArgs);
+                } catch (Exception e) {
+                    Log_OC.d(TAG, "DB-Error removing file!", e);
+                } finally {
+                    if (c != null) {
+                        c.close();
+                    }
                 }
-                Log_OC.d(TAG, "Removing FILE " + remoteId);
-
-                count = db.delete(ProviderTableMeta.FILE_TABLE_NAME,
-                        ProviderTableMeta._ID
-                                + "="
-                                + uri.getPathSegments().get(1)
-                                + (!TextUtils.isEmpty(where) ? " AND (" + where
-                                + ")" : ""), whereArgs);
                 break;
             case DIRECTORY:
                 // deletion of folder is recursive