cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove nfc key transfer feature, this was broken anyways

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-08-02 22:13:05 +02:00
parent 4e920afe94
commit b94a8c9dee
5 changed files with 0 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvShareFragment.java
View File

@@ -38,7 +38,6 @@ import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.support.v4.app.ActivityCompat; import android.support.v4.app.ActivityCompat;
import android.support.v4.app.FragmentActivity;
import android.support.v4.app.LoaderManager; import android.support.v4.app.LoaderManager;
import android.support.v4.content.CursorLoader; import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader; import android.support.v4.content.Loader;
@@ -68,7 +67,6 @@ import org.sufficientlysecure.keychain.ui.util.Notify;
import org.sufficientlysecure.keychain.ui.util.Notify.Style; import org.sufficientlysecure.keychain.ui.util.Notify.Style;
import org.sufficientlysecure.keychain.ui.util.QrCodeUtils; import org.sufficientlysecure.keychain.ui.util.QrCodeUtils;
import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.NfcHelper;
public class ViewKeyAdvShareFragment extends LoaderFragment implements public class ViewKeyAdvShareFragment extends LoaderFragment implements
LoaderManager.LoaderCallbacks<Cursor> { LoaderManager.LoaderCallbacks<Cursor> {
@@ -79,8 +77,6 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
private CardView mQrCodeLayout; private CardView mQrCodeLayout;
private TextView mFingerprintView; private TextView mFingerprintView;
NfcHelper mNfcHelper;
private static final int LOADER_ID_UNIFIED = 0; private static final int LOADER_ID_UNIFIED = 0;
private Uri mDataUri; private Uri mDataUri;
@@ -94,8 +90,6 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
View root = super.onCreateView(inflater, superContainer, savedInstanceState); View root = super.onCreateView(inflater, superContainer, savedInstanceState);
View view = inflater.inflate(R.layout.view_key_adv_share_fragment, getContainer()); View view = inflater.inflate(R.layout.view_key_adv_share_fragment, getContainer());
mNfcHelper = NfcHelper.getInstance();
mFingerprintView = (TextView) view.findViewById(R.id.view_key_fingerprint); mFingerprintView = (TextView) view.findViewById(R.id.view_key_fingerprint);
mQrCode = (ImageView) view.findViewById(R.id.view_key_qr_code); mQrCode = (ImageView) view.findViewById(R.id.view_key_qr_code);
@@ -137,7 +131,6 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
View vFingerprintShareButton = view.findViewById(R.id.view_key_action_fingerprint_share); View vFingerprintShareButton = view.findViewById(R.id.view_key_action_fingerprint_share);
View vFingerprintClipboardButton = view.findViewById(R.id.view_key_action_fingerprint_clipboard); View vFingerprintClipboardButton = view.findViewById(R.id.view_key_action_fingerprint_clipboard);
View vKeyShareButton = view.findViewById(R.id.view_key_action_key_share); View vKeyShareButton = view.findViewById(R.id.view_key_action_key_share);
View vKeyNfcButton = view.findViewById(R.id.view_key_action_key_nfc);
View vKeyClipboardButton = view.findViewById(R.id.view_key_action_key_clipboard); View vKeyClipboardButton = view.findViewById(R.id.view_key_action_key_clipboard);
ImageButton vKeySafeSlingerButton = (ImageButton) view.findViewById(R.id.view_key_action_key_safeslinger); ImageButton vKeySafeSlingerButton = (ImageButton) view.findViewById(R.id.view_key_action_key_safeslinger);
View vKeyUploadButton = view.findViewById(R.id.view_key_action_upload); View vKeyUploadButton = view.findViewById(R.id.view_key_action_upload);
@@ -169,22 +162,6 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
} }
}); });
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
vKeyNfcButton.setVisibility(View.VISIBLE);
vKeyNfcButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
FragmentActivity activity = getActivity();
if (activity == null) {
return;
}
mNfcHelper.invokeNfcBeam(activity);
}
});
} else {
vKeyNfcButton.setVisibility(View.GONE);
}
vKeySafeSlingerButton.setOnClickListener(new View.OnClickListener() { vKeySafeSlingerButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
@@ -359,11 +336,6 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
// Prepare the loaders. Either re-connect with an existing ones, // Prepare the loaders. Either re-connect with an existing ones,
// or start new ones. // or start new ones.
getLoaderManager().initLoader(LOADER_ID_UNIFIED, null, this); getLoaderManager().initLoader(LOADER_ID_UNIFIED, null, this);
// Prepare the NfcHelper
FragmentActivity activity = getActivity();
KeyRepository keyRepository = KeyRepository.createDatabaseInteractor(activity);
mNfcHelper.initNfcIfSupported(activity, keyRepository, mDataUri);
} }
static final String[] UNIFIED_PROJECTION = new String[]{ static final String[] UNIFIED_PROJECTION = new String[]{

25
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/keyview/ViewKeyActivity.java
View File

@@ -34,7 +34,6 @@ import android.database.Cursor;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.PorterDuff; import android.graphics.PorterDuff;
import android.net.Uri; import android.net.Uri;
import android.nfc.NfcAdapter;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
@@ -112,7 +111,6 @@ import org.sufficientlysecure.keychain.ui.util.Notify.Style;
import org.sufficientlysecure.keychain.ui.util.QrCodeUtils; import org.sufficientlysecure.keychain.ui.util.QrCodeUtils;
import org.sufficientlysecure.keychain.util.ContactHelper; import org.sufficientlysecure.keychain.util.ContactHelper;
import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.NfcHelper;
import org.sufficientlysecure.keychain.util.Passphrase; import org.sufficientlysecure.keychain.util.Passphrase;
import org.sufficientlysecure.keychain.util.Preferences; import org.sufficientlysecure.keychain.util.Preferences;
@@ -157,7 +155,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
private ImageButton mActionEncryptFile; private ImageButton mActionEncryptFile;
private ImageButton mActionEncryptText; private ImageButton mActionEncryptText;
private ImageButton mActionNfc;
private FloatingActionButton mFab; private FloatingActionButton mFab;
private ImageView mPhoto; private ImageView mPhoto;
private FrameLayout mPhotoLayout; private FrameLayout mPhotoLayout;
@@ -208,7 +205,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
mActionEncryptFile = (ImageButton) findViewById(R.id.view_key_action_encrypt_files); mActionEncryptFile = (ImageButton) findViewById(R.id.view_key_action_encrypt_files);
mActionEncryptText = (ImageButton) findViewById(R.id.view_key_action_encrypt_text); mActionEncryptText = (ImageButton) findViewById(R.id.view_key_action_encrypt_text);
mActionNfc = (ImageButton) findViewById(R.id.view_key_action_nfc);
mFab = (FloatingActionButton) findViewById(R.id.fab); mFab = (FloatingActionButton) findViewById(R.id.fab);
mPhoto = (ImageView) findViewById(R.id.view_key_photo); mPhoto = (ImageView) findViewById(R.id.view_key_photo);
mPhotoLayout = (FrameLayout) findViewById(R.id.view_key_photo_layout); mPhotoLayout = (FrameLayout) findViewById(R.id.view_key_photo_layout);
@@ -221,7 +217,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
ContentDescriptionHint.setup(mActionEncryptFile); ContentDescriptionHint.setup(mActionEncryptFile);
ContentDescriptionHint.setup(mActionEncryptText); ContentDescriptionHint.setup(mActionEncryptText);
ContentDescriptionHint.setup(mActionNfc);
ContentDescriptionHint.setup(mFab); ContentDescriptionHint.setup(mFab);
@@ -318,15 +313,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
} }
}); });
final NfcHelper nfcHelper = NfcHelper.getInstance();
nfcHelper.initNfcIfSupported(this, mKeyRepository, mDataUri);
mActionNfc.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
nfcHelper.invokeNfcBeam(ViewKeyActivity.this);
}
});
// Prepare the loaders. Either re-connect with an existing ones, // Prepare the loaders. Either re-connect with an existing ones,
// or start new ones. // or start new ones.
getSupportLoaderManager().initLoader(LOADER_ID_UNIFIED, null, this); getSupportLoaderManager().initLoader(LOADER_ID_UNIFIED, null, this);
@@ -994,7 +980,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
mActionEncryptFile.setVisibility(View.INVISIBLE); mActionEncryptFile.setVisibility(View.INVISIBLE);
mActionEncryptText.setVisibility(View.INVISIBLE); mActionEncryptText.setVisibility(View.INVISIBLE);
mActionNfc.setVisibility(View.INVISIBLE);
hideFab(); hideFab();
mQrCodeLayout.setVisibility(View.GONE); mQrCodeLayout.setVisibility(View.GONE);
} else if (!mIsSecure) { } else if (!mIsSecure) {
@@ -1006,7 +991,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
mActionEncryptFile.setVisibility(View.INVISIBLE); mActionEncryptFile.setVisibility(View.INVISIBLE);
mActionEncryptText.setVisibility(View.INVISIBLE); mActionEncryptText.setVisibility(View.INVISIBLE);
mActionNfc.setVisibility(View.INVISIBLE);
hideFab(); hideFab();
mQrCodeLayout.setVisibility(View.GONE); mQrCodeLayout.setVisibility(View.GONE);
} else if (mIsExpired) { } else if (mIsExpired) {
@@ -1018,7 +1002,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
mActionEncryptFile.setVisibility(View.INVISIBLE); mActionEncryptFile.setVisibility(View.INVISIBLE);
mActionEncryptText.setVisibility(View.INVISIBLE); mActionEncryptText.setVisibility(View.INVISIBLE);
mActionNfc.setVisibility(View.INVISIBLE);
hideFab(); hideFab();
mQrCodeLayout.setVisibility(View.GONE); mQrCodeLayout.setVisibility(View.GONE);
} else if (mIsSecret) { } else if (mIsSecret) {
@@ -1055,13 +1038,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
mActionEncryptFile.setVisibility(View.VISIBLE); mActionEncryptFile.setVisibility(View.VISIBLE);
mActionEncryptText.setVisibility(View.VISIBLE); mActionEncryptText.setVisibility(View.VISIBLE);
// invokeBeam is available from API 21
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
&& NfcAdapter.getDefaultAdapter(this) != null) {
mActionNfc.setVisibility(View.VISIBLE);
} else {
mActionNfc.setVisibility(View.INVISIBLE);
}
showFab(); showFab();
// noinspection deprecation (no getDrawable with theme at current minApi level 15!) // noinspection deprecation (no getDrawable with theme at current minApi level 15!)
mFab.setImageDrawable(getResources().getDrawable(R.drawable.ic_repeat_white_24dp)); mFab.setImageDrawable(getResources().getDrawable(R.drawable.ic_repeat_white_24dp));
@@ -1069,7 +1045,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
mActionEncryptFile.setVisibility(View.VISIBLE); mActionEncryptFile.setVisibility(View.VISIBLE);
mActionEncryptText.setVisibility(View.VISIBLE); mActionEncryptText.setVisibility(View.VISIBLE);
mQrCodeLayout.setVisibility(View.GONE); mQrCodeLayout.setVisibility(View.GONE);
mActionNfc.setVisibility(View.INVISIBLE);
if (mIsVerified) { if (mIsVerified) {
mStatusText.setText(R.string.view_key_verified); mStatusText.setText(R.string.view_key_verified);

207
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/NfcHelper.java
View File

@@ -1,207 +0,0 @@
/*
* Copyright (C) 2013-2014 Dominik Schürmann <dominik@dominikschuermann.de>
* Copyright (C) 2017 Vincent Breitmoser <look@my.amazin.horse>
*
* 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.util;
import java.lang.ref.WeakReference;
import android.annotation.TargetApi;
import android.app.Activity;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.nfc.NdefMessage;
import android.nfc.NdefRecord;
import android.nfc.NfcAdapter;
import android.nfc.NfcAdapter.CreateNdefMessageCallback;
import android.nfc.NfcEvent;
import android.os.AsyncTask;
import android.os.Build;
import android.os.Handler;
import android.os.Message;
import android.provider.Settings;
import android.support.annotation.NonNull;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
import org.sufficientlysecure.keychain.provider.KeyRepository;
import org.sufficientlysecure.keychain.provider.KeyRepository.NotFoundException;
import org.sufficientlysecure.keychain.ui.util.Notify;
/**
* This class contains NFC functionality that can be shared across Fragments or Activities.
*/
public class NfcHelper {
private static final int NFC_SENT = 1;
public static NfcHelper getInstance() {
return new NfcHelper();
}
private NfcHelper() { }
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
public void initNfcIfSupported(final Activity activity, final KeyRepository keyRepository, final Uri dataUri) {
// check if NFC Beam is supported (>= Android 4.1)
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {
return;
}
// Check for available NFC Adapter
final NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(activity);
if (nfcAdapter == null) {
return;
}
final NfcHandler nfcHandler = new NfcHandler(activity);
// Implementation for the OnNdefPushCompleteCallback interface
final NfcAdapter.OnNdefPushCompleteCallback ndefCompleteCallback = 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
nfcHandler.obtainMessage(NFC_SENT).sendToTarget();
}
};
/* Retrieve mNfcKeyringBytes here asynchronously (to not block the UI) and init nfc adapter afterwards.
* nfcKeyringBytes can not be retrieved in createNdefMessage, because this process has no permissions
* to query the Uri.
*/
AsyncTask<Void, Void, byte[]> initTask = new AsyncTask<Void, Void, byte[]>() {
protected byte[] doInBackground(Void... unused) {
try {
long masterKeyId = keyRepository.getCachedPublicKeyRing(dataUri).extractOrGetMasterKeyId();
return keyRepository.loadPublicKeyRingData(masterKeyId);
} catch (NotFoundException | PgpKeyNotFoundException e) {
Log.e(Constants.TAG, "key not found!", e);
return null;
} catch (IllegalStateException e) {
// we specifically handle the database error if the blob is too large: "Couldn't read row 0, col 0
// from CursorWindow. Make sure the Cursor is initialized correctly before accessing data from it."
if (!e.getMessage().startsWith("Couldn't read row")) {
throw e;
}
Log.e(Constants.TAG, "key blob too large to retrieve", e);
return null;
}
}
protected void onPostExecute(final byte[] keyringBytes) {
if (keyringBytes == null) {
Log.e(Constants.TAG, "Could not obtain keyring bytes, NFC not available!");
}
if (activity.isFinishing()) {
return;
}
// Implementation for the CreateNdefMessageCallback interface
CreateNdefMessageCallback ndefCallback = 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.
*/
return new NdefMessage(NdefRecord.createMime(Constants.MIME_TYPE_KEYS, keyringBytes),
NdefRecord.createApplicationRecord(Constants.PACKAGE_NAME));
}
};
// Register callback to set NDEF message
nfcAdapter.setNdefPushMessageCallback(ndefCallback, activity);
// Register callback to listen for message-sent success
nfcAdapter.setOnNdefPushCompleteCallback(ndefCompleteCallback, activity);
Log.d(Constants.TAG, "NFC NDEF enabled!");
}
};
initTask.execute();
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public void invokeNfcBeam(@NonNull final Activity activity) {
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
return;
}
boolean hasNfc = activity.getPackageManager().hasSystemFeature(PackageManager.FEATURE_NFC);
if (!hasNfc) {
Notify.create(activity, R.string.no_nfc_support, Notify.LENGTH_LONG, Notify.Style.ERROR).show();
return;
}
NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(activity);
boolean isNfcEnabled = nfcAdapter != null && nfcAdapter.isEnabled();
if (!isNfcEnabled) {
Notify.create(activity, R.string.error_nfc_needed, Notify.LENGTH_LONG, Notify.Style.ERROR,
new Notify.ActionListener() {
@Override
public void onAction() {
Intent intentSettings = new Intent(Settings.ACTION_NFC_SETTINGS);
activity.startActivity(intentSettings);
}
}, R.string.menu_nfc_preferences).show();
return;
}
if (!nfcAdapter.isNdefPushEnabled()) {
Notify.create(activity, R.string.error_beam_needed, Notify.LENGTH_LONG, Notify.Style.ERROR, new Notify.ActionListener() {
@Override
public void onAction() {
Intent intentSettings = new Intent(Settings.ACTION_NFCSHARING_SETTINGS);
activity.startActivity(intentSettings);
}
}, R.string.menu_beam_preferences).show();
return;
}
nfcAdapter.invokeBeam(activity);
}
private static class NfcHandler extends Handler {
private final WeakReference<Activity> activityReference;
NfcHandler(Activity activity) {
activityReference = new WeakReference<>(activity);
}
@Override
public void handleMessage(Message msg) {
if (activityReference.get() != null) {
switch (msg.what) {
case NFC_SENT:
Notify.create(activityReference.get(), R.string.nfc_successful, Notify.Style.OK).show();
break;
}
}
}
}
}

11
OpenKeychain/src/main/res/layout/view_key_activity.xml
View File

@@ -111,17 +111,6 @@
android:src="@drawable/ic_action_encrypt_text_24dp" android:src="@drawable/ic_action_encrypt_text_24dp"
android:visibility="invisible" android:visibility="invisible"
tools:visibility="visible" /> tools:visibility="visible" />
<ImageButton
android:id="@+id/view_key_action_nfc"
style="?android:attr/borderlessButtonStyle"
android:contentDescription="@string/cd_share_nfc"
android:layout_width="64dp"
android:layout_height="64dp"
android:src="@drawable/ic_nfc_white_24dp"
android:visibility="invisible"
tools:visibility="visible" />
</LinearLayout> </LinearLayout>
<ImageView <ImageView

17
OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
View File

@@ -125,23 +125,6 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:background="?android:attr/listDivider" /> android:background="?android:attr/listDivider" />
<ImageButton
android:id="@+id/view_key_action_key_nfc"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
android:src="@drawable/ic_nfc_grey_24dp"
android:layout_gravity="center_vertical"
android:background="?android:selectableItemBackground" />
<View
android:layout_width="1dip"
android:layout_height="match_parent"
android:gravity="right"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
android:background="?android:attr/listDivider" />
<ImageButton <ImageButton
android:id="@+id/view_key_action_key_clipboard" android:id="@+id/view_key_action_key_clipboard"
android:layout_width="wrap_content" android:layout_width="wrap_content"