aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--AndroidManifest.xml2
-rw-r--r--src/org/connectbot/PortForwardListActivity.java7
2 files changed, 5 insertions, 4 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a1eed2c..239fa32 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.connectbot"
android:versionName="1.7.1"
- android:versionCode="323"
+ android:versionCode="324"
android:installLocation="auto">
<application
diff --git a/src/org/connectbot/PortForwardListActivity.java b/src/org/connectbot/PortForwardListActivity.java
index e5c6d21..f9982e4 100644
--- a/src/org/connectbot/PortForwardListActivity.java
+++ b/src/org/connectbot/PortForwardListActivity.java
@@ -113,7 +113,7 @@ public class PortForwardListActivity extends ListActivity {
host = hostdb.findHostById(hostId);
{
- String nickname = host.getNickname();
+ final String nickname = host != null ? host.getNickname() : null;
final Resources resources = getResources();
if (nickname != null) {
@@ -209,7 +209,8 @@ public class PortForwardListActivity extends ListActivity {
break;
}
- PortForwardBean pfb = new PortForwardBean(host.getId(),
+ PortForwardBean pfb = new PortForwardBean(
+ host != null ? host.getId() : -1,
nicknameEdit.getText().toString(), type,
sourcePortEdit.getText().toString(),
destEdit.getText().toString());
@@ -219,7 +220,7 @@ public class PortForwardListActivity extends ListActivity {
hostBridge.enablePortForward(pfb);
}
- if (!hostdb.savePortForward(pfb))
+ if (host != null && !hostdb.savePortForward(pfb))
throw new SQLException("Could not save port forward");
updateHandler.sendEmptyMessage(-1);