From 6c153b15430c00b5213062be4bb5830d52f2589a Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 16 Jan 2015 15:59:26 +0100
Subject: linked id ui work dns/twitter

---
 .../ui/linked/LinkedIdCreateDnsStep2Fragment.java         |  6 +++---
 .../ui/linked/LinkedIdCreateTwitterStep2Fragment.java     | 15 +++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked')

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 ff8d03dd4..1106a4a48 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
@@ -65,7 +65,7 @@ public class LinkedIdCreateDnsStep2Fragment extends Fragment {
 
     LinkedIdWizard mLinkedIdWizard;
 
-    EditText mEditUri;
+    TextView mTextView;
     ImageView mVerifyImage;
     View mVerifyProgress;
     TextView mVerifyStatus;
@@ -140,8 +140,8 @@ public class LinkedIdCreateDnsStep2Fragment extends Fragment {
             }
         });
 
-        mEditUri = (EditText) view.findViewById(R.id.linked_create_dns_text);
-        mEditUri.setText(mResourceString);
+        mTextView = (TextView) view.findViewById(R.id.linked_create_dns_text);
+        mTextView.setText(mResourceString);
 
         setVerifyProgress(false, null);
         mVerifyStatus.setText(R.string.linked_verify_pending);
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 c02a76669..ab56e7a5d 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
@@ -31,11 +31,10 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import org.sufficientlysecure.keychain.R;
+import org.sufficientlysecure.keychain.pgp.linked.resources.TwitterResource;
 
 public class LinkedIdCreateTwitterStep2Fragment extends Fragment {
 
-    private static final int REQUEST_CODE_OUTPUT = 0x00007007;
-
     public static final String HANDLE = "uri", NONCE = "nonce", TEXT = "text";
 
     LinkedIdWizard mLinkedIdWizard;
@@ -47,6 +46,7 @@ public class LinkedIdCreateTwitterStep2Fragment extends Fragment {
 
     String mResourceHandle;
     String mResourceNonce, mResourceString;
+    String mCookiePreview;
 
     /**
      * Creates new instance of this fragment
@@ -69,6 +69,8 @@ public class LinkedIdCreateTwitterStep2Fragment extends Fragment {
     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);
@@ -98,7 +100,7 @@ public class LinkedIdCreateTwitterStep2Fragment extends Fragment {
         mVerifyStatus = (TextView) view.findViewById(R.id.verify_status);
 
         mEditTweetPreview = (EditText) view.findViewById(R.id.linked_create_twitter_preview);
-        mEditTweetPreview.setText(mResourceString);
+        mEditTweetPreview.setText(mCookiePreview);
 
         mEditTweetCustom = (EditText) view.findViewById(R.id.linked_create_twitter_custom);
         mEditTweetCustom.setFilters(new InputFilter[] {
@@ -120,17 +122,18 @@ public class LinkedIdCreateTwitterStep2Fragment extends Fragment {
             @Override
             public void afterTextChanged(Editable editable) {
                 if (editable != null && editable.length() > 0) {
-                    String str = editable + " " + mResourceString;
+                    String str = editable + " " + mCookiePreview;
                     mEditTweetPreview.setText(str);
 
-                    mEditTweetTextLen.setText(str.length() + "/140");
+                    mEditTweetTextLen.setText(
+                            (editable.length() + mResourceString.length() + 1) + "/140");
                     mEditTweetTextLen.setTextColor(getResources().getColor(str.length() == 140
                             ? R.color.android_red_dark
                             : R.color.primary_dark_material_light));
 
 
                 } else {
-                    mEditTweetPreview.setText(mResourceString);
+                    mEditTweetPreview.setText(mCookiePreview);
                     mEditTweetTextLen.setText(mResourceString.length() + "/140");
                 }
             }
-- 
cgit v1.2.3