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

Add "Where is my NFC reader?" feature to nfc waiting dialog

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-10-10 04:54:05 +02:00
parent c07e808d24
commit 287d3251c5
12 changed files with 315 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
View File

@@ -144,6 +144,10 @@ public class CreateKeyActivity extends BaseSecurityTokenActivity {
@Override
protected void onSecurityTokenPostExecute() {
handleTokenInfo(tokenInfo);
}
public void handleTokenInfo(SecurityTokenInfo tokenInfo) {
if (mCurrentFragment instanceof SecurityTokenListenerFragment) {
((SecurityTokenListenerFragment) mCurrentFragment).onSecurityTokenPostExecute();
return;

33
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenWaitFragment.java
View File

@@ -19,19 +19,24 @@ package org.sufficientlysecure.keychain.ui;
import android.content.Context;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity;
import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.view.animation.Animation;
import org.sufficientlysecure.keychain.BuildConfig;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.securitytoken.NfcSweetspotData;
import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo;
import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction;
import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenActivity;
@@ -39,6 +44,7 @@ import org.sufficientlysecure.keychain.ui.token.ManageSecurityTokenFragment;
public class CreateSecurityTokenWaitFragment extends Fragment {
public static final int REQUEST_CODE_SWEETSPOT = 0;
public static boolean sDisableFragmentAnimations = false;
@@ -88,6 +94,17 @@ public class CreateSecurityTokenWaitFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.create_security_token_wait_fragment, container, false);
boolean showLocateHotspot = NfcSweetspotData.SWEETSPOT_DATA.containsKey(Build.MODEL);
View locateHotspotView = view.findViewById(R.id.button_locate_nfc);
locateHotspotView.setVisibility(showLocateHotspot ? View.VISIBLE : View.GONE);
locateHotspotView.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(getActivity(), ShowNfcSweetspotActivity.class);
startActivityForResult(intent, REQUEST_CODE_SWEETSPOT);
}
});
mBackButton = view.findViewById(R.id.create_key_back_button);
mBackButton.setOnClickListener(new View.OnClickListener() {
@@ -100,6 +117,22 @@ public class CreateSecurityTokenWaitFragment extends Fragment {
return view;
}
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == REQUEST_CODE_SWEETSPOT) {
FragmentActivity activity = getActivity();
if (activity instanceof BaseSecurityTokenActivity && data != null &&
data.hasExtra(ShowNfcSweetspotActivity.EXTRA_TOKEN_INFO)) {
SecurityTokenInfo tokenInfo = data.getParcelableExtra(ShowNfcSweetspotActivity.EXTRA_TOKEN_INFO);
((CreateKeyActivity) activity).handleTokenInfo(tokenInfo);
}
return;
}
super.onActivityResult(requestCode, resultCode, data);
}
@Override
public void onAttach(Context context) {
super.onAttach(context);

116
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ShowNfcSweetspotActivity.java Normal file
View File

@@ -0,0 +1,116 @@
package org.sufficientlysecure.keychain.ui;
import android.app.Activity;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.DisplayMetrics;
import android.util.Pair;
import android.view.MotionEvent;
import android.view.View;
import android.view.animation.DecelerateInterpolator;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.securitytoken.NfcSweetspotData;
import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenActivity;
public class ShowNfcSweetspotActivity extends BaseSecurityTokenActivity {
public static final String EXTRA_TOKEN_INFO = "token_info";
private View sweetspotIndicator;
private View sweetspotIcon;
private View sweetspotCircle1;
private View sweetspotCircle2;
private View sweetspotCircle3;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
overridePendingTransition(R.anim.fade_in_quick, R.anim.fade_out_quick);
setContentView(R.layout.show_nfc_sweetspot_activity);
sweetspotIndicator = findViewById(R.id.nfc_sweetspot_indicator);
Pair<Double, Double> nfcPosition = NfcSweetspotData.SWEETSPOT_DATA.get(Build.MODEL);
if (nfcPosition == null) {
throw new IllegalArgumentException("No data available for this model. This activity should not be called!");
}
DisplayMetrics displayDimensions = getDisplaySize();
final float translationX = (float) (displayDimensions.widthPixels * nfcPosition.first);
final float translationY = (float) (displayDimensions.heightPixels * nfcPosition.second);
sweetspotIndicator.post(new Runnable() {
@Override
public void run() {
sweetspotIndicator.setTranslationX(translationX - sweetspotIndicator.getWidth() / 2);
sweetspotIndicator.setTranslationY(translationY - sweetspotIndicator.getHeight() / 2);
}
});
sweetspotIcon = findViewById(R.id.nfc_sweetspot_icon);
sweetspotCircle1 = findViewById(R.id.nfc_sweetspot_circle_1);
sweetspotCircle2 = findViewById(R.id.nfc_sweetspot_circle_2);
sweetspotCircle3 = findViewById(R.id.nfc_sweetspot_circle_3);
sweetspotIcon.setAlpha(0.0f);
sweetspotCircle1.setAlpha(0.0f);
sweetspotCircle2.setAlpha(0.0f);
sweetspotCircle3.setAlpha(0.0f);
}
@Override
public void onEnterAnimationComplete() {
super.onEnterAnimationComplete();
DecelerateInterpolator interpolator = new DecelerateInterpolator();
sweetspotIcon.animate().alpha(1.0f).setInterpolator(interpolator).setDuration(300).start();
sweetspotCircle1.animate().alpha(1.0f).setInterpolator(interpolator).setDuration(500).setStartDelay(100).start();
sweetspotCircle2.animate().alpha(1.0f).setInterpolator(interpolator).setDuration(700).setStartDelay(200).start();
sweetspotCircle3.animate().alpha(1.0f).setInterpolator(interpolator).setDuration(1000).setStartDelay(300).start();
}
@Override
protected void initTheme() {
// do nothing
}
@Override
public void finish() {
super.finish();
overridePendingTransition(R.anim.fade_in_quick, R.anim.fade_out_quick);
}
@Override
protected void onSecurityTokenPostExecute() {
Intent result = new Intent();
result.putExtra(EXTRA_TOKEN_INFO, tokenInfo);
setResult(Activity.RESULT_OK, result);
finish();
}
@Override
public boolean onTouchEvent(MotionEvent event) {
if (event.getActionMasked() == MotionEvent.ACTION_UP) {
setResult(Activity.RESULT_CANCELED);
finish();
return true;
}
return super.onTouchEvent(event);
}
@NonNull
private DisplayMetrics getDisplaySize() {
DisplayMetrics metrics = new DisplayMetrics();
getWindowManager().getDefaultDisplay().getMetrics(metrics);
return metrics;
}
}

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseActivity.java
View File

@@ -57,7 +57,7 @@ public abstract class BaseActivity extends AppCompatActivity {
super.onResume();
onResumeChecks(this);
if (mThemeChanger.changeTheme()) {
if (mThemeChanger != null && mThemeChanger.changeTheme()) {
Intent intent = getIntent();
finish();
overridePendingTransition(0, 0);

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenActivity.java
View File

@@ -73,7 +73,7 @@ public abstract class BaseSecurityTokenActivity extends BaseActivity
protected UsbConnectionDispatcher mUsbDispatcher;
private boolean mTagHandlingEnabled;
private SecurityTokenInfo tokenInfo;
protected SecurityTokenInfo tokenInfo;
/**
* Override to change UI before SecurityToken handling (UI thread)