Merge branch 'master' into database-refactor

7 files changed, 6 insertions, 27 deletions

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());