Merge pull request #297 from rhansby/broken-paste

Fix paste button being permanently disabled because SSH session was not yet open.

6 files changed, 10 insertions, 11 deletions

diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java
index 7241e0e..3aebd41 100644
--- a/app/src/main/java/org/connectbot/ConsoleActivity.java
+++ b/app/src/main/java/org/connectbot/ConsoleActivity.java
@@ -787,7 +787,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
 			paste.setAlphabeticShortcut('v');
 		MenuItemCompat.setShowAsAction(paste, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 		paste.setIcon(R.drawable.ic_action_paste);
-		paste.setEnabled(sessionOpen);
+		paste.setEnabled(activeTerminal);
 		paste.setOnMenuItemClickListener(new OnMenuItemClickListener() {
 			public boolean onMenuItemClick(MenuItem item) {
 				pasteIntoTerminal();
@@ -905,7 +905,7 @@ public class ConsoleActivity extends AppCompatActivity implements BridgeDisconne
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) {
 			copy.setEnabled(activeTerminal);
 		}
-		paste.setEnabled(sessionOpen);
+		paste.setEnabled(activeTerminal);
 		portForward.setEnabled(sessionOpen && canForwardPorts);
 		urlscan.setEnabled(activeTerminal);
 		resize.setEnabled(sessionOpen);
diff --git a/app/src/main/res/layout-large/act_console.xml b/app/src/main/res/layout-large/act_console.xml
index 297d0b1..df3d6bc 100644
--- a/app/src/main/res/layout-large/act_console.xml
+++ b/app/src/main/res/layout-large/act_console.xml
@@ -86,7 +86,7 @@
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
 			android:layout_below="@+id/console_password_instructions"
-			android:password="true"
+			android:inputType="textPassword"
 			android:singleLine="true"
 			/>
 
diff --git a/app/src/main/res/layout/act_console.xml b/app/src/main/res/layout/act_console.xml
index fea3a00..097fe85 100644
--- a/app/src/main/res/layout/act_console.xml
+++ b/app/src/main/res/layout/act_console.xml
@@ -20,7 +20,6 @@
 
 <RelativeLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
 	android:background="#ff000000">
@@ -65,7 +64,7 @@
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
 			android:layout_below="@+id/console_password_instructions"
-			android:password="true"
+			android:inputType="textPassword"
 			android:singleLine="true"
 			/>
 
diff --git a/app/src/main/res/layout/act_generatepubkey.xml b/app/src/main/res/layout/act_generatepubkey.xml
index feb0ed9..b4a8270 100644
--- a/app/src/main/res/layout/act_generatepubkey.xml
+++ b/app/src/main/res/layout/act_generatepubkey.xml
@@ -132,7 +132,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_weight="1"
-				android:password="true"
+				android:inputType="textPassword"
 				android:singleLine="true"/>
 		</TableRow>
 
@@ -163,7 +163,7 @@
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
 				android:layout_weight="1"
-				android:password="true"
+				android:inputType="textPassword"
 				android:singleLine="true"/>
 		</TableRow>
 
diff --git a/app/src/main/res/layout/dia_changepassword.xml b/app/src/main/res/layout/dia_changepassword.xml
index 7f0d5b2..f4320b3 100644
--- a/app/src/main/res/layout/dia_changepassword.xml
+++ b/app/src/main/res/layout/dia_changepassword.xml
@@ -39,7 +39,7 @@
 			android:id="@+id/old_password"
 			android:layout_width="200dip"
 			android:layout_height="wrap_content"
-			android:password="true"
+			android:inputType="textPassword"
 			android:singleLine="true"
 			/>
 	</TableRow>
@@ -58,7 +58,7 @@
 			android:id="@+id/password1"
 			android:layout_width="200dip"
 			android:layout_height="wrap_content"
-			android:password="true"
+			android:inputType="textPassword"
 			android:singleLine="true"
 			/>
 	</TableRow>
@@ -95,7 +95,7 @@
 			android:id="@+id/password2"
 			android:layout_width="200dip"
 			android:layout_height="wrap_content"
-			android:password="true"
+			android:inputType="textPassword"
 			android:singleLine="true"
 			/>
 	</TableRow>
diff --git a/app/src/main/res/layout/dia_password.xml b/app/src/main/res/layout/dia_password.xml
index 148e197..dd84fd4 100644
--- a/app/src/main/res/layout/dia_password.xml
+++ b/app/src/main/res/layout/dia_password.xml
@@ -30,7 +30,7 @@
 		android:layout_width="250dip"
 		android:layout_height="wrap_content"
 		android:hint="@string/prompt_password"
-		android:password="true"
+		android:inputType="textPassword"
 		android:singleLine="true"
 		/>