diff options
| author | Kenny Root <kenny@the-b.org> | 2015-03-28 18:25:37 -0700 |
|---|---|---|
| committer | Kenny Root <kenny@the-b.org> | 2015-03-28 18:25:37 -0700 |
| commit | d472ddde2f9a40abe53c0757a4e8ced6e166afdb (patch) | |
| tree | 9cba6590d0b8f393289d5d8f63ac180dfc29c6ec /app | |
| parent | e018ad68ef2b79cd69ae02468a67b3c6f284a139 (diff) | |
| parent | 8fda6363bd601ae280052a7bcb5db865edc88138 (diff) | |
| download | connectbot-d472ddde2f9a40abe53c0757a4e8ced6e166afdb.tar.gz connectbot-d472ddde2f9a40abe53c0757a4e8ced6e166afdb.tar.bz2 connectbot-d472ddde2f9a40abe53c0757a4e8ced6e166afdb.zip | |
Merge branch 'master' into gradle-conversion
Diffstat (limited to 'app')
| -rw-r--r-- | app/src/main/java/org/connectbot/HostListActivity.java | 7 | ||||
| -rw-r--r-- | app/src/main/java/org/connectbot/PubkeyListActivity.java | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java index 33bee52..331447a 100644 --- a/app/src/main/java/org/connectbot/HostListActivity.java +++ b/app/src/main/java/org/connectbot/HostListActivity.java @@ -345,8 +345,11 @@ public class HostListActivity extends ListActivity { // edit, disconnect, delete MenuItem connect = menu.add(R.string.list_host_disconnect); - final TerminalBridge bridge = bound.getConnectedBridge(host); - connect.setEnabled((bridge != null)); + TerminalBridge 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/app/src/main/java/org/connectbot/PubkeyListActivity.java b/app/src/main/java/org/connectbot/PubkeyListActivity.java index 52e18af..b3f7bd3 100644 --- a/app/src/main/java/org/connectbot/PubkeyListActivity.java +++ b/app/src/main/java/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() { |