From a9a5551d95d964b5037fb2e5308081618a33b802 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Fri, 13 Mar 2015 01:55:31 +0100 Subject: remove notiion of nonce/identifier --- .../keychain/ui/linked/LinkedIdCreateFinalFragment.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateFinalFragment.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateFinalFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateFinalFragment.java index 07f47c31f..7be967907 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateFinalFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateFinalFragment.java @@ -30,7 +30,6 @@ import org.sufficientlysecure.keychain.ui.util.Notify; public abstract class LinkedIdCreateFinalFragment extends Fragment { - public static final String ARG_NONCE = "nonce"; protected static final int REQUEST_CODE_PASSPHRASE = 0x00007008; protected LinkedIdWizard mLinkedIdWizard; @@ -38,7 +37,6 @@ public abstract class LinkedIdCreateFinalFragment extends Fragment { private ImageView mVerifyImage; private View mVerifyProgress; private TextView mVerifyStatus; - private int mResourceNonce; // This is a resource, set AFTER it has been verified LinkedCookieResource mVerifiedResource = null; @@ -48,8 +46,6 @@ public abstract class LinkedIdCreateFinalFragment extends Fragment { super.onCreate(savedInstanceState); mLinkedIdWizard = (LinkedIdWizard) getActivity(); - - mResourceNonce = getArguments().getInt(ARG_NONCE); } protected abstract View newView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState); @@ -121,7 +117,7 @@ public abstract class LinkedIdCreateFinalFragment extends Fragment { @Override protected LinkedVerifyResult doInBackground(Void... params) { LinkedCookieResource resource = getResource(); - LinkedVerifyResult result = resource.verify(mLinkedIdWizard.mFingerprint, mResourceNonce); + LinkedVerifyResult result = resource.verify(mLinkedIdWizard.mFingerprint); if (result.success()) { mVerifiedResource = resource; } @@ -195,7 +191,7 @@ public abstract class LinkedIdCreateFinalFragment extends Fragment { new SaveKeyringParcel(mLinkedIdWizard.mMasterKeyId, mLinkedIdWizard.mFingerprint); WrappedUserAttribute ua = - LinkedIdentity.fromResource(mVerifiedResource, mResourceNonce).toUserAttribute(); + LinkedIdentity.fromResource(mVerifiedResource).toUserAttribute(); skp.mAddUserAttribute.add(ua); -- cgit v1.2.3