cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix nullpointer in ViewCertActivity

Browse Source
This commit is contained in:
Vincent Breitmoser
2017-04-25 14:31:35 +02:00
parent 976708c332
commit c59a570a27
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java
View File

@@ -18,6 +18,9 @@
package org.sufficientlysecure.keychain.ui; package org.sufficientlysecure.keychain.ui;
import java.util.Date;
import android.content.Intent; import android.content.Intent;
import android.database.Cursor; import android.database.Cursor;
import android.net.Uri; import android.net.Uri;
@@ -27,7 +30,6 @@ import android.support.v4.app.NavUtils;
import android.support.v4.content.CursorLoader; import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader; import android.support.v4.content.Loader;
import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBar;
import android.text.TextUtils;
import android.text.format.DateFormat; import android.text.format.DateFormat;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@@ -45,8 +47,6 @@ import org.sufficientlysecure.keychain.ui.base.BaseActivity;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
import org.sufficientlysecure.keychain.util.Log; import org.sufficientlysecure.keychain.util.Log;
import java.util.Date;
public class ViewCertActivity extends BaseActivity public class ViewCertActivity extends BaseActivity
implements LoaderManager.LoaderCallbacks<Cursor> { implements LoaderManager.LoaderCallbacks<Cursor> {
@@ -162,14 +162,17 @@ public class ViewCertActivity extends BaseActivity
break; break;
case WrappedSignature.CERTIFICATION_REVOCATION: { case WrappedSignature.CERTIFICATION_REVOCATION: {
mType.setText(R.string.cert_revoke); mType.setText(R.string.cert_revoke);
try { if (sig.isRevocation()) {
if (! TextUtils.isEmpty(sig.getRevocationReason())) { try {
mReason.setText(sig.getRevocationReason()); String reason = sig.getRevocationReason();
} else { if (reason != null) {
mReason.setText(reason);
} else {
mReason.setText(R.string.none);
}
} catch(PgpGeneralException e) {
mReason.setText(R.string.none); mReason.setText(R.string.none);
} }
} catch (PgpGeneralException e) {
mReason.setText(R.string.none);
} }
mRowReason.setVisibility(View.VISIBLE); mRowReason.setVisibility(View.VISIBLE);
break; break;