aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kenny@the-b.org>2009-08-14 22:23:13 +0000
committerKenny Root <kenny@the-b.org>2009-08-14 22:23:13 +0000
commitb899cd8df91c69da5a03eff4ba90e1fa1cbe897c (patch)
tree55f0ca7e0c9c4ea0a93288515d1550b02d1a73ef
parent481373f34a955488606c580d87e1a74efbc6b307 (diff)
downloadconnectbot-b899cd8df91c69da5a03eff4ba90e1fa1cbe897c.tar.gz
connectbot-b899cd8df91c69da5a03eff4ba90e1fa1cbe897c.tar.bz2
connectbot-b899cd8df91c69da5a03eff4ba90e1fa1cbe897c.zip
Only allow URL Scan while in an active terminal
git-svn-id: https://connectbot.googlecode.com/svn/trunk/connectbot@398 df292f66-193f-0410-a5fc-6d59da041ff2
-rw-r--r--AndroidManifest.xml2
-rw-r--r--src/org/connectbot/ConsoleActivity.java2
2 files changed, 3 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6ad602c..7cdfc1a 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.6-dev"
- android:versionCode="193">
+ android:versionCode="194">
<application
android:icon="@drawable/icon"
diff --git a/src/org/connectbot/ConsoleActivity.java b/src/org/connectbot/ConsoleActivity.java
index 2fff48d..9223a18 100644
--- a/src/org/connectbot/ConsoleActivity.java
+++ b/src/org/connectbot/ConsoleActivity.java
@@ -729,6 +729,7 @@ public class ConsoleActivity extends Activity {
urlscan = menu.add(R.string.console_menu_urlscan);
urlscan.setAlphabeticShortcut('u');
urlscan.setIcon(android.R.drawable.ic_menu_search);
+ urlscan.setEnabled(activeTerminal);
urlscan.setOnMenuItemClickListener(new OnMenuItemClickListener() {
public boolean onMenuItemClick(MenuItem item) {
final TerminalView terminalView = (TerminalView) findCurrentView(R.id.console_flip);
@@ -804,6 +805,7 @@ public class ConsoleActivity extends Activity {
copy.setEnabled(activeTerminal);
paste.setEnabled(clipboard.hasText() && sessionOpen);
portForward.setEnabled(sessionOpen && canForwardPorts);
+ urlscan.setEnabled(activeTerminal);
resize.setEnabled(sessionOpen);
return true;