Remove deprecated NFC beam support (a15648fd) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/gallery3d/app/PhotoPage.java

+0 −33

Original line number	Diff line number	Diff line
		@@ -27,9 +27,6 @@ import android.content.pm.ResolveInfo;
		import android.content.res.Configuration;
		import android.graphics.Rect;
		import android.net.Uri;
		import android.nfc.NfcAdapter;
		import android.nfc.NfcAdapter.CreateBeamUrisCallback;
		import android.nfc.NfcEvent;
		import android.os.AsyncTask;
		import android.os.Bundle;
		import android.os.Handler;
		@@ -198,8 +195,6 @@ public abstract class PhotoPage extends ActivityState implements
		private Path mDeletePath;
		private boolean mDeleteIsFocus; // whether the deleted item was in focus

		private Uri[] mNfcPushUris = new Uri[1];

		private final MyMenuVisibilityListener mMenuVisibilityListener =
		new MyMenuVisibilityListener();

		@@ -392,7 +387,6 @@ public abstract class PhotoPage extends ActivityState implements
		if (shareIntent != null) {
		mActionBar.setShareIntents(panoramaIntent, shareIntent);
		}
		setNfcBeamPushUri(contentUri);
		}
		break;
		}
		@@ -410,7 +404,6 @@ public abstract class PhotoPage extends ActivityState implements

		mSetPathString = data.getString(KEY_MEDIA_SET_PATH);
		mOriginalSetPathString = mSetPathString;
		setupNfcBeamPush();
		String itemPathString = data.getString(KEY_MEDIA_ITEM_PATH);
		Path itemPath = itemPathString != null ?
		Path.fromString(data.getString(KEY_MEDIA_ITEM_PATH)) :
		@@ -729,32 +722,6 @@ public abstract class PhotoPage extends ActivityState implements
		}
		}

		@TargetApi(ApiHelper.VERSION_CODES.JELLY_BEAN)
		private void setupNfcBeamPush() {
		if (!ApiHelper.HAS_SET_BEAM_PUSH_URIS) return;

		try {
		NfcAdapter adapter = NfcAdapter.getDefaultAdapter(mActivity);
		if (adapter != null) {
		adapter.setBeamPushUris(null, mActivity);
		adapter.setBeamPushUrisCallback(new CreateBeamUrisCallback() {
		@Override
		public Uri[] createBeamUris(NfcEvent event) {
		return mNfcPushUris;
		}
		}, mActivity);
		}
		} catch (NullPointerException e) {
		e.printStackTrace();
		} catch (Exception e) {
		e.printStackTrace();
		}
		}

		private void setNfcBeamPushUri(Uri uri) {
		mNfcPushUris[0] = uri;
		}

		private Intent createShareIntent(MediaObject mediaObject) {
		int type = mediaObject.getMediaType();
		return new Intent(Intent.ACTION_SEND)

src/com/android/photos/SelectionManager.java

+0 −17

Original line number	Diff line number	Diff line
		@@ -19,12 +19,8 @@ package com.android.photos;
		import android.app.Activity;
		import android.content.Intent;
		import android.net.Uri;
		import android.nfc.NfcAdapter;
		import android.nfc.NfcAdapter.CreateBeamUrisCallback;
		import android.nfc.NfcEvent;
		import android.provider.MediaStore.Files.FileColumns;

		import com.android.gallery3d.common.ApiHelper;
		import com.android.gallery3d.data.MediaObject;
		import com.android.gallery3d.util.GalleryUtils;

		@@ -32,7 +28,6 @@ import java.util.ArrayList;

		public class SelectionManager {
		private Activity mActivity;
		private NfcAdapter mNfcAdapter;
		private SelectedUriSource mUriSource;
		private Intent mShareIntent = new Intent();

		@@ -42,18 +37,6 @@ public class SelectionManager {

		public SelectionManager(Activity activity) {
		mActivity = activity;
		if (ApiHelper.AT_LEAST_16) {
		mNfcAdapter = NfcAdapter.getDefaultAdapter(mActivity);
		mNfcAdapter.setBeamPushUrisCallback(new CreateBeamUrisCallback() {
		@Override
		public Uri[] createBeamUris(NfcEvent arg0) {
		// This will have been preceded by a call to onItemSelectedStateChange
		if (mCachedShareableUris == null) return null;
		return mCachedShareableUris.toArray(
		new Uri[mCachedShareableUris.size()]);
		}
		}, mActivity);
		}
		}

		public void setSelectedUriSource(SelectedUriSource source) {