Extract service parts from SecurityTokenOperationActivity
This commit is contained in:
parent
c9018e1844
commit
eef27a544f
|
@ -844,6 +844,12 @@
|
||||||
android:name=".remote.ui.AccountSettingsActivity"
|
android:name=".remote.ui.AccountSettingsActivity"
|
||||||
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
|
android:configChanges="orientation|screenSize|keyboardHidden|keyboard"
|
||||||
android:exported="false" />
|
android:exported="false" />
|
||||||
|
<activity
|
||||||
|
android:name=".remote.ui.RemoteSecurityTokenOperationActivity"
|
||||||
|
android:allowTaskReparenting="true"
|
||||||
|
android:launchMode="singleTop"
|
||||||
|
android:taskAffinity=":Nfc"
|
||||||
|
android:theme="@style/Theme.Keychain.Light.Dialog" />
|
||||||
|
|
||||||
<!-- DEPRECATED service,
|
<!-- DEPRECATED service,
|
||||||
using this service may lead to truncated data being returned to the caller -->
|
using this service may lead to truncated data being returned to the caller -->
|
||||||
|
|
|
@ -53,6 +53,7 @@ import org.sufficientlysecure.keychain.provider.KeychainContract.ApiAccounts;
|
||||||
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
|
import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings;
|
||||||
import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables;
|
import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables;
|
||||||
import org.sufficientlysecure.keychain.provider.ProviderHelper;
|
import org.sufficientlysecure.keychain.provider.ProviderHelper;
|
||||||
|
import org.sufficientlysecure.keychain.remote.ui.RemoteSecurityTokenOperationActivity;
|
||||||
import org.sufficientlysecure.keychain.remote.ui.RemoteSelectPubKeyActivity;
|
import org.sufficientlysecure.keychain.remote.ui.RemoteSelectPubKeyActivity;
|
||||||
import org.sufficientlysecure.keychain.remote.ui.SelectAllowedKeysActivity;
|
import org.sufficientlysecure.keychain.remote.ui.SelectAllowedKeysActivity;
|
||||||
import org.sufficientlysecure.keychain.remote.ui.SelectSignKeyIdActivity;
|
import org.sufficientlysecure.keychain.remote.ui.SelectSignKeyIdActivity;
|
||||||
|
@ -191,11 +192,11 @@ public class OpenPgpService extends Service {
|
||||||
case NFC_DECRYPT:
|
case NFC_DECRYPT:
|
||||||
case NFC_SIGN: {
|
case NFC_SIGN: {
|
||||||
// build PendingIntent for Security Token NFC operations
|
// build PendingIntent for Security Token NFC operations
|
||||||
Intent intent = new Intent(context, SecurityTokenOperationActivity.class);
|
Intent intent = new Intent(context, RemoteSecurityTokenOperationActivity.class);
|
||||||
// pass params through to activity that it can be returned again later to repeat pgp operation
|
// pass params through to activity that it can be returned again later to repeat pgp operation
|
||||||
intent.putExtra(SecurityTokenOperationActivity.EXTRA_SERVICE_INTENT, data);
|
intent.putExtra(RemoteSecurityTokenOperationActivity.EXTRA_SERVICE_INTENT, data);
|
||||||
intent.putExtra(SecurityTokenOperationActivity.EXTRA_REQUIRED_INPUT, requiredInput);
|
intent.putExtra(RemoteSecurityTokenOperationActivity.EXTRA_REQUIRED_INPUT, requiredInput);
|
||||||
intent.putExtra(SecurityTokenOperationActivity.EXTRA_CRYPTO_INPUT, cryptoInput);
|
intent.putExtra(RemoteSecurityTokenOperationActivity.EXTRA_CRYPTO_INPUT, cryptoInput);
|
||||||
return PendingIntent.getActivity(context, 0, intent,
|
return PendingIntent.getActivity(context, 0, intent,
|
||||||
PendingIntent.FLAG_CANCEL_CURRENT);
|
PendingIntent.FLAG_CANCEL_CURRENT);
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,48 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2016 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.remote.ui;
|
||||||
|
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import org.sufficientlysecure.keychain.remote.CryptoInputParcelCacheService;
|
||||||
|
import org.sufficientlysecure.keychain.ui.SecurityTokenOperationActivity;
|
||||||
|
|
||||||
|
public class RemoteSecurityTokenOperationActivity extends SecurityTokenOperationActivity {
|
||||||
|
|
||||||
|
public static final String EXTRA_SERVICE_INTENT = "data";
|
||||||
|
|
||||||
|
private Intent mServiceIntent;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
|
Intent intent = getIntent();
|
||||||
|
Bundle data = intent.getExtras();
|
||||||
|
mServiceIntent = data.getParcelable(EXTRA_SERVICE_INTENT);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void returnResult() {
|
||||||
|
// save updated cryptoInputParcel in cache
|
||||||
|
CryptoInputParcelCacheService.addCryptoInputParcel(this, mServiceIntent, mInputParcel);
|
||||||
|
setResult(RESULT_OK, mServiceIntent);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -231,7 +231,6 @@ public class CreateSecurityTokenImportResetFragment
|
||||||
|
|
||||||
public void resetCard() {
|
public void resetCard() {
|
||||||
Intent intent = new Intent(getActivity(), SecurityTokenOperationActivity.class);
|
Intent intent = new Intent(getActivity(), SecurityTokenOperationActivity.class);
|
||||||
intent.putExtra(SecurityTokenOperationActivity.EXTRA_SERVICE_INTENT, (Parcelable[]) null);
|
|
||||||
RequiredInputParcel resetP = RequiredInputParcel.createNfcReset();
|
RequiredInputParcel resetP = RequiredInputParcel.createNfcReset();
|
||||||
intent.putExtra(SecurityTokenOperationActivity.EXTRA_REQUIRED_INPUT, resetP);
|
intent.putExtra(SecurityTokenOperationActivity.EXTRA_REQUIRED_INPUT, resetP);
|
||||||
intent.putExtra(SecurityTokenOperationActivity.EXTRA_CRYPTO_INPUT, new CryptoInputParcel());
|
intent.putExtra(SecurityTokenOperationActivity.EXTRA_CRYPTO_INPUT, new CryptoInputParcel());
|
||||||
|
|
|
@ -35,7 +35,6 @@ import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey;
|
||||||
import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing;
|
import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing;
|
||||||
import org.sufficientlysecure.keychain.provider.KeychainContract;
|
import org.sufficientlysecure.keychain.provider.KeychainContract;
|
||||||
import org.sufficientlysecure.keychain.provider.ProviderHelper;
|
import org.sufficientlysecure.keychain.provider.ProviderHelper;
|
||||||
import org.sufficientlysecure.keychain.remote.CryptoInputParcelCacheService;
|
|
||||||
import org.sufficientlysecure.keychain.service.PassphraseCacheService;
|
import org.sufficientlysecure.keychain.service.PassphraseCacheService;
|
||||||
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
|
import org.sufficientlysecure.keychain.service.input.CryptoInputParcel;
|
||||||
import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
|
import org.sufficientlysecure.keychain.service.input.RequiredInputParcel;
|
||||||
|
@ -61,9 +60,6 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenNfcActivity
|
||||||
public static final String EXTRA_REQUIRED_INPUT = "required_input";
|
public static final String EXTRA_REQUIRED_INPUT = "required_input";
|
||||||
public static final String EXTRA_CRYPTO_INPUT = "crypto_input";
|
public static final String EXTRA_CRYPTO_INPUT = "crypto_input";
|
||||||
|
|
||||||
// passthrough for OpenPgpService
|
|
||||||
public static final String EXTRA_SERVICE_INTENT = "data";
|
|
||||||
|
|
||||||
public static final String RESULT_CRYPTO_INPUT = "result_data";
|
public static final String RESULT_CRYPTO_INPUT = "result_data";
|
||||||
|
|
||||||
public ViewAnimator vAnimator;
|
public ViewAnimator vAnimator;
|
||||||
|
@ -72,11 +68,10 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenNfcActivity
|
||||||
public NfcGuideView nfcGuideView;
|
public NfcGuideView nfcGuideView;
|
||||||
|
|
||||||
private RequiredInputParcel mRequiredInput;
|
private RequiredInputParcel mRequiredInput;
|
||||||
private Intent mServiceIntent;
|
|
||||||
|
|
||||||
private static final byte[] BLANK_FINGERPRINT = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
|
private static final byte[] BLANK_FINGERPRINT = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
|
||||||
|
|
||||||
private CryptoInputParcel mInputParcel;
|
protected CryptoInputParcel mInputParcel;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void initTheme() {
|
protected void initTheme() {
|
||||||
|
@ -136,7 +131,6 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenNfcActivity
|
||||||
Bundle data = intent.getExtras();
|
Bundle data = intent.getExtras();
|
||||||
|
|
||||||
mRequiredInput = data.getParcelable(EXTRA_REQUIRED_INPUT);
|
mRequiredInput = data.getParcelable(EXTRA_REQUIRED_INPUT);
|
||||||
mServiceIntent = data.getParcelable(EXTRA_SERVICE_INTENT);
|
|
||||||
|
|
||||||
obtainPassphraseIfRequired();
|
obtainPassphraseIfRequired();
|
||||||
}
|
}
|
||||||
|
@ -274,17 +268,7 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenNfcActivity
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onNfcPostExecute() {
|
protected void onNfcPostExecute() {
|
||||||
if (mServiceIntent != null) {
|
returnResult();
|
||||||
// if we're triggered by OpenPgpService
|
|
||||||
// save updated cryptoInputParcel in cache
|
|
||||||
CryptoInputParcelCacheService.addCryptoInputParcel(this, mServiceIntent, mInputParcel);
|
|
||||||
setResult(RESULT_OK, mServiceIntent);
|
|
||||||
} else {
|
|
||||||
Intent result = new Intent();
|
|
||||||
// send back the CryptoInputParcel we received
|
|
||||||
result.putExtra(RESULT_CRYPTO_INPUT, mInputParcel);
|
|
||||||
setResult(RESULT_OK, result);
|
|
||||||
}
|
|
||||||
|
|
||||||
// show finish
|
// show finish
|
||||||
vAnimator.setDisplayedChild(2);
|
vAnimator.setDisplayedChild(2);
|
||||||
|
@ -315,6 +299,13 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenNfcActivity
|
||||||
}.execute();
|
}.execute();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected void returnResult() {
|
||||||
|
Intent result = new Intent();
|
||||||
|
// send back the CryptoInputParcel we received
|
||||||
|
result.putExtra(RESULT_CRYPTO_INPUT, mInputParcel);
|
||||||
|
setResult(RESULT_OK, result);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onNfcError(String error) {
|
protected void onNfcError(String error) {
|
||||||
pauseTagHandling();
|
pauseTagHandling();
|
||||||
|
|
Loading…
Reference in a new issue