diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-22 14:27:18 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-22 14:27:18 +0200 |
commit | b2dec8542177b55a966c878e1c405ce7491651f1 (patch) | |
tree | ec98d4a479c7433a50409080ba745c927e644e6c /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui | |
parent | 2e8fb9cbddec54660f7a68f45a35f95c5b0abefc (diff) | |
download | open-keychain-b2dec8542177b55a966c878e1c405ce7491651f1.tar.gz open-keychain-b2dec8542177b55a966c878e1c405ce7491651f1.tar.bz2 open-keychain-b2dec8542177b55a966c878e1c405ce7491651f1.zip |
multi-decrypt: use indeterminate progress only
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java index 1c35a8316..422a12a2e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java @@ -42,8 +42,6 @@ import android.support.v7.widget.DefaultItemAnimator; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.text.TextUtils; -import android.view.ContextMenu; -import android.view.ContextMenu.ContextMenuInfo; import android.view.LayoutInflater; import android.view.MenuItem; import android.view.View; @@ -597,7 +595,9 @@ public class DecryptListFragment holder.vProgress.setProgress(model.mProgress); holder.vProgress.setMax(model.mMax); - holder.vProgressMsg.setText(model.mProgressMsg); + if (model.mProgressMsg != null) { + holder.vProgressMsg.setText(model.mProgressMsg); + } } private void bindItemSuccess(ViewHolder holder, final ViewModel model) { @@ -627,7 +627,6 @@ public class DecryptListFragment holder.vFilesize.setText(FileHelper.readableFileSize(size)); } - // TODO thumbnail from OpenPgpMetadata? if (model.mIcon != null) { holder.vThumbnail.setImageDrawable(model.mIcon); } else { |