fixed sending cached images

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index df50e72..77f8a0d 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -110,7 +110,7 @@
 
         <provider
             android:name=".providers.FileContentProvider"
 
         <provider
             android:name=".providers.FileContentProvider"

-            android:authorities="org.owncloud.beta.provider"
+            android:authorities="@string/authority"

             android:enabled="true"
             android:exported="true"
             android:label="@string/sync_string_files"
             android:enabled="true"
             android:exported="true"
             android:label="@string/sync_string_files"


@@ -118,7 +118,7 @@
 
         <provider
             android:name=".ui.adapter.DiskLruImageCacheFileProvider"
 
         <provider
             android:name=".ui.adapter.DiskLruImageCacheFileProvider"

-            android:authorities="com.owncloud.imageCache.providerBeta"
+            android:authorities="@string/authorityCache"

             android:exported="true">
         </provider>
 
             android:exported="true">
         </provider>
 

diff --git a/res/values/setup.xml b/res/values/setup.xml
index 4d38476..c1c6e7a 100644 (file)
--- a/res/values/setup.xml
+++ b/res/values/setup.xml
@@ -4,6 +4,7 @@
     <string name="app_name">Owncloud Beta</string>
     <string name="account_type">owncloud.beta</string> <!-- better if was a domain name; but changing it now would require migrate accounts when the app is updated -->
     <string name="authority">org.owncloud.beta.provider</string>       <!-- better if was the app package with ".provider" appended ; it identifies the provider -->
     <string name="app_name">Owncloud Beta</string>
     <string name="account_type">owncloud.beta</string> <!-- better if was a domain name; but changing it now would require migrate accounts when the app is updated -->
     <string name="authority">org.owncloud.beta.provider</string>       <!-- better if was the app package with ".provider" appended ; it identifies the provider -->

+    <string name="authorityCache">org.owncloud.beta.imageCache.provider</string>

     <string name ="db_file">owncloud.db</string>
     <string name ="db_name">ownCloud</string>
     <string name ="data_folder">owncloud-beta</string>
     <string name ="db_file">owncloud.db</string>
     <string name ="db_name">ownCloud</string>
     <string name ="data_folder">owncloud-beta</string>

diff --git a/src/com/owncloud/android/ui/adapter/DiskLruImageCacheFileProvider.java b/src/com/owncloud/android/ui/adapter/DiskLruImageCacheFileProvider.java
index 5c32ad5..4f1119f 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/DiskLruImageCacheFileProvider.java
+++ b/src/com/owncloud/android/ui/adapter/DiskLruImageCacheFileProvider.java
@@ -27,9 +27,11 @@ import android.content.ContentProvider;
 import android.content.ContentValues;
 import android.content.UriMatcher;
 import android.database.Cursor;
 import android.content.ContentValues;
 import android.content.UriMatcher;
 import android.database.Cursor;

+import android.database.MatrixCursor;

 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;

+import android.provider.OpenableColumns;

 
 import com.owncloud.android.MainApp;
 import com.owncloud.android.authentication.AccountUtils;
 
 import com.owncloud.android.MainApp;
 import com.owncloud.android.authentication.AccountUtils;


@@ -46,17 +48,29 @@ import java.io.IOException;
 
 public class DiskLruImageCacheFileProvider extends ContentProvider {
     private static String TAG = FileDataStorageManager.class.getSimpleName();
 
 public class DiskLruImageCacheFileProvider extends ContentProvider {
     private static String TAG = FileDataStorageManager.class.getSimpleName();

+    private FileDataStorageManager mFileDataStorageManager;

 
 

-    public static final String AUTHORITY = "com.owncloud.imageCache.providerBeta";
+    public static final String AUTHORITY = "org.owncloud.beta.imageCache.provider";

 
     @Override
 
     @Override

-    public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
-        Log_OC.d(TAG, "try to send: " + uri);
+    public boolean onCreate() {
+        return true;
+    }
+
+    private OCFile getFile(Uri uri){

         Account account = AccountUtils.getCurrentOwnCloudAccount(MainApp.getAppContext());
         Account account = AccountUtils.getCurrentOwnCloudAccount(MainApp.getAppContext());

-        FileDataStorageManager fileDataStorageManager = new FileDataStorageManager(account,
+        mFileDataStorageManager = new FileDataStorageManager(account,

                 MainApp.getAppContext().getContentResolver());
 
                 MainApp.getAppContext().getContentResolver());
 

-        OCFile ocFile = fileDataStorageManager.getFileByPath(uri.getPath());
+        OCFile ocFile = mFileDataStorageManager.getFileByPath(uri.getPath());
+        return ocFile;
+    }
+
+    @Override
+    public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
+        Log_OC.d(TAG, "try to send: " + uri);
+
+        OCFile ocFile = getFile(uri);

 
         Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
                 String.valueOf("r" + ocFile.getRemoteId()));
 
         Bitmap thumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
                 String.valueOf("r" + ocFile.getRemoteId()));


@@ -89,20 +103,26 @@ public class DiskLruImageCacheFileProvider extends ContentProvider {
         return ParcelFileDescriptor.open(f, ParcelFileDescriptor.MODE_READ_ONLY);
     }
 
         return ParcelFileDescriptor.open(f, ParcelFileDescriptor.MODE_READ_ONLY);
     }
 

-

     @Override
     @Override

-    public boolean onCreate() {
-        return true;
+    public String getType(Uri uri) {
+        OCFile ocFile = getFile(uri);
+        return ocFile.getMimetype();

     }
 
     @Override
     }
 
     @Override

-    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
-        return null;
-    }
+    public Cursor query(Uri uri, String[] arg1, String arg2, String[] arg3, String arg4) {
+        MatrixCursor cursor = null;
+
+        OCFile ocFile = getFile(uri);
+        File file = new File(MainApp.getAppContext().getCacheDir(), ocFile.getFileName());
+        if (file.exists()) {
+            cursor = new MatrixCursor(new String[] {
+                    OpenableColumns.DISPLAY_NAME, OpenableColumns.SIZE });
+            cursor.addRow(new Object[] { uri.getLastPathSegment(),
+                    file.length() });
+        }

 
 

-    @Override
-    public String getType(Uri uri) {
-        return null;
+        return cursor;

     }
 
     @Override
     }
 
     @Override