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

Merge pull request #2145 from open-keychain/ditch-android-beam

Browse Source 
Ditch Android Beam feature
This commit is contained in:
Dominik Schürmann
2017-08-02 23:45:36 +02:00
committed by GitHub
parent dd5d57d06c b94a8c9dee
commit 7a9673fe47
5 changed files with 0 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,6 @@ import android.app.Activity;
import android.app.ActivityOptions;
import android.content.ClipData;
import android.content.ClipboardManager;
import android.content.ContentResolver;
import android.content.Context;
import android.content.Intent;
import android.database.Cursor;
@@ -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.QrCodeUtils;
import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.NfcHelper;
public class ViewKeyAdvShareFragment extends LoaderFragment implements
LoaderManager.LoaderCallbacks<Cursor> {
@@ -79,8 +77,6 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
private CardView mQrCodeLayout;
private TextView mFingerprintView;
NfcHelper mNfcHelper;
private static final int LOADER_ID_UNIFIED = 0;
private Uri mDataUri;
@@ -94,10 +90,6 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
View root = super.onCreateView(inflater, superContainer, savedInstanceState);
View view = inflater.inflate(R.layout.view_key_adv_share_fragment, getContainer());
ContentResolver contentResolver = ViewKeyAdvShareFragment.this.getActivity().getContentResolver();
KeyRepository keyRepository = KeyRepository.createDatabaseInteractor(getContext());
mNfcHelper = new NfcHelper(getActivity(), keyRepository);
mFingerprintView = (TextView) view.findViewById(R.id.view_key_fingerprint);
mQrCode = (ImageView) view.findViewById(R.id.view_key_qr_code);
@@ -139,7 +131,6 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
View vFingerprintShareButton = view.findViewById(R.id.view_key_action_fingerprint_share);
View vFingerprintClipboardButton = view.findViewById(R.id.view_key_action_fingerprint_clipboard);
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);
ImageButton vKeySafeSlingerButton = (ImageButton) view.findViewById(R.id.view_key_action_key_safeslinger);
View vKeyUploadButton = view.findViewById(R.id.view_key_action_upload);
@@ -171,18 +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) {
mNfcHelper.invokeNfcBeam();
}
});
} else {
vKeyNfcButton.setVisibility(View.GONE);
}
vKeySafeSlingerButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -357,9 +336,6 @@ public class ViewKeyAdvShareFragment extends LoaderFragment implements
// Prepare the loaders. Either re-connect with an existing ones,
// or start new ones.
getLoaderManager().initLoader(LOADER_ID_UNIFIED, null, this);
// Prepare the NfcHelper
mNfcHelper.initNfc(mDataUri);
}
static final String[] UNIFIED_PROJECTION = new String[]{

29
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.PorterDuff;
import android.net.Uri;
import android.nfc.NfcAdapter;
import android.os.AsyncTask;
import android.os.Build;
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.util.ContactHelper;
import org.sufficientlysecure.keychain.util.Log;
import org.sufficientlysecure.keychain.util.NfcHelper;
import org.sufficientlysecure.keychain.util.Passphrase;
import org.sufficientlysecure.keychain.util.Preferences;
@@ -157,7 +155,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
private ImageButton mActionEncryptFile;
private ImageButton mActionEncryptText;
private ImageButton mActionNfc;
private FloatingActionButton mFab;
private ImageView mPhoto;
private FrameLayout mPhotoLayout;
@@ -166,9 +163,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
private String mQrCodeLoaded;
// NFC
private NfcHelper mNfcHelper;
private static final int LOADER_ID_UNIFIED = 0;
private boolean mIsSecret = false;
@@ -211,7 +205,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
mActionEncryptFile = (ImageButton) findViewById(R.id.view_key_action_encrypt_files);
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);
mPhoto = (ImageView) findViewById(R.id.view_key_photo);
mPhotoLayout = (FrameLayout) findViewById(R.id.view_key_photo_layout);
@@ -224,7 +217,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
ContentDescriptionHint.setup(mActionEncryptFile);
ContentDescriptionHint.setup(mActionEncryptText);
ContentDescriptionHint.setup(mActionNfc);
ContentDescriptionHint.setup(mFab);
@@ -321,20 +313,10 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
}
});
mActionNfc.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
mNfcHelper.invokeNfcBeam();
}
});
// Prepare the loaders. Either re-connect with an existing ones,
// or start new ones.
getSupportLoaderManager().initLoader(LOADER_ID_UNIFIED, null, this);
mNfcHelper = new NfcHelper(this, mKeyRepository);
mNfcHelper.initNfc(mDataUri);
if (savedInstanceState == null && getIntent().hasExtra(EXTRA_DISPLAY_RESULT)) {
OperationResult result = getIntent().getParcelableExtra(EXTRA_DISPLAY_RESULT);
result.createNotify(this).show();
@@ -998,7 +980,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
mActionEncryptFile.setVisibility(View.INVISIBLE);
mActionEncryptText.setVisibility(View.INVISIBLE);
mActionNfc.setVisibility(View.INVISIBLE);
hideFab();
mQrCodeLayout.setVisibility(View.GONE);
} else if (!mIsSecure) {
@@ -1010,7 +991,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
mActionEncryptFile.setVisibility(View.INVISIBLE);
mActionEncryptText.setVisibility(View.INVISIBLE);
mActionNfc.setVisibility(View.INVISIBLE);
hideFab();
mQrCodeLayout.setVisibility(View.GONE);
} else if (mIsExpired) {
@@ -1022,7 +1002,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
mActionEncryptFile.setVisibility(View.INVISIBLE);
mActionEncryptText.setVisibility(View.INVISIBLE);
mActionNfc.setVisibility(View.INVISIBLE);
hideFab();
mQrCodeLayout.setVisibility(View.GONE);
} else if (mIsSecret) {
@@ -1059,13 +1038,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
mActionEncryptFile.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();
// noinspection deprecation (no getDrawable with theme at current minApi level 15!)
mFab.setImageDrawable(getResources().getDrawable(R.drawable.ic_repeat_white_24dp));
@@ -1073,7 +1045,6 @@ public class ViewKeyActivity extends BaseSecurityTokenActivity implements
mActionEncryptFile.setVisibility(View.VISIBLE);
mActionEncryptText.setVisibility(View.VISIBLE);
mQrCodeLayout.setVisibility(View.GONE);
mActionNfc.setVisibility(View.INVISIBLE);
if (mIsVerified) {
mStatusText.setText(R.string.view_key_verified);