From 1b9aea13c675db54e0a450d46608b47a3db4058f Mon Sep 17 00:00:00 2001 From: "Chris J. Karr" Date: Mon, 12 Jun 2017 09:55:29 -0500 Subject: [PATCH] Fixes NPE when data disclosure detail called from emulator --- .../activities/DataDisclosureDetailActivity.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/com/audacious_software/passive_data_kit/activities/DataDisclosureDetailActivity.java b/src/com/audacious_software/passive_data_kit/activities/DataDisclosureDetailActivity.java index 138a474..a090f5d 100755 --- a/src/com/audacious_software/passive_data_kit/activities/DataDisclosureDetailActivity.java +++ b/src/com/audacious_software/passive_data_kit/activities/DataDisclosureDetailActivity.java @@ -39,6 +39,14 @@ public static class Action { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + String generatorClassName = this.getIntent().getStringExtra(DataDisclosureDetailActivity.GENERATOR_CLASS_NAME); + + if (generatorClassName == null) { + this.finish(); + + return; + } + final DataDisclosureDetailActivity me = this; this.setContentView(R.layout.layout_data_disclosure_detail_pdk); @@ -46,7 +54,7 @@ protected void onCreate(Bundle savedInstanceState) { this.getSupportActionBar().setDisplayHomeAsUpEnabled(true); try { - this.mGeneratorClass = (Class) Class.forName(this.getIntent().getStringExtra(DataDisclosureDetailActivity.GENERATOR_CLASS_NAME)); + this.mGeneratorClass = (Class) Class.forName(generatorClassName); } catch (ClassNotFoundException e) { // e.printStackTrace(); }