Merge branch 'master' into database-refactor

9 files changed, 132 insertions, 62 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f43a428..0f9bd76 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -41,60 +41,147 @@
 		android:backupAgent=".service.BackupAgent"
 		android:killAfterRestore="true">
 
-		<activity android:name=".HostListActivity" android:launchMode="singleTop">
+		<activity
+			android:name=".HostListActivity"
+			android:launchMode="singleTop">
 			<intent-filter>
-				<action android:name="android.intent.action.MAIN" />
-				<category android:name="android.intent.category.LAUNCHER" />
+				<action android:name="android.intent.action.MAIN"/>
+				<category android:name="android.intent.category.LAUNCHER"/>
 			</intent-filter>
 			<intent-filter>
-				<action android:name="android.intent.action.CREATE_SHORTCUT" />
-				<category android:name="android.intent.category.DEFAULT" />
+				<action android:name="android.intent.action.CREATE_SHORTCUT"/>
+				<category android:name="android.intent.category.DEFAULT"/>
 			</intent-filter>
 			<intent-filter>
-				<action android:name="android.intent.action.PICK" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<data android:scheme="ssh" />
-				<data android:scheme="telnet" />
-				<data android:scheme="local" />
+				<action android:name="android.intent.action.PICK"/>
+				<category android:name="android.intent.category.DEFAULT"/>
+
+				<data android:scheme="ssh"/>
+				<data android:scheme="telnet"/>
+				<data android:scheme="local"/>
 			</intent-filter>
 		</activity>
 
-		<activity android:name=".PubkeyListActivity" android:configChanges="keyboardHidden|orientation" />
-		<activity android:name=".GeneratePubkeyActivity" android:configChanges="keyboardHidden|orientation" />
-		<activity android:name=".HostEditorActivity" android:configChanges="keyboardHidden|orientation" />
-		<activity android:name=".PortForwardListActivity" android:configChanges="keyboardHidden|orientation" />
-		<activity android:name=".SettingsActivity" android:configChanges="keyboardHidden|orientation" />
-		<activity android:name=".HelpActivity" android:configChanges="keyboardHidden|orientation" />
-		<activity android:name=".HelpTopicActivity" android:configChanges="keyboardHidden|orientation" />
-		<activity android:name=".ColorsActivity" android:configChanges="keyboardHidden|orientation" />
-		<activity android:name=".EulaActivity"	android:parentActivityName=".HelpActivity"
-			  android:configChanges="keyboardHidden|orientation" >
-			<meta-data android:name="android.support.PARENT_ACTIVITY"
-				   android:value="org.connectbot.HelpActivity" />
+		<activity
+			android:name=".PubkeyListActivity"
+			android:configChanges="keyboardHidden|orientation"
+			android:label="@string/title_pubkey_list">
+
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.connectbot.HostListActivity"/>
+		</activity>
+
+		<activity
+			android:name=".GeneratePubkeyActivity"
+			android:configChanges="keyboardHidden|orientation"
+			android:label="@string/title_pubkey_generate">
+
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.connectbot.PubkeyListActivity"/>
+		</activity>
+
+		<activity
+			android:name=".HostEditorActivity"
+			android:configChanges="keyboardHidden|orientation"
+			android:label="@string/title_host_editor">
+
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.connectbot.HostListActivity"/>
+		</activity>
+
+		<activity
+			android:name=".PortForwardListActivity"
+			android:configChanges="keyboardHidden|orientation"
+			android:label="@string/title_port_forwards_list">
+
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.connectbot.HostListActivity"/>
+		</activity>
+
+		<activity
+			android:name=".SettingsActivity"
+			android:configChanges="keyboardHidden|orientation"
+			android:label="@string/title_settings">
+
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.connectbot.HostListActivity"/>
+		</activity>
+
+		<activity
+			android:name=".HelpActivity"
+			android:configChanges="keyboardHidden|orientation"
+			android:label="@string/title_help">
+
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.connectbot.HostListActivity"/>
+		</activity>
+
+		<activity
+			android:name=".HelpTopicActivity"
+			android:configChanges="keyboardHidden|orientation"
+			android:label="@string/title_help">
+
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.connectbot.HelpActivity"/>
 		</activity>
 
-		<service android:name="org.connectbot.service.TerminalManager"
+		<activity
+			android:name=".ColorsActivity"
 			android:configChanges="keyboardHidden|orientation"
-			android:description="@string/service_desc" />
+			android:label="@string/title_colors">
+
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.connectbot.HostListActivity"/>
+		</activity>
 
-		<activity android:name=".ConsoleActivity" android:configChanges="keyboardHidden|orientation"
-			android:theme="@style/Theme.AppCompat" android:windowSoftInputMode="stateAlwaysVisible|adjustResize"
-			android:launchMode="singleTop" android:hardwareAccelerated="false">
+		<activity
+			android:name=".EulaActivity"
+			android:configChanges="keyboardHidden|orientation"
+			android:label="@string/terms_and_conditions">
+
+			<meta-data
+				android:name="android.support.PARENT_ACTIVITY"
+				android:value="org.connectbot.HelpActivity"/>
+		</activity>
+
+		<service
+			android:name="org.connectbot.service.TerminalManager"
+			android:configChanges="keyboardHidden|orientation"
+			android:description="@string/service_desc"/>
+
+		<activity
+			android:name=".ConsoleActivity"
+			android:configChanges="keyboardHidden|orientation"
+			android:hardwareAccelerated="false"
+			android:launchMode="singleTop"
+			android:theme="@style/Theme.AppCompat"
+			android:windowSoftInputMode="stateAlwaysVisible|adjustResize">
 			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE" />
-				<data android:scheme="ssh" />
-				<data android:scheme="telnet" />
-				<data android:scheme="local" />
+				<action android:name="android.intent.action.VIEW"/>
+
+				<category android:name="android.intent.category.DEFAULT"/>
+				<category android:name="android.intent.category.BROWSABLE"/>
+
+				<data android:scheme="ssh"/>
+				<data android:scheme="telnet"/>
+				<data android:scheme="local"/>
 				<!-- format:  ssh://user@host:port/#nickname  -->
 				<!-- format:  telnet://host:port/#nickname  -->
 				<!-- format:  local://  -->
 			</intent-filter>
 		</activity>
 
-		<meta-data android:name="com.google.android.backup.api_key"
-			android:value="AEdPqrEAAAAIDlFz9nSUr2g0gSytW0t2cNnYAGHDkptlVohsBA" />
+		<meta-data
+			android:name="com.google.android.backup.api_key"
+			android:value="AEdPqrEAAAAIDlFz9nSUr2g0gSytW0t2cNnYAGHDkptlVohsBA"/>
 
 	</application>
 </manifest>
diff --git a/app/src/main/java/org/connectbot/ColorsActivity.java b/app/src/main/java/org/connectbot/ColorsActivity.java
index fce49a1..907992e 100644
--- a/app/src/main/java/org/connectbot/ColorsActivity.java
+++ b/app/src/main/java/org/connectbot/ColorsActivity.java
@@ -69,10 +69,6 @@ public class ColorsActivity extends Activity implements OnItemClickListener, OnC
 
 		setContentView(R.layout.act_colors);
 
-		this.setTitle(String.format("%s: %s",
-				getResources().getText(R.string.app_name),
-				getResources().getText(R.string.title_colors)));
-
 		mColorScheme = HostDatabase.DEFAULT_COLOR_SCHEME;
 
 		mHostDb = HostDatabase.get(this);
diff --git a/app/src/main/java/org/connectbot/EulaActivity.java b/app/src/main/java/org/connectbot/EulaActivity.java
index 650a5b5..58caa30 100644
--- a/app/src/main/java/org/connectbot/EulaActivity.java
+++ b/app/src/main/java/org/connectbot/EulaActivity.java
@@ -26,9 +26,5 @@ public class EulaActivity extends Activity {
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.act_eula);
-
-		this.setTitle(String.format("%s: %s",
-				getResources().getText(R.string.app_name),
-				getResources().getText(R.string.terms_and_conditions)));
 	}
 }
diff --git a/app/src/main/java/org/connectbot/HelpActivity.java b/app/src/main/java/org/connectbot/HelpActivity.java
index 1e78d72..a46740a 100644
--- a/app/src/main/java/org/connectbot/HelpActivity.java
+++ b/app/src/main/java/org/connectbot/HelpActivity.java
@@ -49,10 +49,6 @@ public class HelpActivity extends Activity {
 		super.onCreate(icicle);
 		setContentView(R.layout.act_help);
 
-		this.setTitle(String.format("%s: %s",
-				getResources().getText(R.string.app_name),
-				getResources().getText(R.string.title_help)));
-
 		AssetManager am = this.getAssets();
 		LinearLayout content = (LinearLayout) findViewById(R.id.topics);
 
diff --git a/app/src/main/java/org/connectbot/HelpTopicActivity.java b/app/src/main/java/org/connectbot/HelpTopicActivity.java
index 6dc58eb..f7ab6a3 100644
--- a/app/src/main/java/org/connectbot/HelpTopicActivity.java
+++ b/app/src/main/java/org/connectbot/HelpTopicActivity.java
@@ -37,8 +37,7 @@ public class HelpTopicActivity extends Activity {
 
 		String topic = getIntent().getStringExtra(Intent.EXTRA_TITLE);
 
-		this.setTitle(String.format("%s: %s - %s",
-				getResources().getText(R.string.app_name),
+		this.setTitle(String.format("%s: %s",
 				getResources().getText(R.string.title_help),
 				topic));
 
diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java
index d9e7d16..927e483 100644
--- a/app/src/main/java/org/connectbot/HostListActivity.java
+++ b/app/src/main/java/org/connectbot/HostListActivity.java
@@ -173,10 +173,6 @@ public class HostListActivity extends ListActivity implements OnHostStatusChange
 		super.onCreate(icicle);
 		setContentView(R.layout.act_hostlist);
 
-		this.setTitle(String.format("%s: %s",
-				getResources().getText(R.string.app_name),
-				getResources().getText(R.string.title_hosts_list)));
-
 		this.prefs = PreferenceManager.getDefaultSharedPreferences(this);
 
 		// detect HTC Dream and apply special preferences
diff --git a/app/src/main/java/org/connectbot/PortForwardListActivity.java b/app/src/main/java/org/connectbot/PortForwardListActivity.java
index 894eed4..868c611 100644
--- a/app/src/main/java/org/connectbot/PortForwardListActivity.java
+++ b/app/src/main/java/org/connectbot/PortForwardListActivity.java
@@ -113,14 +113,9 @@ public class PortForwardListActivity extends ListActivity {
 			final Resources resources = getResources();
 
 			if (nickname != null) {
-				this.setTitle(String.format("%s: %s (%s)",
-						resources.getText(R.string.app_name),
+				this.setTitle(String.format("%s (%s)",
 						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)));
 			}
 		}
 
diff --git a/app/src/main/java/org/connectbot/PubkeyListActivity.java b/app/src/main/java/org/connectbot/PubkeyListActivity.java
index 8910abf..a095583 100644
--- a/app/src/main/java/org/connectbot/PubkeyListActivity.java
+++ b/app/src/main/java/org/connectbot/PubkeyListActivity.java
@@ -134,9 +134,10 @@ public class PubkeyListActivity extends ListActivity implements EventListener {
 		super.onCreate(icicle);
 		setContentView(R.layout.act_pubkeylist);
 
-		this.setTitle(String.format("%s: %s",
-				getResources().getText(R.string.app_name),
-				getResources().getText(R.string.title_pubkey_list)));
+		// connect with hosts database and populate list
+		pubkeydb = new PubkeyDatabase(this);
+
+		updateList();
 
 		registerForContextMenu(getListView());
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c6086da..4820846 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -40,6 +40,10 @@
 	<string name="title_colors">"Colors"</string>
 	<!-- Dialog title for color picker dialog -->
 	<string name="title_color_picker">"Pick a color"</string>
+	<!-- Window title for the global applications settings activity. -->
+	<string name="title_settings">Settings</string>
+	<!-- Window title when generating a new pubkey. -->
+	<string name="title_pubkey_generate">Generate</string>
 
 	<string name="resolve_connect">"Connect"</string>
 	<!-- Menu selection where user must move finger randomly over an area to gather entropy (collect random bits) -->