diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-04-04 19:01:03 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-04-04 19:01:03 +0200 |
commit | 8e5d0d1682bf0478b2df8e44c6d184a14cbd4ead (patch) | |
tree | 5323b777670029ed863e71dcfb793cd97b236912 | |
parent | ac3efb8b58eb919c8755d2532a97d61cfd36b5e8 (diff) | |
download | open-keychain-8e5d0d1682bf0478b2df8e44c6d184a14cbd4ead.tar.gz open-keychain-8e5d0d1682bf0478b2df8e44c6d184a14cbd4ead.tar.bz2 open-keychain-8e5d0d1682bf0478b2df8e44c6d184a14cbd4ead.zip |
Fix nullpointer with Intent API, fix clearing of encrypt file list, notify when adding a range of input uris
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java | 5 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java index f85bd707b..ddced7cce 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java @@ -390,8 +390,6 @@ public class EncryptFilesFragment extends CryptoOperationFragment { }); deleteFileDialog.show(getActivity().getSupportFragmentManager(), "deleteDialog"); - - mFilesModels.clear(); } else { if (mShareAfterEncrypt) { // Share encrypted message/file @@ -724,6 +722,7 @@ public class EncryptFilesFragment extends CryptoOperationFragment { public void addAll(ArrayList<Uri> inputUris) { if (inputUris != null) { + int startIndex = mDataset.size(); for (Uri inputUri : inputUris) { ViewModel newModel = new ViewModel(mActivity, inputUri); if (mDataset.contains(newModel)) { @@ -732,8 +731,8 @@ public class EncryptFilesFragment extends CryptoOperationFragment { mDataset.add(newModel); } } + notifyItemRangeInserted(startIndex, mDataset.size() - startIndex); } - // TODO: notifyItemInserted? } public void remove(ViewModel model) { 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; } |