diff options
| author | Sam Blackshear <sam.blackshear@gmail.com> | 2015-03-25 01:12:32 -0600 |
|---|---|---|
| committer | Sam Blackshear <sam.blackshear@gmail.com> | 2015-03-25 01:12:32 -0600 |
| commit | 9238d2542f88860deacf6af21334de2da94a845d (patch) | |
| tree | 6948c441e7a155c7f46ad38b567d93d98f4c8948 | |
| parent | 96dde0739689ce6978221d8d7876e824a947f7f9 (diff) | |
| download | connectbot-9238d2542f88860deacf6af21334de2da94a845d.tar.gz connectbot-9238d2542f88860deacf6af21334de2da94a845d.tar.bz2 connectbot-9238d2542f88860deacf6af21334de2da94a845d.zip | |
Fixing possible NPE in PubkeyListActivity
| -rw-r--r-- | src/org/connectbot/PubkeyListActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/org/connectbot/PubkeyListActivity.java b/src/org/connectbot/PubkeyListActivity.java index be7a46f..b9654a4 100644 --- a/src/org/connectbot/PubkeyListActivity.java +++ b/src/org/connectbot/PubkeyListActivity.java @@ -155,7 +155,7 @@ public class PubkeyListActivity extends ListActivity implements EventListener { getListView().setOnItemClickListener(new OnItemClickListener() { public void onItemClick(AdapterView<?> adapter, View view, int position, long id) { PubkeyBean pubkey = (PubkeyBean) getListView().getItemAtPosition(position); - boolean loaded = bound.isKeyLoaded(pubkey.getNickname()); + boolean loaded = bound != null && bound.isKeyLoaded(pubkey.getNickname()); // handle toggling key in-memory on/off if(loaded) { @@ -307,7 +307,7 @@ public class PubkeyListActivity extends ListActivity implements EventListener { // cant change password or clipboard imported keys final boolean imported = PubkeyDatabase.KEY_TYPE_IMPORTED.equals(pubkey.getType()); - final boolean loaded = bound.isKeyLoaded(pubkey.getNickname()); + final boolean loaded = bound != null && bound.isKeyLoaded(pubkey.getNickname()); MenuItem load = menu.add(loaded ? R.string.pubkey_memory_unload : R.string.pubkey_memory_load); load.setOnMenuItemClickListener(new OnMenuItemClickListener() { |