Fix nullpointer with Intent API, fix clearing of encrypt file list, notify when adding a range of input uris

1 files changed, 5 insertions, 3 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java
index fecc9ef52..47645099d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java
@@ -123,9 +123,6 @@ public class EncryptTextFragment extends CryptoOperationFragment {
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.encrypt_text_fragment, container, false);
 
-        if (mMessage != null) {
-            mText.setText(mMessage);
-        }
         mText = (TextView) view.findViewById(R.id.encrypt_text_text);
         mText.addTextChangedListener(new TextWatcher() {
             @Override
@@ -144,6 +141,11 @@ public class EncryptTextFragment extends CryptoOperationFragment {
             }
         });
 
+        // set initial text
+        if (mMessage != null) {
+            mText.setText(mMessage);
+        }
+
         return view;
     }