* Add port forward list activity so port forwards can be saved in database

* Start saved port forwards when host is connected
* Add titles to activities to distinguish where user is

5 files changed, 186 insertions, 81 deletions

diff --git a/res/layout/act_portforwardlist.xml b/res/layout/act_portforwardlist.xml
new file mode 100644
index 0000000..f2fea38
--- /dev/null
+++ b/res/layout/act_portforwardlist.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	ConnectBot: simple, powerful, open-source SSH client for Android
+	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="fill_parent"
+	android:layout_height="fill_parent"
+	>
+	
+	<ListView android:id="@android:id/list"
+		android:layout_width="fill_parent"
+		android:layout_height="0dip"
+		android:layout_weight="1"
+		/>
+		
+   <TextView android:id="@android:id/empty"
+        android:layout_width="fill_parent" 
+        android:layout_height="fill_parent"
+        android:text="@string/portforward_list_empty"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+        android:gravity="center"
+        />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/dia_portforward.xml b/res/layout/dia_portforward.xml
new file mode 100644
index 0000000..e8743f9
--- /dev/null
+++ b/res/layout/dia_portforward.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	ConnectBot: simple, powerful, open-source SSH client for Android
+	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_height="wrap_content"
+	android:scrollbars="vertical"
+	android:layout_width="fill_parent"
+	>
+	
+	<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+		android:orientation="vertical"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:paddingLeft="10dip"
+		android:paddingRight="10dip"
+		>
+		
+		<TableLayout 
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			>
+			
+			<TableRow>
+				<TextView android:text="@string/prompt_nickname" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" />
+				<EditText android:id="@+id/nickname" android:hint="Internal Webserver" android:layout_width="200dip" android:layout_height="wrap_content" />
+			</TableRow>
+		</TableLayout>
+		
+		<RadioGroup
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:orientation="horizontal"
+			>
+			
+			<RadioButton
+				android:id="@+id/portforward_local"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/portforward_local"
+				android:paddingRight="30dip"
+				/>
+			
+			<RadioButton
+				android:id="@+id/portforward_remote"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:text="@string/portforward_remote"
+				/>
+	
+		</RadioGroup>
+		
+		<TableLayout 
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			>
+			
+			<TableRow>
+				<TextView android:text="@string/prompt_source_port" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" />
+				<EditText android:id="@+id/portforward_source" android:hint="143" android:layout_width="200dip" android:layout_height="wrap_content" />
+			</TableRow>
+			
+			<TableRow>
+				<TextView android:text="@string/prompt_destination" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" />
+				<EditText android:id="@+id/portforward_destination" android:hint="localhost:143" android:layout_width="200dip" android:layout_height="wrap_content" />
+			</TableRow>
+	
+		</TableLayout>
+	
+	</LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/dia_tunnel.xml b/res/layout/dia_tunnel.xml
deleted file mode 100644
index dd1db3d..0000000
--- a/res/layout/dia_tunnel.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-	ConnectBot: simple, powerful, open-source SSH client for Android
-	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="vertical"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:paddingLeft="10dip"
-	android:paddingRight="10dip"
-	>
-	
-	<RadioGroup
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:orientation="horizontal"
-		>
-		
-		<RadioButton
-			android:id="@+id/tunnel_local"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="Local"
-			android:paddingRight="30dip"
-			/>
-		
-		<RadioButton
-			android:id="@+id/tunnel_remote"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content"
-			android:text="Remote"
-			/>
-
-	</RadioGroup>
-	
-	<TableLayout 
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		>
-		
-		<TableRow>
-			<TextView android:text="Source port:" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" />
-			<EditText android:id="@+id/tunnel_source" android:hint="143" android:layout_width="200dip" android:layout_height="wrap_content" />
-		</TableRow>
-		
-		<TableRow>
-			<TextView android:text="Destination:" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" />
-			<EditText android:id="@+id/tunnel_destination" android:hint="localhost:143" android:layout_width="200dip" android:layout_height="wrap_content" />
-		</TableRow>
-
-	</TableLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/item_portforward.xml b/res/layout/item_portforward.xml
new file mode 100644
index 0000000..fd53d98
--- /dev/null
+++ b/res/layout/item_portforward.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	ConnectBot: simple, powerful, open-source SSH client for Android
+	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
+	
+	This program is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+	
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+	
+	You should have received a copy of the GNU General Public License
+	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_height="wrap_content"
+	android:orientation="vertical"
+	android:gravity="left|center_vertical" android:layout_width="wrap_content">
+	
+	<TextView
+		android:id="@android:id/text1"  
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:textAppearance="?android:attr/textAppearanceLarge"
+		android:text="Tunnel Nickname"
+		/>
+		
+	<TextView
+		android:id="@android:id/text2"  
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:textAppearance="?android:attr/textAppearanceSmall"
+		android:text="Local port 8080 to 192.168.1.1:80"
+		/>
+		
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5dfc9aa..261b7d5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -3,9 +3,11 @@
     <string name="app_name">ConnectBot</string>
     <string name="app_desc">Simple, powerful, open-source SSH client.</string>
     
-    <string name="title_hosts_list">ConnectBot</string>
-    <string name="title_host">Host</string>
-    <string name="title_shell">Secure Shell</string>
+    <string name="title_hosts_list">Hosts</string>
+    <string name="title_pubkey_list">Public keys</string>
+    <string name="title_port_forwards_list">Port forwards</string>
+    <string name="title_host_editor">Edit Host</string>
+    
     <string name="title_password">Input Password</string>
     <string name="title_pubkey">Public Keys</string>
     <string name="title_entropy">Gathering Entropy</string>
@@ -31,6 +33,12 @@
     <string name="pubkey_unknown_format">Unknown format</string>
     <string name="pubkey_change_password">Change Password</string>
 
+	<string name="portforward_list_empty">Tap "Menu" to create\nport forwards.</string>
+	<string name="portforward_edit">Edit Tunnel</string>
+	
+	<string name="prompt_nickname">Nickname:</string>
+	<string name="prompt_source_port">Source port:</string>
+	<string name="prompt_destination">Destination:</string>
     <string name="prompt_old_password">Old password:</string>
     <string name="prompt_password">Password:</string>
     <string name="prompt_again">(again)</string>
@@ -39,9 +47,7 @@
     <string name="alert_wrong_password_msg">Wrong password!</string>
     <string name="alert_key_corrupted_msg">Private key appears corrupt!</string>
     
-    <string name="button_ok">Ok</string>
     <string name="button_add">Add</string>
-    <string name="button_cancel">Cancel</string>
     <string name="button_change">Change</string>
     <string name="button_generate">Generate Key</string>
     <string name="button_resize">Resize</string>
@@ -89,15 +95,18 @@
 	<string name="console_menu_disconnect">Disconnect</string>
 	<string name="console_menu_copy">Copy</string>
 	<string name="console_menu_paste">Paste</string>
-	<string name="console_menu_tunnel">Tunnel</string>
+	<string name="console_menu_portforwards">Port Forwards</string>
 	<string name="console_menu_resize">Force Size</string>
 
-	<string name="tunnel_pos">Create tunnel</string>
-	<string name="tunnel_neg">Cancel</string>
+	<string name="portforward_local">Local</string>
+	<string name="portforward_remote">Remote</string>
+	<string name="portforward_pos">Create port forward</string>
+	<string name="portforward_neg">Cancel</string>
 
-	<string name="tunnel_done_local">Successfully created tunnel -L%d:%s:%d</string>
-	<string name="tunnel_done_remote">Successfully created tunnel -R%d:%s:%d</string>
-	<string name="tunnel_problem">Problem creating tunnel, maybe you're using ports under 1024?</string>
+	<string name="portforward_done">Successfully created port forward</string>
+	<string name="portforward_problem">Problem creating port forward, maybe you're using ports under 1024?</string>
+	
+	<string name="portforward_menu_add">Add port forward</string>
 
 	<string name="list_format_error">Use the format 'username@hostname:port'</string>
 	<string name="list_menu_sortcolor">Sort by color</string>
@@ -107,6 +116,7 @@
 
 	<string name="list_host_disconnect">Disconnect</string>
 	<string name="list_host_edit">Edit host</string>
+	<string name="list_host_portforwards">Edit port forwards</string>
 	<string name="list_host_delete">Delete host</string>
 
 	<string name="list_rotation_land">Force landscape</string>
@@ -122,13 +132,11 @@
 	<string name="delete_pos">Yes, delete</string>
 	<string name="delete_neg">Cancel</string>
 
-
 	<string name="wizard_agree">Agree</string>
 	<string name="wizard_cancel">Cancel</string>
 	<string name="wizard_next">Next</string>
 	<string name="wizard_back">Back</string>
 
-
 	<string name="terminal_hostkey_warn">The authenticity of host '%s' can't be established.</string>
 	<string name="terminal_hostkey">RSA key fingerprint is %s</string>
 	<string name="terminal_hostkey_prompt">Are you sure you want\nto continue connecting?</string>