From 91ab7e4d65c90ce489cc40810bc266c8e0bbc644 Mon Sep 17 00:00:00 2001 From: Sam Blackshear Date: Fri, 20 Mar 2015 18:04:32 -0600 Subject: Fix possible NPE in HostListActivity.onCreateContextMenu --- src/org/connectbot/HostListActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/org/connectbot/HostListActivity.java b/src/org/connectbot/HostListActivity.java index 648b705..dc39d49 100644 --- a/src/org/connectbot/HostListActivity.java +++ b/src/org/connectbot/HostListActivity.java @@ -333,7 +333,9 @@ public class HostListActivity extends ListActivity { // edit, disconnect, delete MenuItem connect = menu.add(R.string.list_host_disconnect); - final TerminalBridge bridge = bound.getConnectedBridge(host); + TerminalBridge bridge = null; + if (bound != null) + bridge = bound.getConnectedBridge(host); connect.setEnabled((bridge != null)); connect.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(MenuItem item) { -- cgit v1.2.3 From 9238d2542f88860deacf6af21334de2da94a845d Mon Sep 17 00:00:00 2001 From: Sam Blackshear Date: Wed, 25 Mar 2015 01:12:32 -0600 Subject: Fixing possible NPE in PubkeyListActivity --- src/org/connectbot/PubkeyListActivity.java | 4 ++-- 1 file 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() { -- cgit v1.2.3 From 8fda6363bd601ae280052a7bcb5db865edc88138 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Sat, 28 Mar 2015 18:25:14 -0700 Subject: Fix indentation in last pull request Change-Id: Ib80ec5184ae7b329979580fd0a0c187f8ac01fbf --- src/org/connectbot/HostListActivity.java | 7 ++++--- src/org/connectbot/PubkeyListActivity.java | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/org/connectbot/HostListActivity.java b/src/org/connectbot/HostListActivity.java index 7dce760..9cc64f2 100644 --- a/src/org/connectbot/HostListActivity.java +++ b/src/org/connectbot/HostListActivity.java @@ -346,9 +346,10 @@ public class HostListActivity extends ListActivity { // edit, disconnect, delete MenuItem connect = menu.add(R.string.list_host_disconnect); TerminalBridge bridge = null; - if (bound != null) - bridge = bound.getConnectedBridge(host); - connect.setEnabled((bridge != null)); + if (bound != null) { + bridge = bound.getConnectedBridge(host); + } + connect.setEnabled(bridge != null); connect.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(MenuItem item) { bridge.dispatchDisconnect(true); diff --git a/src/org/connectbot/PubkeyListActivity.java b/src/org/connectbot/PubkeyListActivity.java index b9654a4..ec9914f 100644 --- a/src/org/connectbot/PubkeyListActivity.java +++ b/src/org/connectbot/PubkeyListActivity.java @@ -283,7 +283,7 @@ public class PubkeyListActivity extends ListActivity implements EventListener { } if (pair == null) { - return; + return; } Log.d(TAG, String.format("Unlocked key '%s'", keybean.getNickname())); -- cgit v1.2.3