moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-17 07:30:14 -05:00
Code Issues Releases Wiki Activity

fix display of signed-only content

Browse Source
This commit is contained in:
Vincent Breitmoser 2015-06-20 21:34:21 +02:00
parent 752204d3cc
commit 0be790dcad
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptListFragment.java
View File

@ -19,7 +19,6 @@ package org.sufficientlysecure.keychain.ui;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -592,14 +591,18 @@ public class DecryptListFragment
OpenPgpMetadata metadata = model.mResult.getDecryptMetadata(); OpenPgpMetadata metadata = model.mResult.getDecryptMetadata();
String filename = metadata.getFilename(); String filename;
if (TextUtils.isEmpty(filename)) { if (metadata == null) {
filename = mContext.getString(R.string.filename_unknown);
} else if (TextUtils.isEmpty(metadata.getFilename())) {
filename = mContext.getString("text/plain".equals(metadata.getMimeType()) filename = mContext.getString("text/plain".equals(metadata.getMimeType())
? R.string.filename_unknown_text : R.string.filename_unknown); ? R.string.filename_unknown_text : R.string.filename_unknown);
} else {
filename = metadata.getFilename();
} }
holder.vFilename.setText(filename); holder.vFilename.setText(filename);
long size = metadata.getOriginalSize(); long size = metadata == null ? 0 : metadata.getOriginalSize();
if (size == -1 || size == 0) { if (size == -1 || size == 0) {
holder.vFilesize.setText(""); holder.vFilesize.setText("");
} else { } else {