diff options
author | Steve Kondik <steve@cyngn.com> | 2015-03-28 14:09:12 -0700 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2015-03-28 15:35:36 -0700 |
commit | bbbc9107f02bf48505c1123cbb5bb1810572079c (patch) | |
tree | 9dc45a0ebbeebabfbceb13a00ac994ebac2736b4 /src/com/android/gallery3d/app/AlbumPage.java | |
parent | 741973ed5c52011444250d7b6002dd8b86ac7be3 (diff) | |
download | android_packages_apps_Gallery2-bbbc9107f02bf48505c1123cbb5bb1810572079c.tar.gz android_packages_apps_Gallery2-bbbc9107f02bf48505c1123cbb5bb1810572079c.tar.bz2 android_packages_apps_Gallery2-bbbc9107f02bf48505c1123cbb5bb1810572079c.zip |
Revert OMADRM feature.staging/cm-12.1
* No need for this.
Revert "Gallery2 : Added support for Oma drm (CD and SD)"
This reverts commit 6144de8cc35fdd114802545c9922a1a234af8397.
Revert "Gallery2: Make Gallery2 support OMADRM feature"
This reverts commit 9382a979292e52de5c60a39ba24688362dce8bc1.
Change-Id: I13a0d69a792aad36d7b15bc0b3c78e3f55d396bc
Diffstat (limited to 'src/com/android/gallery3d/app/AlbumPage.java')
-rw-r--r-- | src/com/android/gallery3d/app/AlbumPage.java | 108 |
1 files changed, 1 insertions, 107 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java index d0056fcfd..7e2f5f9e4 100644 --- a/src/com/android/gallery3d/app/AlbumPage.java +++ b/src/com/android/gallery3d/app/AlbumPage.java @@ -18,24 +18,13 @@ package com.android.gallery3d.app; import android.app.Activity; import android.content.Context; -import android.content.ContentValues; import android.content.Intent; -import android.database.Cursor; -import android.drm.DrmManagerClientWrapper; -import android.drm.DrmRights; -import android.drm.DrmStore.Action; -import android.drm.DrmStore.DrmDeliveryType; -import android.drm.DrmStore.RightsStatus; -import android.graphics.BitmapFactory; -import android.graphics.BitmapFactory.Options; import android.graphics.Rect; import android.net.Uri; import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.provider.MediaStore; -import android.provider.MediaStore.Video.VideoColumns; -import android.text.TextUtils; import android.text.TextUtils; import android.view.HapticFeedbackConstants; import android.view.Menu; @@ -47,7 +36,6 @@ import android.widget.Toast; import com.android.gallery3d.R; import com.android.gallery3d.common.Utils; import com.android.gallery3d.data.DataManager; -import com.android.gallery3d.data.LocalMediaItem; import com.android.gallery3d.data.MediaDetails; import com.android.gallery3d.data.MediaItem; import com.android.gallery3d.data.MediaObject; @@ -74,20 +62,12 @@ import com.android.gallery3d.util.GalleryUtils; import com.android.gallery3d.util.MediaSetUtils; import java.util.Locale; -import java.io.File; -import java.io.FileDescriptor; -import java.io.FileInputStream; -import java.io.IOException; -import java.util.Random; - public class AlbumPage extends ActivityState implements GalleryActionBar.ClusterRunner, SelectionManager.SelectionListener, MediaSet.SyncListener, GalleryActionBar.OnAlbumModeSelectedListener { @SuppressWarnings("unused") private static final String TAG = "AlbumPage"; - public static final String BUY_LICENSE = "android.drmservice.intent.action.BUY_LICENSE"; - public static final String KEY_MEDIA_PATH = "media-path"; public static final String KEY_PARENT_MEDIA_PATH = "parent-media-path"; public static final String KEY_SET_CENTER = "set-center"; @@ -121,8 +101,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster private boolean mGetContent; private boolean mShowClusterMenu; - private boolean mIsWallpaper; - private boolean mIsContactPhoto; + private ActionModeHandler mActionModeHandler; private int mFocusIndex = 0; private DetailsHelper mDetailsHelper; @@ -343,65 +322,6 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster transitions.put(PhotoPage.KEY_INDEX_HINT, slotIndex); onBackPressed(); } else { - Context context = (Context) mActivity; - Uri uri = item.getContentUri(); - Log.d(TAG, "pickPhoto:uri=" + item.getContentUri()); - String path = null; - String scheme = uri.getScheme(); - if ("file".equals(scheme)) { - path = uri.getPath(); - } else { - Cursor cursor = null; - try { - cursor = context.getContentResolver().query(uri, - new String[] {VideoColumns.DATA}, null, null, null); - if (cursor != null && cursor.moveToNext()) { - path = cursor.getString(0); - } - } catch (Throwable t) { - Log.d(TAG, "cannot get path from: " + uri); - } finally { - if (cursor != null) cursor.close(); - } - } - - Log.d(TAG, "pickPhoto:path = " + path); - if (path != null && (path.endsWith(".dcf") || path.endsWith(".dm"))) { - DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper(context); - path = path.replace("/storage/emulated/0", "/storage/emulated/legacy"); - int status = -1; - Log.d(TAG, "pickPhoto:item type = " + Integer.toString(item.getMediaType())); - - if (item.getMediaType() == MediaObject.MEDIA_TYPE_IMAGE) { - status = drmClient.checkRightsStatus(path, Action.DISPLAY); - } else { - status = drmClient.checkRightsStatus(path, Action.PLAY); - } - Log.d(TAG, "pickPhoto:status fron drmClient.checkRightsStatus is " - + Integer.toString(status)); - - ContentValues values = drmClient.getMetadata(path); - if (RightsStatus.RIGHTS_VALID!= status) { - String address = values.getAsString("Rights-Issuer"); - Log.d(TAG, "pickPhoto:address = " + address); - Intent intent = new Intent(BUY_LICENSE); - intent.putExtra("DRM_FILE_PATH", address); - context.sendBroadcast(intent); - return; - } - - int drmType = values.getAsInteger("DRM-TYPE"); - Log.d(TAG, "onSingleTapUp:drm-type = " + Integer.toString(drmType)); - if (drmType > DrmDeliveryType.FORWARD_LOCK) { - if (item.getMediaType() == MediaObject.MEDIA_TYPE_IMAGE) { - item.setConsumeRights(true); - } - Toast.makeText(context, R.string.action_consumes_rights, - Toast.LENGTH_LONG).show(); - } - if (drmClient != null) drmClient.release(); - } - // Get into the PhotoPage. // mAlbumView.savePositions(PositionRepository.getInstance(mActivity)); Bundle data = new Bundle(); @@ -435,7 +355,6 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster Activity activity = mActivity; if (mData.getString(GalleryActivity.EXTRA_CROP) != null) { Uri uri = dm.getContentUri(item.getPath()); - Intent intent = new Intent(CropActivity.CROP_ACTION, uri) .addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT) .putExtras(getData()); @@ -444,29 +363,6 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster } activity.startActivity(intent); activity.finish(); - } else if (mIsWallpaper != true && mIsContactPhoto != true) { - String path = null; - if (item instanceof LocalMediaItem) { - path = ((LocalMediaItem)item).filePath; - } - if (path != null && (path.endsWith(".dcf") || path.endsWith(".dm"))) { - DrmManagerClientWrapper drmClient = new DrmManagerClientWrapper((Context) mActivity); - path = path.replace("/storage/emulated/0", "/storage/emulated/legacy"); - ContentValues values = drmClient.getMetadata(path); - int drmType = values.getAsInteger("DRM-TYPE"); - Log.d(TAG, "onGetContent:DRM-TYPE = " + Integer.toString(drmType)); - if (drmType == DrmDeliveryType.SEPARATE_DELIVERY) { - activity.setResult(Activity.RESULT_OK, new Intent(null, item.getContentUri())); - } else { - Toast.makeText((Context) mActivity, R.string.no_permission_for_drm, - Toast.LENGTH_LONG).show(); - } - if (drmClient != null) drmClient.release(); - } else { - activity.setResult(Activity.RESULT_OK, - new Intent(null, item.getContentUri())); - } - activity.finish(); } else { Intent intent = new Intent(null, item.getContentUri()) .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); @@ -509,8 +405,6 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster initializeViews(); initializeData(data); mGetContent = data.getBoolean(GalleryActivity.KEY_GET_CONTENT, false); - mIsWallpaper = data.getBoolean("com.android.gallery3d.IsWallpaper", false); - mIsContactPhoto = data.getBoolean("isContactPhoto", false); mShowClusterMenu = data.getBoolean(KEY_SHOW_CLUSTER_MENU, false); mDetailsSource = new MyDetailsSource(); Context context = mActivity.getAndroidContext(); |