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 --- .../operations/results/OperationResult.java | 2 -- .../keychain/pgp/WrappedUserAttribute.java | 5 +++-- .../keychain/pgp/linked/LinkedCookieResource.java | 26 +++++----------------- .../keychain/pgp/linked/LinkedIdentity.java | 20 +++++++---------- .../keychain/pgp/linked/LinkedResource.java | 4 +--- .../keychain/pgp/linked/RawLinkedIdentity.java | 25 ++------------------- .../keychain/pgp/linked/resources/DnsResource.java | 6 ++--- .../pgp/linked/resources/GenericHttpsResource.java | 4 ++-- .../pgp/linked/resources/TwitterResource.java | 5 ----- .../keychain/provider/KeychainProvider.java | 4 +++- .../ui/linked/LinkedIdCreateDnsStep1Fragment.java | 5 ++--- .../ui/linked/LinkedIdCreateDnsStep2Fragment.java | 3 +-- .../ui/linked/LinkedIdCreateFinalFragment.java | 8 ++----- .../linked/LinkedIdCreateHttpsStep1Fragment.java | 8 ++----- .../linked/LinkedIdCreateHttpsStep2Fragment.java | 3 +-- .../linked/LinkedIdCreateTwitterStep2Fragment.java | 9 +------- .../keychain/ui/linked/LinkedIdViewFragment.java | 4 +--- 17 files changed, 38 insertions(+), 103 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java index 7999af667..fba52c4ad 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java @@ -770,8 +770,6 @@ public abstract class OperationResult implements Parcelable { MSG_LV_MATCH_ERROR (LogLevel.ERROR, R.string.msg_lv_match_error), MSG_LV_FP_OK (LogLevel.DEBUG, R.string.msg_lv_fp_ok), MSG_LV_FP_ERROR (LogLevel.ERROR, R.string.msg_lv_fp_error), - MSG_LV_NONCE_OK (LogLevel.OK, R.string.msg_lv_nonce_ok), - MSG_LV_NONCE_ERROR (LogLevel.ERROR, R.string.msg_lv_nonce_error), MSG_LV_FETCH (LogLevel.DEBUG, R.string.msg_lv_fetch), MSG_LV_FETCH_REDIR (LogLevel.DEBUG, R.string.msg_lv_fetch_redir), diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java index 49e4d9793..2431cb743 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/WrappedUserAttribute.java @@ -41,7 +41,7 @@ public class WrappedUserAttribute implements Serializable { public static final int UAT_NONE = 0; public static final int UAT_IMAGE = UserAttributeSubpacketTags.IMAGE_ATTRIBUTE; - public static final int UAT_LINKED_ID = 100; + public static final int UAT_LINKED_ID = 101; private PGPUserAttributeSubpacketVector mVector; @@ -82,7 +82,7 @@ public class WrappedUserAttribute implements Serializable { public static WrappedUserAttribute fromData (byte[] data) throws IOException { UserAttributeSubpacketInputStream in = new UserAttributeSubpacketInputStream(new ByteArrayInputStream(data)); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); while (in.available() > 0) { list.add(in.readPacket()); } @@ -126,6 +126,7 @@ public class WrappedUserAttribute implements Serializable { private void readObjectNoData() throws ObjectStreamException { } + @SuppressWarnings("SimplifiableIfStatement") @Override public boolean equals(Object o) { if (!WrappedUserAttribute.class.isInstance(o)) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedCookieResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedCookieResource.java index c92624f65..21a8c8f98 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedCookieResource.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedCookieResource.java @@ -61,16 +61,16 @@ public abstract class LinkedCookieResource extends LinkedResource { return mSubUri; } - public static String generate (Context context, byte[] fingerprint, int nonce) { - return String.format("[Verifying my PGP key: openpgp4fpr:%s#%08x]", - KeyFormattingUtils.convertFingerprintToHex(fingerprint), nonce); + public static String generate (Context context, byte[] fingerprint) { + return String.format("[Verifying my PGP key: openpgp4fpr:%s]", + KeyFormattingUtils.convertFingerprintToHex(fingerprint)); } public static String generatePreview () { return "[Verifying my PGP key: openpgp4fpr:0x…]"; } - public LinkedVerifyResult verify(byte[] fingerprint, int nonce) { + public LinkedVerifyResult verify(byte[] fingerprint) { OperationLog log = new OperationLog(); log.add(LogType.MSG_LV, 0); @@ -84,7 +84,7 @@ public abstract class LinkedCookieResource extends LinkedResource { Log.d(Constants.TAG, "Resource data: '" + res + "'"); - return verifyString(log, 1, res, nonce, fingerprint); + return verifyString(log, 1, res, fingerprint); } @@ -96,7 +96,7 @@ public abstract class LinkedCookieResource extends LinkedResource { protected LinkedVerifyResult verifyString (OperationLog log, int indent, String res, - int nonce, byte[] fingerprint) { + byte[] fingerprint) { log.add(LogType.MSG_LV_MATCH, indent); Matcher match = matchResource(log, indent+1, res); @@ -106,27 +106,13 @@ public abstract class LinkedCookieResource extends LinkedResource { } String candidateFp = match.group(1).toLowerCase(); - try { - int nonceCandidate = (int) Long.parseLong(match.group(2).toLowerCase(), 16); - - if (nonce != nonceCandidate) { - log.add(LogType.MSG_LV_NONCE_ERROR, indent); - return new LinkedVerifyResult(LinkedVerifyResult.RESULT_ERROR, log); - } - } catch (NumberFormatException e) { - log.add(LogType.MSG_LV_NONCE_ERROR, indent); - return new LinkedVerifyResult(LinkedVerifyResult.RESULT_ERROR, log); - } - String fp = KeyFormattingUtils.convertFingerprintToHex(fingerprint); - if (!fp.equals(candidateFp)) { log.add(LogType.MSG_LV_FP_ERROR, indent); return new LinkedVerifyResult(LinkedVerifyResult.RESULT_ERROR, log); } log.add(LogType.MSG_LV_FP_OK, indent); - log.add(LogType.MSG_LV_NONCE_OK, indent); return new LinkedVerifyResult(LinkedVerifyResult.RESULT_OK, log); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedIdentity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedIdentity.java index d529a2a36..ed3031b84 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedIdentity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedIdentity.java @@ -8,8 +8,6 @@ import org.sufficientlysecure.keychain.util.Log; import java.io.IOException; import java.net.URI; -import java.nio.ByteBuffer; -import java.util.Arrays; import android.content.Context; import android.support.annotation.DrawableRes; @@ -19,8 +17,8 @@ public class LinkedIdentity extends RawLinkedIdentity { public final LinkedResource mResource; - protected LinkedIdentity(int nonce, URI uri, LinkedResource resource) { - super(nonce, uri); + protected LinkedIdentity(URI uri, LinkedResource resource) { + super(uri); if (resource == null) { throw new AssertionError("resource must not be null in a LinkedIdentity!"); } @@ -42,29 +40,27 @@ public class LinkedIdentity extends RawLinkedIdentity { * subpacket can not be parsed as a valid linked id. */ static RawLinkedIdentity fromAttributeSubpacket(UserAttributeSubpacket subpacket) { - if (subpacket.getType() != 100) { + if (subpacket.getType() != 101) { return null; } byte[] data = subpacket.getData(); return fromSubpacketData(data); - } static RawLinkedIdentity fromSubpacketData(byte[] data) { try { - int nonce = ByteBuffer.wrap(data).getInt(); - String uriStr = Strings.fromUTF8ByteArray(Arrays.copyOfRange(data, 4, data.length)); + String uriStr = Strings.fromUTF8ByteArray(data); URI uri = URI.create(uriStr); LinkedResource res = LinkedResource.fromUri(uri); if (res == null) { - return new RawLinkedIdentity(nonce, uri); + return new RawLinkedIdentity(uri); } - return new LinkedIdentity(nonce, uri, res); + return new LinkedIdentity(uri, res); } catch (IllegalArgumentException e) { Log.e(Constants.TAG, "error parsing uri in (suspected) linked id packet"); @@ -72,8 +68,8 @@ public class LinkedIdentity extends RawLinkedIdentity { } } - public static RawLinkedIdentity fromResource (LinkedCookieResource res, int nonce) { - return new RawLinkedIdentity(nonce, res.toUri()); + public static RawLinkedIdentity fromResource (LinkedCookieResource res) { + return new RawLinkedIdentity(res.toUri()); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java index 095fd4ac7..e954a514c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/LinkedResource.java @@ -23,7 +23,7 @@ public abstract class LinkedResource { protected final HashMap mParams; static Pattern magicPattern = - Pattern.compile("\\[Verifying my PGP key: openpgp4fpr:([a-zA-Z0-9]+)#([a-zA-Z0-9]+)\\]"); + Pattern.compile("\\[Verifying my PGP key: openpgp4fpr:([a-zA-Z0-9]+)]"); protected LinkedResource(Set flags, HashMap params, URI uri) { mFlags = flags; @@ -31,8 +31,6 @@ public abstract class LinkedResource { mSubUri = uri; } - public abstract URI toUri(); - public Set getFlags () { return new HashSet<>(mFlags); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/RawLinkedIdentity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/RawLinkedIdentity.java index 8f0467734..b3acc6790 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/RawLinkedIdentity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/RawLinkedIdentity.java @@ -5,48 +5,27 @@ import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.WrappedUserAttribute; import java.net.URI; -import java.nio.ByteBuffer; import android.content.Context; -import android.content.Intent; import android.support.annotation.DrawableRes; /** The RawLinkedIdentity contains raw parsed data from a Linked Identity subpacket. */ public class RawLinkedIdentity { - public final int mNonce; public final URI mUri; - protected RawLinkedIdentity(int nonce, URI uri) { - mNonce = nonce; + protected RawLinkedIdentity(URI uri) { mUri = uri; } public byte[] getEncoded() { - byte[] uriData = Strings.toUTF8ByteArray(mUri.toASCIIString()); - - ByteBuffer buf = ByteBuffer.allocate(4 + uriData.length); - - buf.putInt(mNonce); - buf.put(uriData); - - return buf.array(); + return Strings.toUTF8ByteArray(mUri.toASCIIString()); } public WrappedUserAttribute toUserAttribute () { return WrappedUserAttribute.fromSubpacket(WrappedUserAttribute.UAT_LINKED_ID, getEncoded()); } - public static int generateNonce() { - // TODO make this actually random - // byte[] data = new byte[4]; - // new SecureRandom().nextBytes(data); - // return Hex.toHexString(data); - - // debug for now - return 0x8a9bad32; - } - public @DrawableRes int getDisplayIcon() { return R.drawable.ic_warning_grey_24dp; } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java index cd0706ff3..253e611a8 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/DnsResource.java @@ -41,10 +41,10 @@ public class DnsResource extends LinkedCookieResource { mType = type; } - public static String generateText (Context context, byte[] fingerprint, int nonce) { + public static String generateText (Context context, byte[] fingerprint) { - return String.format("pgpid+cookie=%s;%08x", - KeyFormattingUtils.convertFingerprintToHex(fingerprint), nonce); + return String.format("pgpid+cookie=%s", + KeyFormattingUtils.convertFingerprintToHex(fingerprint)); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/GenericHttpsResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/GenericHttpsResource.java index eebe0b5ec..1e872c6cb 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/GenericHttpsResource.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/GenericHttpsResource.java @@ -31,8 +31,8 @@ public class GenericHttpsResource extends LinkedCookieResource { super(flags, params, uri); } - public static String generateText (Context context, byte[] fingerprint, int nonce) { - String cookie = LinkedCookieResource.generate(context, fingerprint, nonce); + public static String generateText (Context context, byte[] fingerprint) { + String cookie = LinkedCookieResource.generate(context, fingerprint); return String.format(context.getResources().getString(R.string.linked_id_generic_text), cookie, "0x" + KeyFormattingUtils.convertFingerprintToHex(fingerprint).substring(24)); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/TwitterResource.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/TwitterResource.java index dc68be7f5..32bf92a99 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/TwitterResource.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/linked/resources/TwitterResource.java @@ -72,11 +72,6 @@ public class TwitterResource extends LinkedCookieResource { } - public static String generateText (Context context, byte[] fingerprint, int nonce) { - // nothing special here for now, might change this later - return LinkedCookieResource.generate(context, fingerprint, nonce); - } - @Override protected String fetchResource(OperationLog log, int indent) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java index 19634bed8..4a84397a4 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java @@ -31,6 +31,7 @@ import android.net.Uri; import android.text.TextUtils; import org.sufficientlysecure.keychain.Constants; +import org.sufficientlysecure.keychain.pgp.WrappedUserAttribute; import org.sufficientlysecure.keychain.provider.KeychainContract.ApiAccounts; import org.sufficientlysecure.keychain.provider.KeychainContract.ApiAllowedKeys; import org.sufficientlysecure.keychain.provider.KeychainContract.ApiApps; @@ -508,7 +509,8 @@ public class KeychainProvider extends ContentProvider { + ", " + Tables.USER_PACKETS + "." + UserPackets.RANK; if (match == KEY_RING_LINKED_IDS) { - qb.appendWhere(Tables.USER_PACKETS + "." + UserPackets.TYPE + " = 100"); + qb.appendWhere(Tables.USER_PACKETS + "." + UserPackets.TYPE + " = " + + WrappedUserAttribute.UAT_LINKED_ID); } else { qb.appendWhere(Tables.USER_PACKETS + "." + UserPackets.TYPE + " IS NULL"); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep1Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep1Fragment.java index 26b0a0539..6b3eef26a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep1Fragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep1Fragment.java @@ -73,12 +73,11 @@ public class LinkedIdCreateDnsStep1Fragment extends Fragment { return; } - int proofNonce = RawLinkedIdentity.generateNonce(); String proofText = DnsResource.generateText(getActivity(), - mLinkedIdWizard.mFingerprint, proofNonce); + mLinkedIdWizard.mFingerprint); LinkedIdCreateDnsStep2Fragment frag = - LinkedIdCreateDnsStep2Fragment.newInstance(uri, proofNonce, proofText); + LinkedIdCreateDnsStep2Fragment.newInstance(uri, proofText); mLinkedIdWizard.loadFragment(null, frag, LinkedIdWizard.FRAG_ACTION_TO_RIGHT); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep2Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep2Fragment.java index de3a63256..8715c0a2e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep2Fragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateDnsStep2Fragment.java @@ -52,12 +52,11 @@ public class LinkedIdCreateDnsStep2Fragment extends LinkedIdCreateFinalFragment String mResourceString; public static LinkedIdCreateDnsStep2Fragment newInstance - (String uri, int proofNonce, String proofText) { + (String uri, String proofText) { LinkedIdCreateDnsStep2Fragment frag = new LinkedIdCreateDnsStep2Fragment(); Bundle args = new Bundle(); - args.putInt(ARG_NONCE, proofNonce); args.putString(DOMAIN, uri); args.putString(TEXT, proofText); frag.setArguments(args); 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); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep1Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep1Fragment.java index 78ca4cfe9..72669142b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep1Fragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep1Fragment.java @@ -38,9 +38,6 @@ public class LinkedIdCreateHttpsStep1Fragment extends Fragment { EditText mEditUri; - /** - * Creates new instance of this fragment - */ public static LinkedIdCreateHttpsStep1Fragment newInstance() { LinkedIdCreateHttpsStep1Fragment frag = new LinkedIdCreateHttpsStep1Fragment(); @@ -72,12 +69,11 @@ public class LinkedIdCreateHttpsStep1Fragment extends Fragment { return; } - int proofNonce = RawLinkedIdentity.generateNonce(); String proofText = GenericHttpsResource.generateText(getActivity(), - mLinkedIdWizard.mFingerprint, proofNonce); + mLinkedIdWizard.mFingerprint); LinkedIdCreateHttpsStep2Fragment frag = - LinkedIdCreateHttpsStep2Fragment.newInstance(uri, proofNonce, proofText); + LinkedIdCreateHttpsStep2Fragment.newInstance(uri, proofText); mLinkedIdWizard.loadFragment(null, frag, LinkedIdWizard.FRAG_ACTION_TO_RIGHT); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep2Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep2Fragment.java index adae7eaf5..55ac6e075 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep2Fragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateHttpsStep2Fragment.java @@ -53,12 +53,11 @@ public class LinkedIdCreateHttpsStep2Fragment extends LinkedIdCreateFinalFragmen String mResourceString; public static LinkedIdCreateHttpsStep2Fragment newInstance - (String uri, int proofNonce, String proofText) { + (String uri, String proofText) { LinkedIdCreateHttpsStep2Fragment frag = new LinkedIdCreateHttpsStep2Fragment(); Bundle args = new Bundle(); - args.putInt(ARG_NONCE, proofNonce); args.putString(ARG_URI, uri); args.putString(ARG_TEXT, proofText); frag.setArguments(args); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep2Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep2Fragment.java index 262277700..fa0b2911c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep2Fragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep2Fragment.java @@ -29,8 +29,6 @@ import android.widget.EditText; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.linked.LinkedCookieResource; -import org.sufficientlysecure.keychain.pgp.linked.LinkedIdentity; -import org.sufficientlysecure.keychain.pgp.linked.RawLinkedIdentity; import org.sufficientlysecure.keychain.pgp.linked.resources.TwitterResource; import org.sufficientlysecure.keychain.ui.util.Notify; @@ -44,18 +42,14 @@ public class LinkedIdCreateTwitterStep2Fragment extends LinkedIdCreateFinalFragm String mResourceHandle; String mResourceString; - private int mNonce; public static LinkedIdCreateTwitterStep2Fragment newInstance (String handle) { LinkedIdCreateTwitterStep2Fragment frag = new LinkedIdCreateTwitterStep2Fragment(); - int proofNonce = RawLinkedIdentity.generateNonce(); - Bundle args = new Bundle(); args.putString(ARG_HANDLE, handle); - args.putInt(ARG_NONCE, proofNonce); frag.setArguments(args); return frag; @@ -65,9 +59,8 @@ public class LinkedIdCreateTwitterStep2Fragment extends LinkedIdCreateFinalFragm public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - mNonce = LinkedIdentity.generateNonce(); mResourceString = - TwitterResource.generate(getActivity(), mLinkedIdWizard.mFingerprint, mNonce); + TwitterResource.generate(getActivity(), mLinkedIdWizard.mFingerprint); mResourceHandle = getArguments().getString(ARG_HANDLE); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java index 742459ff8..98adb5889 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.util.Arrays; import android.app.Activity; -import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; import android.database.Cursor; @@ -24,7 +23,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; -import android.widget.ImageView; import android.widget.TextView; import android.widget.ViewAnimator; @@ -419,7 +417,7 @@ public class LinkedIdViewFragment extends Fragment implements @Override protected LinkedVerifyResult doInBackground(Void... params) { long timer = System.currentTimeMillis(); - LinkedVerifyResult result = mLinkedResource.verify(mFingerprint, mLinkedId.mNonce); + LinkedVerifyResult result = mLinkedResource.verify(mFingerprint); // ux flow: this operation should take at last a second timer = System.currentTimeMillis() -timer; -- cgit v1.2.3