diff options
| author | Kenny Root <kenny@the-b.org> | 2015-03-29 02:22:46 +0100 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-03-29 02:22:46 +0100 |
| commit | 9b8679679d407926694d776e4ea13fd8b928edcf (patch) | |
| tree | 5893fca357115f6a593ed43723f2d89895796c62 /src | |
| parent | 358dddf622253b6dad0efbb93fe2f0dc1f113f84 (diff) | |
| parent | 9238d2542f88860deacf6af21334de2da94a845d (diff) | |
| download | connectbot-9b8679679d407926694d776e4ea13fd8b928edcf.tar.gz connectbot-9b8679679d407926694d776e4ea13fd8b928edcf.tar.bz2 connectbot-9b8679679d407926694d776e4ea13fd8b928edcf.zip | |
Merge pull request #61 from sblackshear/pubkeylist_npe_fix
Fixing possible NPE in PubkeyListActivity
Diffstat (limited to 'src')
| -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() { |