Merge "show enable sync option for canvas" into gb-ub-photos-bryce

3 files changed, 92 insertions, 3 deletions

diff --git a/src/com/android/gallery3d/provider/CanvasProvider.java b/src/com/android/gallery3d/provider/CanvasProvider.java
index 76cf4887d..c9b419517 100644
--- a/src/com/android/gallery3d/provider/CanvasProvider.java
+++ b/src/com/android/gallery3d/provider/CanvasProvider.java
@@ -16,10 +16,13 @@
 
 package com.android.gallery3d.provider;
 
+import android.accounts.Account;
+import android.accounts.AccountManager;
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.ContentResolver;
 import android.content.Intent;
+import android.content.res.AssetFileDescriptor;
 import android.content.res.Configuration;
 import android.database.MatrixCursor;
 import android.graphics.Bitmap;
@@ -30,6 +33,7 @@ import android.os.Binder;
 import android.os.ParcelFileDescriptor;
 import android.util.Log;
 
+import com.android.gallery3d.R;
 import com.android.gallery3d.app.GalleryApp;
 import com.android.gallery3d.data.ContentListener;
 import com.android.gallery3d.data.DataManager;
@@ -42,7 +46,9 @@ import com.android.gallery3d.util.ThreadPool.Job;
 import com.android.gallery3d.util.ThreadPool.JobContext;
 import com.google.android.canvas.data.Cluster;
 import com.google.android.canvas.provider.CanvasContract;
+import com.google.android.canvas.provider.EnableSyncActivity;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
@@ -52,7 +58,11 @@ public class CanvasProvider extends CanvasProviderBase {
 
     private static final String TAG = "GalleryCanvasProvider";
 
-    DataManager mDataManager;
+    // TODO: Temporary for testing, remove once b/8099821 fixed
+    public static final String PHOTO_AUTHORITY = "com.google.android.gallery3d.GooglePhotoProvider";
+    public static final String ACCOUNT_TYPE = "com.google";
+
+    private DataManager mDataManager;
     private MediaSet mRootSet;
 
     private final static SyncListener sNullSyncListener = new SyncListener() {
@@ -128,6 +138,7 @@ public class CanvasProvider extends CanvasProviderBase {
             itemCount = items.size();
             if (itemCount <= 0) {
                 Log.d(TAG, "Skipping, no items...");
+                continue;
             }
             bob.visibleCount(itemCount);
             for (MediaItem item : items) {
@@ -135,6 +146,33 @@ public class CanvasProvider extends CanvasProviderBase {
             }
             clusters.add(bob.build());
         }
+
+        if (clusters.size() == 0) {
+            handleEmptyClusters(clusters);
+        }
+    }
+
+    private void handleEmptyClusters(List<Cluster> clusters) {
+        // Images are temporary, remove once b/8108002 fixed
+        Account[] accounts = AccountManager.get(getContext()).getAccountsByType(ACCOUNT_TYPE);
+        boolean syncEnabled = false;
+        for (Account account : accounts) {
+            syncEnabled |= ContentResolver.getSyncAutomatically(account, PHOTO_AUTHORITY);
+        }
+        Cluster.Builder bob = new Cluster.Builder();
+        bob.displayName(getContext().getString(R.string.no_albums_alert));
+        bob.addItem(createImageUri(R.mipmap.ic_launcher_gallery));
+        bob.visibleCount(1);
+        clusters.add(bob.build());
+        if (!syncEnabled) {
+            bob = new Cluster.Builder();
+            bob.displayName("Enable Picasa sync");
+            bob.id(1);
+            bob.intent(new Intent(getContext(), EnableSyncActivity.class));
+            bob.addItem(createImageUri(R.drawable.frame_overlay_gallery_picasa));
+            bob.visibleCount(1);
+            clusters.add(bob.build());
+        }
     }
 
     private static final JobContext sJobStub = new JobContext() {
@@ -159,6 +197,9 @@ public class CanvasProvider extends CanvasProviderBase {
         long identity = Binder.clearCallingIdentity();
         try {
             String path = uri.getQueryParameter("path");
+            if (path == null) {
+                return null;
+            }
             MediaItem item = (MediaItem) mDataManager.getMediaObject(path);
             Job<Bitmap> job = item.requestImage(MediaItem.TYPE_MICROTHUMBNAIL);
             final Bitmap bitmap = job.run(sJobStub);
@@ -183,13 +224,32 @@ public class CanvasProvider extends CanvasProviderBase {
                     (Object[]) null);
 
             return fds[0];
-        } catch (IOException e) {
+        } catch (Exception e) {
+            Log.w(TAG, "openFile failed", e);
             throw new RuntimeException(e);
         } finally {
             Binder.restoreCallingIdentity(identity);
         }
     }
 
+    @Override
+    public AssetFileDescriptor openAssetFile(Uri uri, String mode)
+            throws FileNotFoundException {
+        ParcelFileDescriptor fd = openFile(uri, mode);
+        if (fd != null) {
+            return new AssetFileDescriptor(fd, 0, -1);
+        }
+        int id = Integer.parseInt(uri.getPathSegments().get(0));
+        return getContext().getResources().openRawResourceFd(id);
+    }
+
+    private Uri createImageUri(int imageResId) {
+        return new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(AUTHORITY)
+                .path(Integer.toString(imageResId))
+                .build();
+    }
+
     private Uri createImageUri(MediaItem item) {
         // TODO: Make a database to track URIs we've actually returned
         // for which to proxy to avoid things with
diff --git a/src/com/android/gallery3d/provider/CanvasProviderBase.java b/src/com/android/gallery3d/provider/CanvasProviderBase.java
index 9e0c1de53..42bc0466f 100644
--- a/src/com/android/gallery3d/provider/CanvasProviderBase.java
+++ b/src/com/android/gallery3d/provider/CanvasProviderBase.java
@@ -326,7 +326,9 @@ public abstract class CanvasProviderBase extends ContentProvider {
                     obj = cluster.getCacheTimeMs();
                     break;
                 case LAUNCHER_CASE_INTENT_URI:
-                    obj = cluster.getIntent().toUri(Intent.URI_INTENT_SCHEME);
+                    if (cluster.getIntent() != null) {
+                        obj = cluster.getIntent().toUri(Intent.URI_INTENT_SCHEME);
+                    }
                     break;
                 case LAUNCHER_CASE_CROP_ALLOWED:
                     obj = cluster.isImageCropAllowed();
diff --git a/src/com/google/android/canvas/provider/EnableSyncActivity.java b/src/com/google/android/canvas/provider/EnableSyncActivity.java
new file mode 100644
index 000000000..9885fbfd6
--- /dev/null
+++ b/src/com/google/android/canvas/provider/EnableSyncActivity.java
@@ -0,0 +1,27 @@
+package com.google.android.canvas.provider;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.os.Bundle;
+
+import com.android.gallery3d.provider.CanvasProvider;
+import com.android.gallery3d.provider.CanvasProviderBase;
+
+
+public class EnableSyncActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Account[] accounts = AccountManager.get(this).getAccountsByType(
+                CanvasProvider.ACCOUNT_TYPE);
+        for (Account account : accounts) {
+            ContentResolver.setSyncAutomatically(account,
+                    CanvasProvider.PHOTO_AUTHORITY, true);
+        }
+        finish();
+        getContentResolver().notifyChange(CanvasProviderBase.NOTIFY_CHANGED_URI,
+                null, false);
+    }
+}