diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/connectbot/ConsoleActivity.java | 14 | ||||
| -rw-r--r-- | src/org/connectbot/PortForwardListActivity.java | 20 |
2 files changed, 26 insertions, 8 deletions
diff --git a/src/org/connectbot/ConsoleActivity.java b/src/org/connectbot/ConsoleActivity.java index 066cc32..d27a3bf 100644 --- a/src/org/connectbot/ConsoleActivity.java +++ b/src/org/connectbot/ConsoleActivity.java @@ -147,13 +147,19 @@ public class ConsoleActivity extends Activity { // first check if we need to create a new session for requested boolean found = false; - for(TerminalBridge bridge : bound.bridges) { - if(bridge.host.getNickname().equals(requestedNickname)) + for (TerminalBridge bridge : bound.bridges) { + String nick = bridge.host.getNickname(); + if (nick == null) + continue; + + if (nick.equals(requestedNickname)) { found = true; + break; + } } // If we didn't find the requested connection, try opening it - if(!found) { + if (!found) { try { Log.d(TAG, String.format("We couldnt find an existing bridge with URI=%s (nickname=%s), so creating one now", requested.toString(), requestedNickname)); bound.openConnection(requested); @@ -163,7 +169,7 @@ public class ConsoleActivity extends Activity { } // create views for all bridges on this service - for(TerminalBridge bridge : bound.bridges) { + for (TerminalBridge bridge : bound.bridges) { // let them know about our prompt handler services bridge.promptHelper.setHandler(promptHandler); diff --git a/src/org/connectbot/PortForwardListActivity.java b/src/org/connectbot/PortForwardListActivity.java index 1d35372..8b3655c 100644 --- a/src/org/connectbot/PortForwardListActivity.java +++ b/src/org/connectbot/PortForwardListActivity.java @@ -33,6 +33,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.ServiceConnection; +import android.content.res.Resources; import android.database.SQLException; import android.graphics.Paint; import android.os.Bundle; @@ -112,10 +113,21 @@ public class PortForwardListActivity extends ListActivity { this.hostdb = new HostDatabase(this); host = hostdb.findHostById(hostId); - this.setTitle(String.format("%s: %s (%s)", - getResources().getText(R.string.app_name), - getResources().getText(R.string.title_port_forwards_list), - host.getNickname())); + { + String nickname = host.getNickname(); + final Resources resources = getResources(); + + if (nickname != null) { + this.setTitle(String.format("%s: %s (%s)", + resources.getText(R.string.app_name), + resources.getText(R.string.title_port_forwards_list), + nickname)); + } else { + this.setTitle(String.format("%s: %s", + resources.getText(R.string.app_name), + resources.getText(R.string.title_port_forwards_list))); + } + } connection = new ServiceConnection() { public void onServiceConnected(ComponentName className, IBinder service) { |