diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-12 21:07:43 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-12 21:07:43 +0100 |
commit | bebd72638460a2c6b27a9fb518326851d6019f23 (patch) | |
tree | a18e2b894be9f783f2b669fcd6b55b6aca1be6c9 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain | |
parent | 4f31bbff0fec6e0ab2122cc0a85ba499e1610e6a (diff) | |
download | open-keychain-bebd72638460a2c6b27a9fb518326851d6019f23.tar.gz open-keychain-bebd72638460a2c6b27a9fb518326851d6019f23.tar.bz2 open-keychain-bebd72638460a2c6b27a9fb518326851d6019f23.zip |
twitter Step3 -> Step2
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep1Fragment.java | 6 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep2Fragment.java (renamed from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep3Fragment.java) | 11 |
2 files changed, 5 insertions, 12 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep1Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep1Fragment.java index 06ca32e2e..081b949d5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep1Fragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep1Fragment.java @@ -27,8 +27,6 @@ import android.view.ViewGroup; import android.widget.EditText; 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 java.io.IOException; @@ -94,8 +92,8 @@ public class LinkedIdCreateTwitterStep1Fragment extends Fragment { return; } - LinkedIdCreateTwitterStep3Fragment frag = - LinkedIdCreateTwitterStep3Fragment.newInstance(handle); + LinkedIdCreateTwitterStep2Fragment frag = + LinkedIdCreateTwitterStep2Fragment.newInstance(handle); mLinkedIdWizard.loadFragment(null, frag, LinkedIdWizard.FRAG_ACTION_TO_RIGHT); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep3Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep2Fragment.java index ce0526efc..1074a8e61 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep3Fragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep2Fragment.java @@ -20,28 +20,23 @@ package org.sufficientlysecure.keychain.ui.linked; import android.content.Intent; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; -import android.graphics.PorterDuff; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.EditText; -import android.widget.ImageView; -import android.widget.TextView; 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.LinkedResource; import org.sufficientlysecure.keychain.pgp.linked.RawLinkedIdentity; import org.sufficientlysecure.keychain.pgp.linked.resources.TwitterResource; import org.sufficientlysecure.keychain.ui.util.Notify; import java.util.List; -public class LinkedIdCreateTwitterStep3Fragment extends LinkedIdCreateFinalFragment { +public class LinkedIdCreateTwitterStep2Fragment extends LinkedIdCreateFinalFragment { public static final String ARG_HANDLE = "handle"; @@ -51,10 +46,10 @@ public class LinkedIdCreateTwitterStep3Fragment extends LinkedIdCreateFinalFragm String mResourceString; private int mNonce; - public static LinkedIdCreateTwitterStep3Fragment newInstance + public static LinkedIdCreateTwitterStep2Fragment newInstance (String handle) { - LinkedIdCreateTwitterStep3Fragment frag = new LinkedIdCreateTwitterStep3Fragment(); + LinkedIdCreateTwitterStep2Fragment frag = new LinkedIdCreateTwitterStep2Fragment(); int proofNonce = RawLinkedIdentity.generateNonce(); |