mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-11-10 11:05:06 -05:00
Integrate NFC functionality into ViewKeyActivity
This commit is contained in:
Dominik Schürmann
parent
eba0640d3e
commit
2ac8be2858
@ -315,12 +315,7 @@ public class KeyListFragment extends Fragment
|
||||
*/
|
||||
@Override
|
||||
public void onItemClick(AdapterView<?> adapterView, View view, int position, long id) {
|
||||
Intent viewIntent = null;
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
|
||||
viewIntent = new Intent(getActivity(), ViewKeyActivity.class);
|
||||
} else {
|
||||
viewIntent = new Intent(getActivity(), ViewKeyActivityJB.class);
|
||||
}
|
||||
Intent viewIntent = new Intent(getActivity(), ViewKeyActivity.class);
|
||||
viewIntent.setData(
|
||||
KeyRings.buildGenericKeyRingUri(Long.toString(mAdapter.getMasterKeyId(position))));
|
||||
startActivity(viewIntent);
|
||||
|
||||
@ -228,12 +228,7 @@ public class ViewCertActivity extends ActionBarActivity
|
||||
switch (item.getItemId()) {
|
||||
case R.id.menu_view_cert_view_signer:
|
||||
// can't do this before the data is initialized
|
||||
Intent viewIntent = null;
|
||||
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
|
||||
viewIntent = new Intent(this, ViewKeyActivity.class);
|
||||
} else {
|
||||
viewIntent = new Intent(this, ViewKeyActivityJB.class);
|
||||
}
|
||||
Intent viewIntent = new Intent(this, ViewKeyActivity.class);
|
||||
|
||||
try {
|
||||
long signerMasterKeyId = ProviderHelper.getMasterKeyId(this,
|
||||
|
||||
@ -18,9 +18,16 @@
|
||||
|
||||
package org.sufficientlysecure.keychain.ui;
|
||||
|
||||
import android.annotation.TargetApi;
|
||||
import android.app.Activity;
|
||||
import android.content.Intent;
|
||||
import android.net.Uri;
|
||||
import android.nfc.NdefMessage;
|
||||
import android.nfc.NdefRecord;
|
||||
import android.nfc.NfcAdapter;
|
||||
import android.nfc.NfcEvent;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.Message;
|
||||
@ -32,6 +39,8 @@ import android.view.MenuItem;
|
||||
import android.view.Window;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.devspark.appmsg.AppMsg;
|
||||
|
||||
import org.sufficientlysecure.keychain.Constants;
|
||||
import org.sufficientlysecure.keychain.Id;
|
||||
import org.sufficientlysecure.keychain.R;
|
||||
@ -45,6 +54,7 @@ import org.sufficientlysecure.keychain.ui.dialog.ShareNfcDialogFragment;
|
||||
import org.sufficientlysecure.keychain.ui.dialog.ShareQrCodeDialogFragment;
|
||||
import org.sufficientlysecure.keychain.util.Log;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
||||
@ -61,6 +71,13 @@ public class ViewKeyActivity extends ActionBarActivity {
|
||||
|
||||
private static final int RESULT_CODE_LOOKUP_KEY = 0x00007006;
|
||||
|
||||
// NFC
|
||||
private NfcAdapter mNfcAdapter;
|
||||
private NfcAdapter.CreateNdefMessageCallback mNdefCallback;
|
||||
private NfcAdapter.OnNdefPushCompleteCallback mNdefCompleteCallback;
|
||||
private byte[] mNfcKeyringBytes;
|
||||
private static final int NFC_SENT = 1;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
|
||||
@ -89,6 +106,8 @@ public class ViewKeyActivity extends ActionBarActivity {
|
||||
|
||||
mDataUri = getIntent().getData();
|
||||
|
||||
initNfc(mDataUri);
|
||||
|
||||
Bundle mainBundle = new Bundle();
|
||||
mainBundle.putParcelable(ViewKeyMainFragment.ARG_DATA_URI, mDataUri);
|
||||
mTabsAdapter.addTab(actionBar.newTab().setText(getString(R.string.key_view_tab_main)),
|
||||
@ -289,4 +308,94 @@ public class ViewKeyActivity extends ActionBarActivity {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* NFC: Initialize NFC sharing if OS and device supports it
|
||||
*/
|
||||
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
|
||||
private void initNfc(final Uri dataUri) {
|
||||
// check if NFC Beam is supported (>= Android 4.1)
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
|
||||
|
||||
// Implementation for the CreateNdefMessageCallback interface
|
||||
mNdefCallback = new NfcAdapter.CreateNdefMessageCallback() {
|
||||
@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,
|
||||
mNfcKeyringBytes), NdefRecord.createApplicationRecord(Constants.PACKAGE_NAME));
|
||||
return msg;
|
||||
}
|
||||
};
|
||||
|
||||
// Implementation for the OnNdefPushCompleteCallback interface
|
||||
mNdefCompleteCallback = new NfcAdapter.OnNdefPushCompleteCallback() {
|
||||
@Override
|
||||
public void onNdefPushComplete(NfcEvent event) {
|
||||
// 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();
|
||||
}
|
||||
};
|
||||
|
||||
// Check for available NFC Adapter
|
||||
mNfcAdapter = NfcAdapter.getDefaultAdapter(this);
|
||||
if (mNfcAdapter != null) {
|
||||
/*
|
||||
* Retrieve mNfcKeyringBytes here asynchronously (to not block the UI)
|
||||
* and init nfc adapter afterwards.
|
||||
* mNfcKeyringBytes can not be retrieved in createNdefMessage, because this process
|
||||
* has no permissions to query the Uri.
|
||||
*/
|
||||
AsyncTask<NfcAdapter, Void, Void> initTask =
|
||||
new AsyncTask<NfcAdapter, Void, Void>() {
|
||||
protected Void doInBackground(NfcAdapter... adapter) {
|
||||
try {
|
||||
Uri blobUri =
|
||||
KeychainContract.KeyRingData.buildPublicKeyRingUri(dataUri);
|
||||
mNfcKeyringBytes = ProviderHelper.getPGPKeyRing(
|
||||
ViewKeyActivity.this, blobUri).getEncoded();
|
||||
} catch (IOException e) {
|
||||
Log.e(Constants.TAG, "Error parsing keyring", e);
|
||||
} catch (ProviderHelper.NotFoundException e) {
|
||||
Log.e(Constants.TAG, "key not found!", e);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
protected void onPostExecute(Void result) {
|
||||
// Register callback to set NDEF message
|
||||
mNfcAdapter.setNdefPushMessageCallback(mNdefCallback
|
||||
, ViewKeyActivity.this);
|
||||
// Register callback to listen for message-sent success
|
||||
mNfcAdapter.setOnNdefPushCompleteCallback(mNdefCompleteCallback,
|
||||
ViewKeyActivity.this);
|
||||
}
|
||||
};
|
||||
|
||||
initTask.execute();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 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:
|
||||
AppMsg.makeText(ViewKeyActivity.this, R.string.nfc_successfull,
|
||||
AppMsg.STYLE_INFO).show();
|
||||
break;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -1,145 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2013-2014 Dominik Schürmann <dominik@dominikschuermann.de>
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package org.sufficientlysecure.keychain.ui;
|
||||
|
||||
import android.annotation.TargetApi;
|
||||
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.AsyncTask;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.os.Handler;
|
||||
import android.os.Message;
|
||||
|
||||
import com.devspark.appmsg.AppMsg;
|
||||
|
||||
import org.sufficientlysecure.keychain.Constants;
|
||||
import org.sufficientlysecure.keychain.R;
|
||||
import org.sufficientlysecure.keychain.provider.KeychainContract;
|
||||
import org.sufficientlysecure.keychain.provider.ProviderHelper;
|
||||
import org.sufficientlysecure.keychain.util.Log;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
|
||||
public class ViewKeyActivityJB extends ViewKeyActivity implements CreateNdefMessageCallback,
|
||||
OnNdefPushCompleteCallback {
|
||||
|
||||
private NfcAdapter mNfcAdapter;
|
||||
private byte[] mSharedKeyringBytes;
|
||||
private static final int NFC_SENT = 1;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
initNfc();
|
||||
}
|
||||
|
||||
/**
|
||||
* NFC: Initialize NFC sharing if OS and device supports it
|
||||
*/
|
||||
private void initNfc() {
|
||||
// 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) {
|
||||
/*
|
||||
* Retrieve mSharedKeyringBytes here asynchronously (to not block the UI)
|
||||
* and init nfc adapter afterwards.
|
||||
* mSharedKeyringBytes can not be retrieved in createNdefMessage, because this process
|
||||
* has no permissions to query the Uri.
|
||||
*/
|
||||
AsyncTask<NfcAdapter, Void, Void> initTask =
|
||||
new AsyncTask<NfcAdapter, Void, Void>() {
|
||||
protected Void doInBackground(NfcAdapter... adapter) {
|
||||
try {
|
||||
Uri dataUri = KeychainContract.KeyRingData.buildPublicKeyRingUri(mDataUri);
|
||||
mSharedKeyringBytes = ProviderHelper.getPGPKeyRing(
|
||||
ViewKeyActivityJB.this, dataUri).getEncoded();
|
||||
} catch (IOException e) {
|
||||
Log.e(Constants.TAG, "Error parsing keyring", e);
|
||||
} catch (ProviderHelper.NotFoundException e) {
|
||||
Log.e(Constants.TAG, "key not found!", e);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
protected void onPostExecute(Void result) {
|
||||
// Register callback to set NDEF message
|
||||
mNfcAdapter.setNdefPushMessageCallback(ViewKeyActivityJB.this
|
||||
, ViewKeyActivityJB.this);
|
||||
// Register callback to listen for message-sent success
|
||||
mNfcAdapter.setOnNdefPushCompleteCallback(ViewKeyActivityJB.this,
|
||||
ViewKeyActivityJB.this);
|
||||
}
|
||||
};
|
||||
|
||||
initTask.execute();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 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:
|
||||
AppMsg.makeText(ViewKeyActivityJB.this, R.string.nfc_successfull,
|
||||
AppMsg.STYLE_INFO).show();
|
||||
break;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user