twitter Step3 -> Step2

This commit is contained in:
Vincent Breitmoser 2015-03-12 21:07:43 +01:00
parent 4f31bbff0f
commit bebd726384
2 changed files with 5 additions and 12 deletions

View File

@ -27,8 +27,6 @@ import android.view.ViewGroup;
import android.widget.EditText; import android.widget.EditText;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.pgp.linked.RawLinkedIdentity;
import org.sufficientlysecure.keychain.pgp.linked.resources.TwitterResource;
import org.sufficientlysecure.keychain.ui.util.Notify; import org.sufficientlysecure.keychain.ui.util.Notify;
import java.io.IOException; import java.io.IOException;
@ -94,8 +92,8 @@ public class LinkedIdCreateTwitterStep1Fragment extends Fragment {
return; return;
} }
LinkedIdCreateTwitterStep3Fragment frag = LinkedIdCreateTwitterStep2Fragment frag =
LinkedIdCreateTwitterStep3Fragment.newInstance(handle); LinkedIdCreateTwitterStep2Fragment.newInstance(handle);
mLinkedIdWizard.loadFragment(null, frag, LinkedIdWizard.FRAG_ACTION_TO_RIGHT); mLinkedIdWizard.loadFragment(null, frag, LinkedIdWizard.FRAG_ACTION_TO_RIGHT);
} }

View File

@ -20,28 +20,23 @@ package org.sufficientlysecure.keychain.ui.linked;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo; import android.content.pm.ResolveInfo;
import android.graphics.PorterDuff;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.EditText; import android.widget.EditText;
import android.widget.ImageView;
import android.widget.TextView;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.pgp.linked.LinkedCookieResource; import org.sufficientlysecure.keychain.pgp.linked.LinkedCookieResource;
import org.sufficientlysecure.keychain.pgp.linked.LinkedIdentity; import org.sufficientlysecure.keychain.pgp.linked.LinkedIdentity;
import org.sufficientlysecure.keychain.pgp.linked.LinkedResource;
import org.sufficientlysecure.keychain.pgp.linked.RawLinkedIdentity; import org.sufficientlysecure.keychain.pgp.linked.RawLinkedIdentity;
import org.sufficientlysecure.keychain.pgp.linked.resources.TwitterResource; import org.sufficientlysecure.keychain.pgp.linked.resources.TwitterResource;
import org.sufficientlysecure.keychain.ui.util.Notify; import org.sufficientlysecure.keychain.ui.util.Notify;
import java.util.List; import java.util.List;
public class LinkedIdCreateTwitterStep3Fragment extends LinkedIdCreateFinalFragment { public class LinkedIdCreateTwitterStep2Fragment extends LinkedIdCreateFinalFragment {
public static final String ARG_HANDLE = "handle"; public static final String ARG_HANDLE = "handle";
@ -51,10 +46,10 @@ public class LinkedIdCreateTwitterStep3Fragment extends LinkedIdCreateFinalFragm
String mResourceString; String mResourceString;
private int mNonce; private int mNonce;
public static LinkedIdCreateTwitterStep3Fragment newInstance public static LinkedIdCreateTwitterStep2Fragment newInstance
(String handle) { (String handle) {
LinkedIdCreateTwitterStep3Fragment frag = new LinkedIdCreateTwitterStep3Fragment(); LinkedIdCreateTwitterStep2Fragment frag = new LinkedIdCreateTwitterStep2Fragment();
int proofNonce = RawLinkedIdentity.generateNonce(); int proofNonce = RawLinkedIdentity.generateNonce();