Fix animation in manage keys for security tokens
This commit is contained in:
Dominik Schürmann
parent
562d0016be
commit
d72001c690
|
|
@ -19,7 +19,7 @@ package org.sufficientlysecure.keychain.securitytoken;
|
|||
|
||||
import android.nfc.Tag;
|
||||
|
||||
import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenNfcActivity;
|
||||
import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenActivity;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
|
|
@ -83,7 +83,7 @@ public class NfcTransport implements Transport {
|
|||
public void connect() throws IOException {
|
||||
mIsoCard = AndroidCard.get(mTag);
|
||||
if (mIsoCard == null) {
|
||||
throw new BaseSecurityTokenNfcActivity.IsoDepNotSupportedException("Tag does not support ISO-DEP (ISO 14443-4)");
|
||||
throw new BaseSecurityTokenActivity.IsoDepNotSupportedException("Tag does not support ISO-DEP (ISO 14443-4)");
|
||||
}
|
||||
|
||||
mIsoCard.setTimeout(TIMEOUT);
|
||||
|
|
|
|||
|
|
@ -341,7 +341,6 @@ public class SecurityTokenHelper {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Puts a key on the token in the given slot.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ import android.content.Intent;
|
|||
import android.nfc.NfcAdapter;
|
||||
import android.os.Bundle;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.support.v4.app.FragmentManager;
|
||||
import android.support.v4.app.FragmentTransaction;
|
||||
|
||||
import org.sufficientlysecure.keychain.R;
|
||||
|
|
@ -28,7 +29,7 @@ import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
|
|||
import org.sufficientlysecure.keychain.provider.CachedPublicKeyRing;
|
||||
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
|
||||
import org.sufficientlysecure.keychain.provider.ProviderHelper;
|
||||
import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenNfcActivity;
|
||||
import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenActivity;
|
||||
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
|
||||
import org.sufficientlysecure.keychain.util.Passphrase;
|
||||
import org.sufficientlysecure.keychain.util.Preferences;
|
||||
|
|
@ -36,7 +37,7 @@ import org.sufficientlysecure.keychain.util.Preferences;
|
|||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class CreateKeyActivity extends BaseSecurityTokenNfcActivity {
|
||||
public class CreateKeyActivity extends BaseSecurityTokenActivity {
|
||||
|
||||
public static final String EXTRA_NAME = "name";
|
||||
public static final String EXTRA_EMAIL = "email";
|
||||
|
|
@ -77,7 +78,7 @@ public class CreateKeyActivity extends BaseSecurityTokenNfcActivity {
|
|||
// NOTE: ACTION_NDEF_DISCOVERED and not ACTION_TAG_DISCOVERED like in BaseNfcActivity
|
||||
if (NfcAdapter.ACTION_NDEF_DISCOVERED.equals(getIntent().getAction())) {
|
||||
|
||||
mTagDispatcher.interceptIntent(getIntent());
|
||||
mNfcTagDispatcher.interceptIntent(getIntent());
|
||||
|
||||
setTitle(R.string.title_manage_my_keys);
|
||||
|
||||
|
|
@ -163,7 +164,10 @@ public class CreateKeyActivity extends BaseSecurityTokenNfcActivity {
|
|||
|
||||
// We don't want get back to wait activity mainly because it looks weird with otg token
|
||||
if (mCurrentFragment instanceof CreateSecurityTokenWaitFragment) {
|
||||
getSupportFragmentManager().popBackStackImmediate();
|
||||
// hack from http://stackoverflow.com/a/11253987
|
||||
CreateSecurityTokenWaitFragment.sDisableFragmentAnimations = true;
|
||||
getSupportFragmentManager().popBackStackImmediate(null, FragmentManager.POP_BACK_STACK_INCLUSIVE);// getSupportFragmentManager().
|
||||
CreateSecurityTokenWaitFragment.sDisableFragmentAnimations = false;
|
||||
}
|
||||
|
||||
if (containsKeys(mScannedFingerprints)) {
|
||||
|
|
@ -257,7 +261,6 @@ public class CreateKeyActivity extends BaseSecurityTokenNfcActivity {
|
|||
|
||||
// do it immediately!
|
||||
getSupportFragmentManager().executePendingTransactions();
|
||||
|
||||
}
|
||||
|
||||
interface SecurityTokenListenerFragment {
|
||||
|
|
|
|||
|
|
@ -17,21 +17,23 @@
|
|||
|
||||
package org.sufficientlysecure.keychain.ui;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.os.Bundle;
|
||||
import android.support.annotation.Nullable;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.animation.Animation;
|
||||
|
||||
import org.sufficientlysecure.keychain.R;
|
||||
import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction;
|
||||
import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenNfcActivity;
|
||||
|
||||
import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenActivity;
|
||||
|
||||
public class CreateSecurityTokenWaitFragment extends Fragment {
|
||||
|
||||
public static boolean sDisableFragmentAnimations = false;
|
||||
|
||||
CreateKeyActivity mCreateKeyActivity;
|
||||
View mBackButton;
|
||||
|
||||
|
|
@ -39,8 +41,8 @@ public class CreateSecurityTokenWaitFragment extends Fragment {
|
|||
public void onCreate(@Nullable final Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
if (this.getActivity() instanceof BaseSecurityTokenNfcActivity) {
|
||||
((BaseSecurityTokenNfcActivity) this.getActivity()).checkDeviceConnection();
|
||||
if (this.getActivity() instanceof BaseSecurityTokenActivity) {
|
||||
((BaseSecurityTokenActivity) this.getActivity()).checkDeviceConnection();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -61,9 +63,22 @@ public class CreateSecurityTokenWaitFragment extends Fragment {
|
|||
}
|
||||
|
||||
@Override
|
||||
public void onAttach(Activity activity) {
|
||||
super.onAttach(activity);
|
||||
public void onAttach(Context context) {
|
||||
super.onAttach(context);
|
||||
mCreateKeyActivity = (CreateKeyActivity) getActivity();
|
||||
}
|
||||
|
||||
/**
|
||||
* hack from http://stackoverflow.com/a/11253987
|
||||
*/
|
||||
@Override
|
||||
public Animation onCreateAnimation(int transit, boolean enter, int nextAnim) {
|
||||
if (sDisableFragmentAnimations) {
|
||||
Animation a = new Animation() {};
|
||||
a.setDuration(0);
|
||||
return a;
|
||||
}
|
||||
return super.onCreateAnimation(transit, enter, nextAnim);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,11 +40,11 @@ import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
|
|||
import org.sufficientlysecure.keychain.R;
|
||||
import org.sufficientlysecure.keychain.operations.results.OperationResult;
|
||||
import org.sufficientlysecure.keychain.remote.ui.AppsListFragment;
|
||||
import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenNfcActivity;
|
||||
import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenActivity;
|
||||
import org.sufficientlysecure.keychain.util.FabContainer;
|
||||
import org.sufficientlysecure.keychain.util.Preferences;
|
||||
|
||||
public class MainActivity extends BaseSecurityTokenNfcActivity implements FabContainer, OnBackStackChangedListener {
|
||||
public class MainActivity extends BaseSecurityTokenActivity implements FabContainer, OnBackStackChangedListener {
|
||||
|
||||
static final int ID_KEYS = 1;
|
||||
static final int ID_ENCRYPT_DECRYPT = 2;
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ import org.sufficientlysecure.keychain.securitytoken.KeyType;
|
|||
import org.sufficientlysecure.keychain.service.PassphraseCacheService;
|
||||
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
|
||||
import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
|
||||
import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenNfcActivity;
|
||||
import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenActivity;
|
||||
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
|
||||
import org.sufficientlysecure.keychain.ui.util.ThemeChanger;
|
||||
import org.sufficientlysecure.keychain.util.Log;
|
||||
|
|
@ -58,7 +58,7 @@ import nordpol.android.NfcGuideView;
|
|||
* NFC devices.
|
||||
* For the full specs, see http://g10code.com/docs/openpgp-card-2.0.pdf
|
||||
*/
|
||||
public class SecurityTokenOperationActivity extends BaseSecurityTokenNfcActivity {
|
||||
public class SecurityTokenOperationActivity extends BaseSecurityTokenActivity {
|
||||
|
||||
public static final String EXTRA_REQUIRED_INPUT = "required_input";
|
||||
public static final String EXTRA_CRYPTO_INPUT = "crypto_input";
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ import org.sufficientlysecure.keychain.service.ImportKeyringParcel;
|
|||
import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
|
||||
import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
|
||||
import org.sufficientlysecure.keychain.ui.ViewKeyFragment.PostponeType;
|
||||
import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenNfcActivity;
|
||||
import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenActivity;
|
||||
import org.sufficientlysecure.keychain.ui.base.CryptoOperationHelper;
|
||||
import org.sufficientlysecure.keychain.ui.dialog.SetPassphraseDialogFragment;
|
||||
import org.sufficientlysecure.keychain.ui.util.FormattingUtils;
|
||||
|
|
@ -103,7 +103,7 @@ import org.sufficientlysecure.keychain.util.Passphrase;
|
|||
import org.sufficientlysecure.keychain.util.Preferences;
|
||||
|
||||
|
||||
public class ViewKeyActivity extends BaseSecurityTokenNfcActivity implements
|
||||
public class ViewKeyActivity extends BaseSecurityTokenActivity implements
|
||||
LoaderManager.LoaderCallbacks<Cursor>,
|
||||
CryptoOperationHelper.Callback<ImportKeyringParcel, ImportKeyResult> {
|
||||
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ import java.io.IOException;
|
|||
import nordpol.android.OnDiscoveredTagListener;
|
||||
import nordpol.android.TagDispatcher;
|
||||
|
||||
public abstract class BaseSecurityTokenNfcActivity extends BaseActivity
|
||||
public abstract class BaseSecurityTokenActivity extends BaseActivity
|
||||
implements OnDiscoveredTagListener, UsbConnectionDispatcher.OnDiscoveredUsbDeviceListener {
|
||||
public static final int REQUEST_CODE_PIN = 1;
|
||||
|
||||
|
|
@ -73,7 +73,7 @@ public abstract class BaseSecurityTokenNfcActivity extends BaseActivity
|
|||
private static final String FIDESMO_APP_PACKAGE = "com.fidesmo.sec.android";
|
||||
|
||||
protected SecurityTokenHelper mSecurityTokenHelper = SecurityTokenHelper.getInstance();
|
||||
protected TagDispatcher mTagDispatcher;
|
||||
protected TagDispatcher mNfcTagDispatcher;
|
||||
protected UsbConnectionDispatcher mUsbDispatcher;
|
||||
private boolean mTagHandlingEnabled;
|
||||
|
||||
|
|
@ -202,7 +202,7 @@ public abstract class BaseSecurityTokenNfcActivity extends BaseActivity
|
|||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
|
||||
mTagDispatcher = TagDispatcher.get(this, this, false, false, true, false);
|
||||
mNfcTagDispatcher = TagDispatcher.get(this, this, false, false, true, false);
|
||||
mUsbDispatcher = new UsbConnectionDispatcher(this, this);
|
||||
|
||||
// Check whether we're recreating a previously destroyed instance
|
||||
|
|
@ -234,7 +234,7 @@ public abstract class BaseSecurityTokenNfcActivity extends BaseActivity
|
|||
*/
|
||||
@Override
|
||||
public void onNewIntent(final Intent intent) {
|
||||
mTagDispatcher.interceptIntent(intent);
|
||||
mNfcTagDispatcher.interceptIntent(intent);
|
||||
}
|
||||
|
||||
private void handleSecurityTokenError(IOException e) {
|
||||
|
|
@ -351,7 +351,7 @@ public abstract class BaseSecurityTokenNfcActivity extends BaseActivity
|
|||
super.onPause();
|
||||
Log.d(Constants.TAG, "BaseNfcActivity.onPause");
|
||||
|
||||
mTagDispatcher.disableExclusiveNfc();
|
||||
mNfcTagDispatcher.disableExclusiveNfc();
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -361,7 +361,7 @@ public abstract class BaseSecurityTokenNfcActivity extends BaseActivity
|
|||
public void onResume() {
|
||||
super.onResume();
|
||||
Log.d(Constants.TAG, "BaseNfcActivity.onResume");
|
||||
mTagDispatcher.enableExclusiveNfc();
|
||||
mNfcTagDispatcher.enableExclusiveNfc();
|
||||
}
|
||||
|
||||
protected void obtainSecurityTokenPin(RequiredInputParcel requiredInput) {
|
||||
|
|
@ -26,7 +26,6 @@ import android.hardware.usb.UsbDevice;
|
|||
import android.hardware.usb.UsbManager;
|
||||
|
||||
import org.sufficientlysecure.keychain.Constants;
|
||||
import org.sufficientlysecure.keychain.securitytoken.UsbTransport;
|
||||
import org.sufficientlysecure.keychain.ui.UsbEventReceiverActivity;
|
||||
|
||||
public class UsbConnectionDispatcher {
|
||||
|
|
@ -34,6 +33,7 @@ public class UsbConnectionDispatcher {
|
|||
|
||||
private OnDiscoveredUsbDeviceListener mListener;
|
||||
private UsbManager mUsbManager;
|
||||
|
||||
/**
|
||||
* Receives broadcast when a supported USB device get permission.
|
||||
*/
|
||||
|
|
@ -44,7 +44,7 @@ public class UsbConnectionDispatcher {
|
|||
|
||||
switch (action) {
|
||||
case UsbEventReceiverActivity.ACTION_USB_PERMISSION: {
|
||||
android.hardware.usb.UsbDevice usbDevice = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
|
||||
UsbDevice usbDevice = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
|
||||
boolean permission = intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED,
|
||||
false);
|
||||
if (permission) {
|
||||
|
|
@ -79,7 +79,7 @@ public class UsbConnectionDispatcher {
|
|||
*/
|
||||
public void rescanDevices() {
|
||||
// Note: we don't check devices VID/PID because
|
||||
// we check for permisssion instead.
|
||||
// we check for permission instead.
|
||||
// We should have permission only for matching devices
|
||||
for (UsbDevice device : mUsbManager.getDeviceList().values()) {
|
||||
if (mUsbManager.hasPermission(device)) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue