2 files changed, 13 insertions, 6 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 c36f98058..d7c7a6f2e 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
@@ -107,7 +107,7 @@ public class LinkedIdCreateTwitterStep1Fragment extends Fragment {
         });
 
         mEditHandle = (EditText) view.findViewById(R.id.linked_create_twitter_handle);
-        mEditHandle.setText("v_debug");
+        mEditHandle.setText("");
 
         return view;
     }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/HttpsPrefixedText.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/PrefixedEditText.java
index 292343eb7..3cbb114e8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/HttpsPrefixedText.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/PrefixedEditText.java
@@ -1,20 +1,27 @@
 package org.sufficientlysecure.keychain.ui.widget;
 
 import android.content.Context;
+import android.content.res.TypedArray;
 import android.graphics.*;
 import android.support.annotation.NonNull;
 import android.util.AttributeSet;
 import android.widget.EditText;
 
-/** */
-public class HttpsPrefixedText extends EditText {
+import org.sufficientlysecure.keychain.R;
 
-    private String mPrefix; // can be hardcoded for demo purposes
+public class PrefixedEditText extends EditText {
+
+    private String mPrefix;
     private Rect mPrefixRect = new Rect();
 
-	public HttpsPrefixedText(Context context, AttributeSet attrs) {
+	public PrefixedEditText(Context context, AttributeSet attrs) {
 		super(context, attrs);
-        mPrefix = "https://";
+        TypedArray style = context.getTheme().obtainStyledAttributes(
+                attrs, R.styleable.PrefixedEditText, 0, 0);
+        mPrefix = style.getString(R.styleable.PrefixedEditText_prefix);
+        if (mPrefix == null) {
+            mPrefix = "";
+        }
 	}
 
     @Override