1 files changed, 3 insertions, 83 deletions

diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index d0696464c..ea86bbfca 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -40,17 +40,9 @@ import org.sufficientlysecure.keychain.ui.dialog.ShareNfcDialogFragment;
 import org.sufficientlysecure.keychain.ui.dialog.ShareQrCodeDialogFragment;
 import org.sufficientlysecure.keychain.util.Log;
 
-import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
-import android.nfc.NdefMessage;
-import android.nfc.NdefRecord;
-import android.nfc.NfcAdapter;
-import android.nfc.NfcAdapter.CreateNdefMessageCallback;
-import android.nfc.NfcAdapter.OnNdefPushCompleteCallback;
-import android.nfc.NfcEvent;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -69,13 +61,12 @@ import com.actionbarsherlock.view.Menu;
 import com.actionbarsherlock.view.MenuItem;
 import com.beardedhen.androidbootstrap.BootstrapButton;
 
-@SuppressLint("NewApi")
-public class ViewKeyActivity extends SherlockFragmentActivity implements CreateNdefMessageCallback,
-        OnNdefPushCompleteCallback, LoaderManager.LoaderCallbacks<Cursor> {
+public class ViewKeyActivity extends SherlockFragmentActivity implements
+        LoaderManager.LoaderCallbacks<Cursor> {
 
     ExportHelper mExportHelper;
 
-    private Uri mDataUri;
+    protected Uri mDataUri;
 
     private TextView mName;
     private TextView mEmail;
@@ -90,11 +81,6 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements CreateN
     private ListView mUserIds;
     private ListView mKeys;
 
-    // NFC
-    private NfcAdapter mNfcAdapter;
-    private byte[] mSharedKeyringBytes;
-    private static final int NFC_SENT = 1;
-
     private static final int LOADER_ID_KEYRING = 0;
     private static final int LOADER_ID_USER_IDS = 1;
     private static final int LOADER_ID_KEYS = 2;
@@ -134,7 +120,6 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements CreateN
         } else {
             Log.d(Constants.TAG, "uri: " + mDataUri);
             loadData(mDataUri);
-            initNfc(mDataUri);
         }
     }
 
@@ -496,69 +481,4 @@ public class ViewKeyActivity extends SherlockFragmentActivity implements CreateN
         dialog.show(getSupportFragmentManager(), "shareNfcDialog");
     }
 
-    /**
-     * NFC: Initialize NFC sharing if OS and device supports it
-     */
-    private void initNfc(Uri dataUri) {
-        // check if NFC Beam is supported (>= Android 4.1)
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            // Check for available NFC Adapter
-            mNfcAdapter = NfcAdapter.getDefaultAdapter(this);
-            if (mNfcAdapter != null) {
-                // init nfc
-
-                // get public keyring as byte array
-                long masterKeyId = ProviderHelper.getMasterKeyId(this, dataUri);
-                mSharedKeyringBytes = ProviderHelper.getKeyRingsAsByteArray(this, dataUri,
-                        new long[] { masterKeyId });
-
-                // Register callback to set NDEF message
-                mNfcAdapter.setNdefPushMessageCallback(this, this);
-                // Register callback to listen for message-sent success
-                mNfcAdapter.setOnNdefPushCompleteCallback(this, this);
-            }
-        }
-    }
-
-    /**
-     * NFC: Implementation for the CreateNdefMessageCallback interface
-     */
-    @Override
-    public NdefMessage createNdefMessage(NfcEvent event) {
-        /**
-         * When a device receives a push with an AAR in it, the application specified in the AAR is
-         * guaranteed to run. The AAR overrides the tag dispatch system. You can add it back in to
-         * guarantee that this activity starts when receiving a beamed message. For now, this code
-         * uses the tag dispatch system.
-         */
-        NdefMessage msg = new NdefMessage(NdefRecord.createMime(Constants.NFC_MIME,
-                mSharedKeyringBytes), NdefRecord.createApplicationRecord(Constants.PACKAGE_NAME));
-        return msg;
-    }
-
-    /**
-     * NFC: Implementation for the OnNdefPushCompleteCallback interface
-     */
-    @Override
-    public void onNdefPushComplete(NfcEvent arg0) {
-        // A handler is needed to send messages to the activity when this
-        // callback occurs, because it happens from a binder thread
-        mNfcHandler.obtainMessage(NFC_SENT).sendToTarget();
-    }
-
-    /**
-     * NFC: This handler receives a message from onNdefPushComplete
-     */
-    private final Handler mNfcHandler = new Handler() {
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-            case NFC_SENT:
-                Toast.makeText(getApplicationContext(), R.string.nfc_successfull, Toast.LENGTH_LONG)
-                        .show();
-                break;
-            }
-        }
-    };
-
 }