From 9c174ff71dd5cf0bfdb1ae22d41abeda25eef913 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 24 Apr 2015 19:16:15 +0200
Subject: fix encrypt activity layout

---
 .../keychain/ui/widget/EncryptKeyCompletionView.java                  | 3 +--
 OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml      | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'OpenKeychain')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
index b2dfb2493..3d2e8b9df 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EncryptKeyCompletionView.java
@@ -108,9 +108,8 @@ public class EncryptKeyCompletionView extends TokenCompleteTextView
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
 
-        mLoaderManager = ((FragmentActivity) getContext()).getSupportLoaderManager();
-
         if (getContext() instanceof FragmentActivity) {
+            mLoaderManager = ((FragmentActivity) getContext()).getSupportLoaderManager();
             mLoaderManager.initLoader(hashCode(), null, this);
         } else {
             Log.e(Constants.TAG, "EncryptKeyCompletionView must be attached to a FragmentActivity, this is " + getContext().getClass());
diff --git a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
index 51891155c..aa295050a 100644
--- a/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml
@@ -11,6 +11,8 @@
         android:id="@+id/recipient_list"
         android:layout_width="match_parent"
         android:minHeight="56dip"
+        android:paddingLeft="8dp"
+        android:paddingRight="8dp"
         android:layout_height="wrap_content" />
 
     <LinearLayout
@@ -21,7 +23,7 @@
         style="@android:style/Widget.EditText">
 
         <TextView
-            android:paddingLeft="12dp"
+            android:paddingLeft="8dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceMedium"
-- 
cgit v1.2.3