Skip to content

Commit 7ffbf76

Browse files
iiordanoviiordanov
committed
Merge branch 'ssh_multiple_auth'
2 parents e79a6ba + 83281f3 commit 7ffbf76

File tree

15 files changed

+260
-180
lines changed

15 files changed

+260
-180
lines changed

‎eclipse_projects/bVNC/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.iiordanov.bVNC" android:installLocation="auto"
4-
android:versionCode="3670" android:versionName="v3.6.7">
4+
android:versionCode="3680" android:versionName="v3.6.8">
55

66
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="10"></uses-sdk>
77
<uses-permission android:name="android.permission.INTERNET"></uses-permission>

‎eclipse_projects/bVNC/res/layout-large/main.xml

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -102,23 +102,33 @@ android:layout_height="fill_parent">
102102
android:hint="@string/password_hint_ssh" android:inputType="textNoSuggestions"/>
103103
</LinearLayout>
104104
</TableRow>
105-
<TableRow>
106-
<LinearLayout
107-
android:id="@+id/layoutUseSshPubkey"
108-
android:layout_width="fill_parent"
109-
android:layout_height="wrap_content"
110-
android:orientation="horizontal"
111-
android:layout_weight="1"
112-
android:visibility="gone">
113-
<Button android:id="@+id/buttonGeneratePubkey" android:text="@string/ssh_pubkey_button"
114-
android:textAppearance="?android:attr/textAppearanceLarge" android:enabled="true"
115-
android:layout_width="fill_parent" android:layout_weight=".4" android:layout_height="wrap_content"/>
116-
<CheckBox android:id="@+id/checkboxUseSshPubkey"
117-
android:layout_width="fill_parent" android:layout_height="wrap_content"
118-
android:text="@string/ssh_use_pubkey" android:layout_weight=".6" android:checked="false"
119-
android:textAppearance="?android:attr/textAppearanceLarge" android:singleLine="true"/>
120-
</LinearLayout>
121-
</TableRow>
105+
<TableRow>
106+
<LinearLayout
107+
android:id="@+id/layoutUseSshPubkey"
108+
android:layout_width="fill_parent"
109+
android:layout_height="wrap_content"
110+
android:orientation="vertical"
111+
android:layout_weight="1"
112+
android:visibility="gone">
113+
<LinearLayout
114+
android:layout_width="fill_parent"
115+
android:layout_height="wrap_content"
116+
android:orientation="horizontal">
117+
<EditText android:id="@+id/sshPassphrase"
118+
android:password="true"
119+
android:layout_width="fill_parent" android:layout_height="wrap_content"
120+
android:singleLine="true" android:layout_weight=".5" android:textAppearance="?android:attr/textAppearanceLarge"
121+
android:hint="@string/ssh_passphrase_hint" android:inputType="textNoSuggestions"/>
122+
<CheckBox android:id="@+id/checkboxUseSshPubkey"
123+
android:layout_width="fill_parent" android:layout_height="wrap_content"
124+
android:text="@string/ssh_use_pubkey" android:layout_weight=".5" android:checked="false"
125+
android:textAppearance="?android:attr/textAppearanceLarge" android:singleLine="true"/>
126+
</LinearLayout>
127+
<Button android:id="@+id/buttonGeneratePubkey" android:text="@string/ssh_pubkey_button"
128+
android:textAppearance="?android:attr/textAppearanceLarge" android:enabled="true"
129+
android:layout_width="fill_parent" android:layout_height="wrap_content"/>
130+
</LinearLayout>
131+
</TableRow>
122132
<TableRow>
123133
<LinearLayout
124134
android:id="@+id/layoutUseX11Vnc"

‎eclipse_projects/bVNC/res/layout-large/main_rdp.xml

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -102,23 +102,33 @@ android:layout_height="fill_parent">
102102
android:hint="@string/password_hint_ssh" android:inputType="textNoSuggestions"/>
103103
</LinearLayout>
104104
</TableRow>
105-
<TableRow>
106-
<LinearLayout
107-
android:id="@+id/layoutUseSshPubkey"
108-
android:layout_width="fill_parent"
109-
android:layout_height="wrap_content"
110-
android:orientation="horizontal"
111-
android:layout_weight="1"
112-
android:visibility="gone">
113-
<Button android:id="@+id/buttonGeneratePubkey" android:text="@string/ssh_pubkey_button"
114-
android:textAppearance="?android:attr/textAppearanceLarge" android:enabled="true"
115-
android:layout_width="fill_parent" android:layout_weight=".4" android:layout_height="wrap_content"/>
116-
<CheckBox android:id="@+id/checkboxUseSshPubkey"
117-
android:layout_width="fill_parent" android:layout_height="wrap_content"
118-
android:text="@string/ssh_use_pubkey" android:layout_weight=".6" android:checked="false"
119-
android:textAppearance="?android:attr/textAppearanceLarge" android:singleLine="true"/>
120-
</LinearLayout>
121-
</TableRow>
105+
<TableRow>
106+
<LinearLayout
107+
android:id="@+id/layoutUseSshPubkey"
108+
android:layout_width="fill_parent"
109+
android:layout_height="wrap_content"
110+
android:orientation="vertical"
111+
android:layout_weight="1"
112+
android:visibility="gone">
113+
<LinearLayout
114+
android:layout_width="fill_parent"
115+
android:layout_height="wrap_content"
116+
android:orientation="horizontal">
117+
<EditText android:id="@+id/sshPassphrase"
118+
android:password="true"
119+
android:layout_width="fill_parent" android:layout_height="wrap_content"
120+
android:singleLine="true" android:layout_weight=".5" android:textAppearance="?android:attr/textAppearanceLarge"
121+
android:hint="@string/ssh_passphrase_hint" android:inputType="textNoSuggestions"/>
122+
<CheckBox android:id="@+id/checkboxUseSshPubkey"
123+
android:layout_width="fill_parent" android:layout_height="wrap_content"
124+
android:text="@string/ssh_use_pubkey" android:layout_weight=".5" android:checked="false"
125+
android:textAppearance="?android:attr/textAppearanceLarge" android:singleLine="true"/>
126+
</LinearLayout>
127+
<Button android:id="@+id/buttonGeneratePubkey" android:text="@string/ssh_pubkey_button"
128+
android:textAppearance="?android:attr/textAppearanceLarge" android:enabled="true"
129+
android:layout_width="fill_parent" android:layout_height="wrap_content"/>
130+
</LinearLayout>
131+
</TableRow>
122132
<TableRow>
123133
<TextView
124134
android:text="RDP Connection Settings"

‎eclipse_projects/bVNC/res/layout-large/main_spice.xml

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -102,23 +102,33 @@ android:layout_height="fill_parent">
102102
android:hint="@string/password_hint_ssh" android:inputType="textNoSuggestions"/>
103103
</LinearLayout>
104104
</TableRow>
105-
<TableRow>
106-
<LinearLayout
107-
android:id="@+id/layoutUseSshPubkey"
108-
android:layout_width="fill_parent"
109-
android:layout_height="wrap_content"
110-
android:orientation="horizontal"
111-
android:layout_weight="1"
112-
android:visibility="gone">
113-
<Button android:id="@+id/buttonGeneratePubkey" android:text="@string/ssh_pubkey_button"
114-
android:textAppearance="?android:attr/textAppearanceLarge" android:enabled="true"
115-
android:layout_width="fill_parent" android:layout_weight=".4" android:layout_height="wrap_content"/>
116-
<CheckBox android:id="@+id/checkboxUseSshPubkey"
117-
android:layout_width="fill_parent" android:layout_height="wrap_content"
118-
android:text="@string/ssh_use_pubkey" android:layout_weight=".6" android:checked="false"
119-
android:textAppearance="?android:attr/textAppearanceLarge" android:singleLine="true"/>
120-
</LinearLayout>
121-
</TableRow>
105+
<TableRow>
106+
<LinearLayout
107+
android:id="@+id/layoutUseSshPubkey"
108+
android:layout_width="fill_parent"
109+
android:layout_height="wrap_content"
110+
android:orientation="vertical"
111+
android:layout_weight="1"
112+
android:visibility="gone">
113+
<LinearLayout
114+
android:layout_width="fill_parent"
115+
android:layout_height="wrap_content"
116+
android:orientation="horizontal">
117+
<EditText android:id="@+id/sshPassphrase"
118+
android:password="true"
119+
android:layout_width="fill_parent" android:layout_height="wrap_content"
120+
android:singleLine="true" android:layout_weight=".5" android:textAppearance="?android:attr/textAppearanceLarge"
121+
android:hint="@string/ssh_passphrase_hint" android:inputType="textNoSuggestions"/>
122+
<CheckBox android:id="@+id/checkboxUseSshPubkey"
123+
android:layout_width="fill_parent" android:layout_height="wrap_content"
124+
android:text="@string/ssh_use_pubkey" android:layout_weight=".5" android:checked="false"
125+
android:textAppearance="?android:attr/textAppearanceLarge" android:singleLine="true"/>
126+
</LinearLayout>
127+
<Button android:id="@+id/buttonGeneratePubkey" android:text="@string/ssh_pubkey_button"
128+
android:textAppearance="?android:attr/textAppearanceLarge" android:enabled="true"
129+
android:layout_width="fill_parent" android:layout_height="wrap_content"/>
130+
</LinearLayout>
131+
</TableRow>
122132
<TableRow>
123133
<TextView
124134
android:text="SPICE Connection Settings"

‎eclipse_projects/bVNC/res/layout/main.xml

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -102,23 +102,33 @@ android:layout_height="fill_parent">
102102
android:hint="@string/password_hint_ssh" android:inputType="textNoSuggestions"/>
103103
</LinearLayout>
104104
</TableRow>
105-
<TableRow>
106-
<LinearLayout
107-
android:id="@+id/layoutUseSshPubkey"
108-
android:layout_width="fill_parent"
109-
android:layout_height="wrap_content"
110-
android:orientation="horizontal"
111-
android:layout_weight="1"
112-
android:visibility="gone">
113-
<Button android:id="@+id/buttonGeneratePubkey" android:text="@string/ssh_pubkey_button"
114-
android:textAppearance="?android:attr/textAppearanceMedium" android:enabled="true"
115-
android:layout_width="fill_parent" android:layout_weight=".4" android:layout_height="wrap_content"/>
116-
<CheckBox android:id="@+id/checkboxUseSshPubkey"
117-
android:layout_width="fill_parent" android:layout_height="wrap_content"
118-
android:text="@string/ssh_use_pubkey" android:layout_weight=".6" android:checked="false"
119-
android:textAppearance="?android:attr/textAppearanceMedium" android:singleLine="true"/>
120-
</LinearLayout>
121-
</TableRow>
105+
<TableRow>
106+
<LinearLayout
107+
android:id="@+id/layoutUseSshPubkey"
108+
android:layout_width="fill_parent"
109+
android:layout_height="wrap_content"
110+
android:orientation="vertical"
111+
android:layout_weight="1"
112+
android:visibility="gone">
113+
<LinearLayout
114+
android:layout_width="fill_parent"
115+
android:layout_height="wrap_content"
116+
android:orientation="horizontal">
117+
<EditText android:id="@+id/sshPassphrase"
118+
android:password="true"
119+
android:layout_width="fill_parent" android:layout_height="wrap_content"
120+
android:singleLine="true" android:layout_weight=".5" android:textAppearance="?android:attr/textAppearanceMedium"
121+
android:hint="@string/ssh_passphrase_hint" android:inputType="textNoSuggestions"/>
122+
<CheckBox android:id="@+id/checkboxUseSshPubkey"
123+
android:layout_width="fill_parent" android:layout_height="wrap_content"
124+
android:text="@string/ssh_use_pubkey" android:layout_weight=".5" android:checked="false"
125+
android:textAppearance="?android:attr/textAppearanceMedium" android:singleLine="true"/>
126+
</LinearLayout>
127+
<Button android:id="@+id/buttonGeneratePubkey" android:text="@string/ssh_pubkey_button"
128+
android:textAppearance="?android:attr/textAppearanceMedium" android:enabled="true"
129+
android:layout_width="fill_parent" android:layout_height="wrap_content"/>
130+
</LinearLayout>
131+
</TableRow>
122132
<TableRow>
123133
<LinearLayout
124134
android:id="@+id/layoutUseX11Vnc"

‎eclipse_projects/bVNC/res/layout/main_rdp.xml

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -102,23 +102,33 @@ android:layout_height="fill_parent">
102102
android:hint="@string/password_hint_ssh" android:inputType="textNoSuggestions"/>
103103
</LinearLayout>
104104
</TableRow>
105-
<TableRow>
106-
<LinearLayout
107-
android:id="@+id/layoutUseSshPubkey"
108-
android:layout_width="fill_parent"
109-
android:layout_height="wrap_content"
110-
android:orientation="horizontal"
111-
android:layout_weight="1"
112-
android:visibility="gone">
113-
<Button android:id="@+id/buttonGeneratePubkey" android:text="@string/ssh_pubkey_button"
114-
android:textAppearance="?android:attr/textAppearanceMedium" android:enabled="true"
115-
android:layout_width="fill_parent" android:layout_weight=".4" android:layout_height="wrap_content"/>
116-
<CheckBox android:id="@+id/checkboxUseSshPubkey"
117-
android:layout_width="fill_parent" android:layout_height="wrap_content"
118-
android:text="@string/ssh_use_pubkey" android:layout_weight=".6" android:checked="false"
119-
android:textAppearance="?android:attr/textAppearanceMedium" android:singleLine="true"/>
120-
</LinearLayout>
121-
</TableRow>
105+
<TableRow>
106+
<LinearLayout
107+
android:id="@+id/layoutUseSshPubkey"
108+
android:layout_width="fill_parent"
109+
android:layout_height="wrap_content"
110+
android:orientation="vertical"
111+
android:layout_weight="1"
112+
android:visibility="gone">
113+
<LinearLayout
114+
android:layout_width="fill_parent"
115+
android:layout_height="wrap_content"
116+
android:orientation="horizontal">
117+
<EditText android:id="@+id/sshPassphrase"
118+
android:password="true"
119+
android:layout_width="fill_parent" android:layout_height="wrap_content"
120+
android:singleLine="true" android:layout_weight=".5" android:textAppearance="?android:attr/textAppearanceMedium"
121+
android:hint="@string/ssh_passphrase_hint" android:inputType="textNoSuggestions"/>
122+
<CheckBox android:id="@+id/checkboxUseSshPubkey"
123+
android:layout_width="fill_parent" android:layout_height="wrap_content"
124+
android:text="@string/ssh_use_pubkey" android:layout_weight=".5" android:checked="false"
125+
android:textAppearance="?android:attr/textAppearanceMedium" android:singleLine="true"/>
126+
</LinearLayout>
127+
<Button android:id="@+id/buttonGeneratePubkey" android:text="@string/ssh_pubkey_button"
128+
android:textAppearance="?android:attr/textAppearanceMedium" android:enabled="true"
129+
android:layout_width="fill_parent" android:layout_height="wrap_content"/>
130+
</LinearLayout>
131+
</TableRow>
122132
<TableRow>
123133
<TextView
124134
android:text="RDP Connection Settings"

‎eclipse_projects/bVNC/res/layout/main_spice.xml

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -102,23 +102,33 @@ android:layout_height="fill_parent">
102102
android:hint="@string/password_hint_ssh" android:inputType="textNoSuggestions"/>
103103
</LinearLayout>
104104
</TableRow>
105-
<TableRow>
106-
<LinearLayout
107-
android:id="@+id/layoutUseSshPubkey"
108-
android:layout_width="fill_parent"
109-
android:layout_height="wrap_content"
110-
android:orientation="horizontal"
111-
android:layout_weight="1"
112-
android:visibility="gone">
113-
<Button android:id="@+id/buttonGeneratePubkey" android:text="@string/ssh_pubkey_button"
114-
android:textAppearance="?android:attr/textAppearanceMedium" android:enabled="true"
115-
android:layout_width="fill_parent" android:layout_weight=".4" android:layout_height="wrap_content"/>
116-
<CheckBox android:id="@+id/checkboxUseSshPubkey"
117-
android:layout_width="fill_parent" android:layout_height="wrap_content"
118-
android:text="@string/ssh_use_pubkey" android:layout_weight=".6" android:checked="false"
119-
android:textAppearance="?android:attr/textAppearanceMedium" android:singleLine="true"/>
120-
</LinearLayout>
121-
</TableRow>
105+
<TableRow>
106+
<LinearLayout
107+
android:id="@+id/layoutUseSshPubkey"
108+
android:layout_width="fill_parent"
109+
android:layout_height="wrap_content"
110+
android:orientation="vertical"
111+
android:layout_weight="1"
112+
android:visibility="gone">
113+
<LinearLayout
114+
android:layout_width="fill_parent"
115+
android:layout_height="wrap_content"
116+
android:orientation="horizontal">
117+
<EditText android:id="@+id/sshPassphrase"
118+
android:password="true"
119+
android:layout_width="fill_parent" android:layout_height="wrap_content"
120+
android:singleLine="true" android:layout_weight=".5" android:textAppearance="?android:attr/textAppearanceMedium"
121+
android:hint="@string/ssh_passphrase_hint" android:inputType="textNoSuggestions"/>
122+
<CheckBox android:id="@+id/checkboxUseSshPubkey"
123+
android:layout_width="fill_parent" android:layout_height="wrap_content"
124+
android:text="@string/ssh_use_pubkey" android:layout_weight=".5" android:checked="false"
125+
android:textAppearance="?android:attr/textAppearanceMedium" android:singleLine="true"/>
126+
</LinearLayout>
127+
<Button android:id="@+id/buttonGeneratePubkey" android:text="@string/ssh_pubkey_button"
128+
android:textAppearance="?android:attr/textAppearanceMedium" android:enabled="true"
129+
android:layout_width="fill_parent" android:layout_height="wrap_content"/>
130+
</LinearLayout>
131+
</TableRow>
122132
<TableRow>
123133
<TextView
124134
android:text="SPICE Connection Settings"

0 commit comments

Comments
 (0)