finish implementing twitter resource

4 files changed, 43 insertions, 45 deletions

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 ef76bc9d2..b8d36e0a1 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
@@ -33,7 +33,7 @@ public abstract class LinkedIdCreateFinalFragment extends Fragment {
     public static final String ARG_NONCE = "nonce";
     protected static final int REQUEST_CODE_PASSPHRASE = 0x00007008;
 
-    private LinkedIdWizard mLinkedIdWizard;
+    protected LinkedIdWizard mLinkedIdWizard;
 
     private ImageView mVerifyImage;
     private View mVerifyProgress;
@@ -113,16 +113,19 @@ public abstract class LinkedIdCreateFinalFragment extends Fragment {
         }
     }
 
-    private void proofVerify() {
+    protected void proofVerify() {
         setVerifyProgress(true, null);
 
-        final LinkedCookieResource resource = getResource();
-
         new AsyncTask<Void,Void,LinkedVerifyResult>() {
 
             @Override
             protected LinkedVerifyResult doInBackground(Void... params) {
-                return resource.verify(mLinkedIdWizard.mFingerprint, mResourceNonce);
+                LinkedCookieResource resource = getResource();
+                LinkedVerifyResult result = resource.verify(mLinkedIdWizard.mFingerprint, mResourceNonce);
+                if (result.success()) {
+                    mVerifiedResource = resource;
+                }
+                return result;
             }
 
             @Override
@@ -130,7 +133,6 @@ public abstract class LinkedIdCreateFinalFragment extends Fragment {
                 super.onPostExecute(result);
                 if (result.success()) {
                     setVerifyProgress(false, true);
-                    mVerifiedResource = resource;
                 } else {
                     setVerifyProgress(false, false);
                     // on error, show error message
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 e966fd71f..86579a132 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
@@ -75,7 +75,7 @@ public class LinkedIdCreateTwitterStep1Fragment extends Fragment {
 
                     @Override
                     protected Boolean doInBackground(Void... params) {
-                        return true; // checkHandle(handle);
+                        return true; // return checkHandle(handle);
                     }
 
                     @Override
@@ -83,21 +83,21 @@ public class LinkedIdCreateTwitterStep1Fragment extends Fragment {
                         super.onPostExecute(result);
 
                         if (result == null) {
-                            Notify.showNotify(getActivity(), "Connection error while checking username!", Notify.Style.ERROR);
+                            Notify.showNotify(getActivity(),
+                                    "Connection error while checking username!", Notify.Style.ERROR);
                             return;
                         }
 
                         if (!result) {
-                            Notify.showNotify(getActivity(), "This handle does not exist on Twitter!", Notify.Style.ERROR);
+                            Notify.showNotify(getActivity(),
+                                    "This handle does not exist on Twitter!", Notify.Style.ERROR);
                             return;
                         }
 
                         int proofNonce = RawLinkedIdentity.generateNonce();
-                        String proofText = TwitterResource.generateText(getActivity(),
-                                mLinkedIdWizard.mFingerprint, proofNonce);
 
                         LinkedIdCreateTwitterStep2Fragment frag =
-                                LinkedIdCreateTwitterStep2Fragment.newInstance(handle, proofNonce, proofText);
+                                LinkedIdCreateTwitterStep2Fragment.newInstance(handle, proofNonce);
 
                         mLinkedIdWizard.loadFragment(null, frag, LinkedIdWizard.FRAG_ACTION_TO_RIGHT);
                     }
@@ -114,7 +114,7 @@ public class LinkedIdCreateTwitterStep1Fragment extends Fragment {
         });
 
         mEditHandle = (EditText) view.findViewById(R.id.linked_create_twitter_handle);
-        mEditHandle.setText("Valodim");
+        mEditHandle.setText("v_debug");
 
         return view;
     }
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 837b84d40..e2fa6d5f6 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
@@ -45,36 +45,46 @@ public class LinkedIdCreateTwitterStep2Fragment extends Fragment {
     TextView mVerifyStatus, mEditTweetTextLen;
 
     String mResourceHandle;
-    String mResourceNonce, mResourceString;
+    int mResourceNonce;
+    String mResourceString;
     String mCookiePreview;
 
     /**
      * Creates new instance of this fragment
      */
     public static LinkedIdCreateTwitterStep2Fragment newInstance
-            (String handle, int proofNonce, String proofText) {
+            (String handle, int proofNonce) {
 
         LinkedIdCreateTwitterStep2Fragment frag = new LinkedIdCreateTwitterStep2Fragment();
 
         Bundle args = new Bundle();
         args.putString(HANDLE, handle);
         args.putInt(NONCE, proofNonce);
-        args.putString(TEXT, proofText);
         frag.setArguments(args);
 
         return frag;
     }
 
     @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mLinkedIdWizard = (LinkedIdWizard) getActivity();
+
+        mResourceHandle = getArguments().getString(HANDLE);
+        mResourceNonce = getArguments().getInt(NONCE);
+
+        mResourceString = TwitterResource.generateText(getActivity(),
+                mLinkedIdWizard.mFingerprint, mResourceNonce);
+
+    }
+
+    @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         final View view = inflater.inflate(R.layout.linked_create_twitter_fragment_step2, container, false);
 
         mCookiePreview = TwitterResource.generatePreview();
 
-        mResourceHandle = getArguments().getString(HANDLE);
-        mResourceNonce = getArguments().getString(NONCE);
-        mResourceString = getArguments().getString(TEXT);
-
         view.findViewById(R.id.next_button).setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -142,11 +152,4 @@ public class LinkedIdCreateTwitterStep2Fragment extends Fragment {
         return view;
     }
 
-    @Override
-    public void onActivityCreated(Bundle savedInstanceState) {
-        super.onActivityCreated(savedInstanceState);
-
-        mLinkedIdWizard = (LinkedIdWizard) getActivity();
-    }
-
 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep3Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep3Fragment.java
index 0c317004b..cfa8d8d23 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep3Fragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep3Fragment.java
@@ -33,6 +33,7 @@ import android.widget.TextView;
 
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.pgp.linked.LinkedCookieResource;
+import org.sufficientlysecure.keychain.pgp.linked.resources.TwitterResource;
 import org.sufficientlysecure.keychain.ui.util.Notify;
 
 import java.util.List;
@@ -45,15 +46,16 @@ public class LinkedIdCreateTwitterStep3Fragment extends LinkedIdCreateFinalFragm
 
     String mResourceHandle, mCustom, mFullString;
     String mResourceString;
+    private int mNonce;
 
     public static LinkedIdCreateTwitterStep3Fragment newInstance
-            (String handle, String proofNonce, String proofText, String customText) {
+            (String handle, int proofNonce, String proofText, String customText) {
 
         LinkedIdCreateTwitterStep3Fragment frag = new LinkedIdCreateTwitterStep3Fragment();
 
         Bundle args = new Bundle();
         args.putString(ARG_HANDLE, handle);
-        args.putString(ARG_NONCE, proofNonce);
+        args.putInt(ARG_NONCE, proofNonce);
         args.putString(ARG_TEXT, proofText);
         args.putString(ARG_CUSTOM, customText);
         frag.setArguments(args);
@@ -65,9 +67,11 @@ public class LinkedIdCreateTwitterStep3Fragment extends LinkedIdCreateFinalFragm
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        mResourceHandle = getArguments().getString(ARG_HANDLE);
-        mResourceString = getArguments().getString(ARG_TEXT);
-        mCustom = getArguments().getString(ARG_CUSTOM);
+        Bundle args = getArguments();
+        mResourceHandle = args.getString(ARG_HANDLE);
+        mResourceString = args.getString(ARG_TEXT);
+        mCustom = args.getString(ARG_CUSTOM);
+        mNonce = args.getInt(ARG_NONCE);
 
         mFullString = mCustom.isEmpty() ? mResourceString : (mCustom + " " + mResourceString);
 
@@ -94,23 +98,12 @@ public class LinkedIdCreateTwitterStep3Fragment extends LinkedIdCreateFinalFragm
             }
         });
 
-        view.findViewById(R.id.next_button).setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-
-                // AffirmationCreateHttpsStep2Fragment frag =
-                // AffirmationCreateHttpsStep2Fragment.newInstance();
-
-                // mAffirmationWizard.loadFragment(null, frag, AffirmationWizard.FRAG_ACTION_TO_RIGHT);
-            }
-        });
-
         return view;
     }
 
     @Override
     LinkedCookieResource getResource() {
-        return null;
+        return TwitterResource.searchInTwitterStream(mResourceHandle, mFullString);
     }
 
     @Override
@@ -137,7 +130,7 @@ public class LinkedIdCreateTwitterStep3Fragment extends LinkedIdCreateFinalFragm
                 PackageManager.MATCH_DEFAULT_ONLY);
 
         boolean resolved = false;
-        for(ResolveInfo resolveInfo : resolvedInfoList){
+        for(ResolveInfo resolveInfo : resolvedInfoList) {
             if(resolveInfo.activityInfo.packageName.startsWith("com.twitter.android")) {
                 tweetIntent.setClassName(
                     resolveInfo.activityInfo.packageName,