projects / pub / Android / ownCloud.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Quick patch to fix operations not ready for HTTPS
[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / providers / FileContentProvider.java
diff --git a/src/eu/alefzero/owncloud/providers/FileContentProvider.java b/src/eu/alefzero/owncloud/providers/FileContentProvider.java
index 7055b2a..7ed73a9 100644 (file)
--- a/src/eu/alefzero/owncloud/providers/FileContentProvider.java
+++ b/src/eu/alefzero/owncloud/providers/FileContentProvider.java
@@ -35,178 +35,203 @@ import android.database.sqlite.SQLiteOpenHelper;
 import android.database.sqlite.SQLiteQueryBuilder;\r
 import android.net.Uri;\r
 import android.text.TextUtils;\r
 import android.database.sqlite.SQLiteQueryBuilder;\r
 import android.net.Uri;\r
 import android.text.TextUtils;\r
+import android.util.Log;\r
 \r
 /**\r
 \r
 /**\r
-* The ContentProvider for the ownCloud App.\r
-* @author Bartek Przybylski\r
-* \r
-*/\r
+ * The ContentProvider for the ownCloud App.\r
+ * \r
+ * @author Bartek Przybylski\r
+ * \r
+ */\r
 public class FileContentProvider extends ContentProvider {\r
 \r
 public class FileContentProvider extends ContentProvider {\r
 \r
-  private DataBaseHelper mDbHelper;\r
-  \r
-  private static HashMap<String, String> mProjectionMap;\r
-  static {\r
-    mProjectionMap = new HashMap<String, String>();\r
-    mProjectionMap.put(ProviderTableMeta._ID,\r
-                       ProviderTableMeta._ID);\r
-    mProjectionMap.put(ProviderTableMeta.FILE_PARENT,\r
-                       ProviderTableMeta.FILE_PARENT);\r
-    mProjectionMap.put(ProviderTableMeta.FILE_PATH,\r
-                       ProviderTableMeta.FILE_PATH);\r
-    mProjectionMap.put(ProviderTableMeta.FILE_NAME,\r
-                       ProviderTableMeta.FILE_NAME);\r
-    mProjectionMap.put(ProviderTableMeta.FILE_CREATION,\r
-                       ProviderTableMeta.FILE_CREATION);\r
-    mProjectionMap.put(ProviderTableMeta.FILE_MODIFIED,\r
-                       ProviderTableMeta.FILE_MODIFIED);\r
-    mProjectionMap.put(ProviderTableMeta.FILE_CONTENT_LENGTH,\r
-                       ProviderTableMeta.FILE_CONTENT_LENGTH);\r
-    mProjectionMap.put(ProviderTableMeta.FILE_CONTENT_TYPE,\r
-                       ProviderTableMeta.FILE_CONTENT_TYPE);\r
-    mProjectionMap.put(ProviderTableMeta.FILE_STORAGE_PATH,\r
-                       ProviderTableMeta.FILE_STORAGE_PATH);\r
-  }\r
-  \r
-  private static final int SINGLE_FILE = 1;\r
-  private static final int DIRECTORY = 2;\r
-  private static final int ROOT_DIRECTORY = 3;\r
-  private static final UriMatcher mUriMatcher;\r
-  static {\r
-    mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);\r
-    mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, "/", ROOT_DIRECTORY);\r
-    mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, "file/", SINGLE_FILE);\r
-    mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, "file/#", SINGLE_FILE);\r
-    mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, "dir/#", DIRECTORY);\r
-  }\r
-  \r
-  @Override\r
-  public int delete(Uri uri, String where, String[] whereArgs) {\r
-    SQLiteDatabase db = mDbHelper.getWritableDatabase();\r
-    int count = 0;\r
-    switch (mUriMatcher.match(uri)) {\r
-      case SINGLE_FILE:\r
-        count = db.delete(ProviderTableMeta.DB_NAME,\r
-                          ProviderTableMeta._ID + "=" + uri.getPathSegments().get(1)\r
-                          + (!TextUtils.isEmpty(where)?" AND (" + where +")" : ""),\r
-                          whereArgs);\r
-        break;\r
-      case ROOT_DIRECTORY:\r
-        count = db.delete(ProviderTableMeta.DB_NAME, where, whereArgs);\r
-        break;\r
-      default:\r
-        throw new IllegalArgumentException("Unknown uri: " + uri.toString());\r
-    }\r
-    getContext().getContentResolver().notifyChange(uri, null);\r
-    return count;\r
-  }\r
-\r
-  @Override\r
-  public String getType(Uri uri) {\r
-    switch (mUriMatcher.match(uri)) {\r
-      case ROOT_DIRECTORY:\r
-        return ProviderTableMeta.CONTENT_TYPE;\r
-      case SINGLE_FILE:\r
-        return ProviderTableMeta.CONTENT_TYPE_ITEM;\r
-      default:\r
-        throw new IllegalArgumentException("Unknown Uri id." + uri.toString());\r
+    private DataBaseHelper mDbHelper;\r
+\r
+    private static HashMap<String, String> mProjectionMap;\r
+    static {\r
+        mProjectionMap = new HashMap<String, String>();\r
+        mProjectionMap.put(ProviderTableMeta._ID, ProviderTableMeta._ID);\r
+        mProjectionMap.put(ProviderTableMeta.FILE_PARENT,\r
+                ProviderTableMeta.FILE_PARENT);\r
+        mProjectionMap.put(ProviderTableMeta.FILE_PATH,\r
+                ProviderTableMeta.FILE_PATH);\r
+        mProjectionMap.put(ProviderTableMeta.FILE_NAME,\r
+                ProviderTableMeta.FILE_NAME);\r
+        mProjectionMap.put(ProviderTableMeta.FILE_CREATION,\r
+                ProviderTableMeta.FILE_CREATION);\r
+        mProjectionMap.put(ProviderTableMeta.FILE_MODIFIED,\r
+                ProviderTableMeta.FILE_MODIFIED);\r
+        mProjectionMap.put(ProviderTableMeta.FILE_CONTENT_LENGTH,\r
+                ProviderTableMeta.FILE_CONTENT_LENGTH);\r
+        mProjectionMap.put(ProviderTableMeta.FILE_CONTENT_TYPE,\r
+                ProviderTableMeta.FILE_CONTENT_TYPE);\r
+        mProjectionMap.put(ProviderTableMeta.FILE_STORAGE_PATH,\r
+                ProviderTableMeta.FILE_STORAGE_PATH);\r
+        mProjectionMap.put(ProviderTableMeta.FILE_LAST_SYNC_DATE,\r
+                ProviderTableMeta.FILE_LAST_SYNC_DATE);\r
+        mProjectionMap.put(ProviderTableMeta.FILE_KEEP_IN_SYNC,\r
+                ProviderTableMeta.FILE_KEEP_IN_SYNC);\r
     }\r
     }\r
-  }\r
 \r
 \r
-  @Override\r
-  public Uri insert(Uri uri, ContentValues values) {\r
-    if (mUriMatcher.match(uri) != SINGLE_FILE) {\r
-      throw new IllegalArgumentException("Unknown uri id: " + uri);\r
+    private static final int SINGLE_FILE = 1;\r
+    private static final int DIRECTORY = 2;\r
+    private static final int ROOT_DIRECTORY = 3;\r
+    private static final UriMatcher mUriMatcher;\r
+    static {\r
+        mUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);\r
+        mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, "/", ROOT_DIRECTORY);\r
+        mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, "file/", SINGLE_FILE);\r
+        mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, "file/#", SINGLE_FILE);\r
+        mUriMatcher.addURI(ProviderMeta.AUTHORITY_FILES, "dir/#", DIRECTORY);\r
     }\r
     }\r
-    \r
-    SQLiteDatabase db = mDbHelper.getWritableDatabase();\r
-    long rowId = db.insert(ProviderTableMeta.DB_NAME, null, values);\r
-    if (rowId > 0) {\r
-      Uri insertedFileUri = ContentUris.withAppendedId(ProviderTableMeta.CONTENT_URI_FILE, rowId);\r
-      getContext().getContentResolver().notifyChange(insertedFileUri, null);\r
-      return insertedFileUri;\r
+\r
+    @Override\r
+    public int delete(Uri uri, String where, String[] whereArgs) {\r
+        SQLiteDatabase db = mDbHelper.getWritableDatabase();\r
+        int count = 0;\r
+        switch (mUriMatcher.match(uri)) {\r
+        case SINGLE_FILE:\r
+            count = db.delete(ProviderTableMeta.DB_NAME,\r
+                    ProviderTableMeta._ID\r
+                            + "="\r
+                            + uri.getPathSegments().get(1)\r
+                            + (!TextUtils.isEmpty(where) ? " AND (" + where\r
+                                    + ")" : ""), whereArgs);\r
+            break;\r
+        case ROOT_DIRECTORY:\r
+            count = db.delete(ProviderTableMeta.DB_NAME, where, whereArgs);\r
+            break;\r
+        default:\r
+            throw new IllegalArgumentException("Unknown uri: " + uri.toString());\r
+        }\r
+        getContext().getContentResolver().notifyChange(uri, null);\r
+        return count;\r
     }\r
     }\r
-    throw new SQLException("ERROR " + uri);\r
-  }\r
-\r
-  @Override\r
-  public boolean onCreate() {\r
-    mDbHelper = new DataBaseHelper(getContext());\r
-    return true;\r
-  }\r
-\r
-  @Override\r
-  public Cursor query(Uri uri, String[] projection, String selection,\r
-      String[] selectionArgs, String sortOrder) {\r
-    SQLiteQueryBuilder sqlQuery = new SQLiteQueryBuilder();\r
-        \r
-    sqlQuery.setTables(ProviderTableMeta.DB_NAME);\r
-    sqlQuery.setProjectionMap(mProjectionMap);\r
-    \r
-    switch (mUriMatcher.match(uri)) {\r
-      case ROOT_DIRECTORY:\r
-        break;\r
-      case DIRECTORY:\r
-        sqlQuery.appendWhere(ProviderTableMeta.FILE_PARENT + "="+uri.getPathSegments().get(1));\r
-        break;\r
-      case SINGLE_FILE:\r
-        if (uri.getPathSegments().size() > 1) {\r
-          sqlQuery.appendWhere(ProviderTableMeta._ID + "=" +\r
-                               uri.getPathSegments().get(1));\r
+\r
+    @Override\r
+    public String getType(Uri uri) {\r
+        switch (mUriMatcher.match(uri)) {\r
+        case ROOT_DIRECTORY:\r
+            return ProviderTableMeta.CONTENT_TYPE;\r
+        case SINGLE_FILE:\r
+            return ProviderTableMeta.CONTENT_TYPE_ITEM;\r
+        default:\r
+            throw new IllegalArgumentException("Unknown Uri id."\r
+                    + uri.toString());\r
         }\r
         }\r
-        break;\r
-      default:\r
-        throw new IllegalArgumentException("Unknown uri id: " + uri);\r
     }\r
     }\r
-    \r
-    String order;\r
-    if (TextUtils.isEmpty(sortOrder)) {\r
-      order = ProviderTableMeta.DEFAULT_SORT_ORDER;\r
-    } else {\r
-      order = sortOrder;\r
+\r
+    @Override\r
+    public Uri insert(Uri uri, ContentValues values) {\r
+        if (mUriMatcher.match(uri) != SINGLE_FILE &&\r
+            mUriMatcher.match(uri) != ROOT_DIRECTORY) {\r
+            \r
+            throw new IllegalArgumentException("Unknown uri id: " + uri);\r
+        }\r
+\r
+        SQLiteDatabase db = mDbHelper.getWritableDatabase();\r
+        long rowId = db.insert(ProviderTableMeta.DB_NAME, null, values);\r
+        if (rowId > 0) {\r
+            Uri insertedFileUri = ContentUris.withAppendedId(\r
+                    ProviderTableMeta.CONTENT_URI_FILE, rowId);\r
+            getContext().getContentResolver().notifyChange(insertedFileUri,\r
+                    null);\r
+            return insertedFileUri;\r
+        }\r
+        throw new SQLException("ERROR " + uri);\r
     }\r
     }\r
-    \r
-    SQLiteDatabase db = mDbHelper.getReadableDatabase();\r
-    Cursor c = sqlQuery.query(db, projection, selection, selectionArgs, null, null, order);\r
-    \r
-    c.setNotificationUri(getContext().getContentResolver(), uri);\r
-\r
-    return c;\r
-  }\r
-\r
-  @Override\r
-  public int update(Uri uri, ContentValues values, String selection,\r
-      String[] selectionArgs) {\r
-    return mDbHelper.getWritableDatabase().update(ProviderTableMeta.DB_NAME, values, selection, selectionArgs);\r
-  }\r
-\r
-  class DataBaseHelper extends SQLiteOpenHelper {\r
-\r
-    public DataBaseHelper(Context context) {\r
-      super(context, ProviderMeta.DB_NAME, null, ProviderMeta.DB_VERSION);\r
-      \r
+\r
+    @Override\r
+    public boolean onCreate() {\r
+        mDbHelper = new DataBaseHelper(getContext());\r
+        return true;\r
     }\r
     }\r
-    \r
+\r
     @Override\r
     @Override\r
-    public void onCreate(SQLiteDatabase db) {\r
-      db.execSQL("CREATE TABLE " + ProviderTableMeta.DB_NAME + "(" +\r
-                 ProviderTableMeta._ID + " INTEGER PRIMARY KEY, " +\r
-                 ProviderTableMeta.FILE_NAME + " TEXT, " +\r
-                 ProviderTableMeta.FILE_PATH + " TEXT, " +\r
-                 ProviderTableMeta.FILE_PARENT + " INTEGER, " +\r
-                 ProviderTableMeta.FILE_CREATION + " INTEGER, " +\r
-                 ProviderTableMeta.FILE_MODIFIED + " INTEGER, " +\r
-                 ProviderTableMeta.FILE_CONTENT_TYPE + " TEXT, " +\r
-                 ProviderTableMeta.FILE_CONTENT_LENGTH + " INTEGER, " +\r
-                 ProviderTableMeta.FILE_STORAGE_PATH + " TEXT, " +\r
-                 ProviderTableMeta.FILE_ACCOUNT_OWNER + " TEXT);");\r
+    public Cursor query(Uri uri, String[] projection, String selection,\r
+            String[] selectionArgs, String sortOrder) {\r
+        SQLiteQueryBuilder sqlQuery = new SQLiteQueryBuilder();\r
+\r
+        sqlQuery.setTables(ProviderTableMeta.DB_NAME);\r
+        sqlQuery.setProjectionMap(mProjectionMap);\r
+\r
+        switch (mUriMatcher.match(uri)) {\r
+        case ROOT_DIRECTORY:\r
+            break;\r
+        case DIRECTORY:\r
+            sqlQuery.appendWhere(ProviderTableMeta.FILE_PARENT + "="\r
+                    + uri.getPathSegments().get(1));\r
+            break;\r
+        case SINGLE_FILE:\r
+            if (uri.getPathSegments().size() > 1) {\r
+                sqlQuery.appendWhere(ProviderTableMeta._ID + "="\r
+                        + uri.getPathSegments().get(1));\r
+            }\r
+            break;\r
+        default:\r
+            throw new IllegalArgumentException("Unknown uri id: " + uri);\r
+        }\r
+\r
+        String order;\r
+        if (TextUtils.isEmpty(sortOrder)) {\r
+            order = ProviderTableMeta.DEFAULT_SORT_ORDER;\r
+        } else {\r
+            order = sortOrder;\r
+        }\r
+\r
+        SQLiteDatabase db = mDbHelper.getReadableDatabase();\r
+        Cursor c = sqlQuery.query(db, projection, selection, selectionArgs,\r
+                null, null, order);\r
+\r
+        c.setNotificationUri(getContext().getContentResolver(), uri);\r
+\r
+        return c;\r
     }\r
 \r
     @Override\r
     }\r
 \r
     @Override\r
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {\r
-      \r
+    public int update(Uri uri, ContentValues values, String selection,\r
+            String[] selectionArgs) {\r
+        return mDbHelper.getWritableDatabase().update(\r
+                ProviderTableMeta.DB_NAME, values, selection, selectionArgs);\r
     }\r
     }\r
-    \r
-  }\r
-  \r
+\r
+    class DataBaseHelper extends SQLiteOpenHelper {\r
+\r
+        public DataBaseHelper(Context context) {\r
+            super(context, ProviderMeta.DB_NAME, null, ProviderMeta.DB_VERSION);\r
+\r
+        }\r
+\r
+        @Override\r
+        public void onCreate(SQLiteDatabase db) {\r
+            // files table\r
+            Log.i("SQL", "Entering in onCreate");\r
+            db.execSQL("CREATE TABLE " + ProviderTableMeta.DB_NAME + "("\r
+                    + ProviderTableMeta._ID + " INTEGER PRIMARY KEY, "\r
+                    + ProviderTableMeta.FILE_NAME + " TEXT, "\r
+                    + ProviderTableMeta.FILE_PATH + " TEXT, "\r
+                    + ProviderTableMeta.FILE_PARENT + " INTEGER, "\r
+                    + ProviderTableMeta.FILE_CREATION + " INTEGER, "\r
+                    + ProviderTableMeta.FILE_MODIFIED + " INTEGER, "\r
+                    + ProviderTableMeta.FILE_CONTENT_TYPE + " TEXT, "\r
+                    + ProviderTableMeta.FILE_CONTENT_LENGTH + " INTEGER, "\r
+                    + ProviderTableMeta.FILE_STORAGE_PATH + " TEXT, "\r
+                    + ProviderTableMeta.FILE_ACCOUNT_OWNER + " TEXT, "\r
+                    + ProviderTableMeta.FILE_LAST_SYNC_DATE + " INTEGER, "\r
+                    + ProviderTableMeta.FILE_KEEP_IN_SYNC + " INTEGER );");\r
+        }\r
+\r
+        @Override\r
+        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {\r
+            Log.i("SQL", "Entering in onUpgrade");\r
+            if (oldVersion == 1 && newVersion >= 2) {\r
+                Log.i("SQL", "Entering in the ADD in onUpgrade");\r
+                db.execSQL("ALTER TABLE " + ProviderTableMeta.DB_NAME +\r
+                           " ADD COLUMN " + ProviderTableMeta.FILE_KEEP_IN_SYNC  + " INTEGER " +\r
+                           " DEFAULT 0");\r
+            } else Log.i("SQL", "OUT of the ADD in onUpgrade; oldVersion == " + oldVersion + ", newVersion == " + newVersion);\r
+        }\r
+\r
+    }\r
+\r
 }\r
 }\r
ownCloud Android App