Initial import

7 files changed, 518 insertions, 0 deletions

diff --git a/res/layout/about.xml b/res/layout/about.xml
new file mode 100644
index 00000000..ba166277
--- /dev/null
+++ b/res/layout/about.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical" >
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/copyright_blinktgui" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/copyright_others" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/openvpn"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+        <!--
+         ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/openvpn_logo_descr"
+        android:src="@drawable/openvpnLogo" />
+        -->
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/opevpn_copyright" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/file_dialog"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/copyright_file_dialog" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/lzo"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/lzo_copyright" />
+
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="20sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/openssl"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/copyright_openssl" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/config.xml b/res/layout/config.xml
new file mode 100644
index 00000000..e2ea8aa0
--- /dev/null
+++ b/res/layout/config.xml
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:blinkt="http://schemas.android.com/apk/res/de.blinkt.openvpn"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content" >
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:padding="3mm" >
+
+        <TextView
+            style="@style/item"
+            android:text="@string/address"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <EditText
+            android:id="@+id/address"
+            style="@style/item"
+            android:inputType="text"
+            android:text="@string/defaultserver" >
+
+            <!-- <requestFocus /> -->
+        </EditText>
+
+        <TextView
+            style="@style/item"
+            android:text="@string/port"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <RelativeLayout
+            android:id="@+id/relativeLayout1"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="8dip"
+            android:layout_marginRight="8dip" >
+
+            <EditText
+                android:id="@+id/port"
+                style="@style/item"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentTop="true"
+                android:inputType="number"
+                android:text="@string/defaultport" />
+
+            <ToggleButton
+                android:id="@+id/tcpudp"
+                style="@style/accountSetupButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_alignParentTop="true"
+                android:textOff="TCP"
+                android:textOn="UDP" />
+        </RelativeLayout>
+
+        <CheckBox
+            android:id="@+id/lzo"
+            style="@style/item"
+            android:text="@string/useLZO" />
+
+        <TextView
+            style="@style/item"
+            android:text="@string/vpn_type"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <Spinner
+            android:id="@+id/type"
+            style="@style/item"
+            android:entries="@array/vpn_types"
+            android:prompt="@string/vpn_type" />
+
+        <LinearLayout
+            android:id="@+id/keystore"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:visibility="gone" >
+
+            <include layout="@layout/keystore_selector" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/certs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:visibility="gone" >
+
+            <de.blinkt.openvpn.FileSelectLayout
+                android:id="@+id/caselect"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                blinkt:title="@string/ca_title" />
+
+            <de.blinkt.openvpn.FileSelectLayout
+                android:id="@+id/certselect"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                blinkt:title="@string/client_certificate_title" />
+
+            <de.blinkt.openvpn.FileSelectLayout
+                android:id="@+id/keyselect"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                blinkt:title="@string/client_key_title" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/pkcs12"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:visibility="gone" >
+
+            <de.blinkt.openvpn.FileSelectLayout
+                android:id="@+id/pkcs12select"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                blinkt:title="@string/client_pkcs12_title" />
+
+            <TextView
+                style="@style/item"
+                android:layout_marginLeft="8dip"
+                android:layout_marginRight="8dip"
+                android:text="@string/pkcs12pwquery"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+            <EditText
+                android:id="@+id/pkcs12password"
+                style="@style/item"
+                android:layout_marginLeft="8dip"
+                android:layout_marginRight="8dip"
+                android:inputType="textPassword" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/commonsecret"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:visibility="gone" >
+        </LinearLayout>
+
+        <CheckBox
+            android:id="@+id/show_advanced"
+            style="@style/item"
+            android:text="@string/show_advanced" />
+
+        <LinearLayout
+            android:id="@+id/advanced_options"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone" >
+
+            <CheckBox
+                android:id="@+id/useTLSAuth"
+                style="@style/item"
+                android:text="@string/useTLSAuth" />
+
+            <LinearLayout
+                android:id="@+id/tlsauth_options"
+	android:orientation="vertical"
+	        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+                android:visibility="gone"
+                android:layout_marginLeft="20sp" >
+
+                <de.blinkt.openvpn.FileSelectLayout
+                    android:id="@+id/tlsAuth"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    blinkt:title="@string/tlsauth" />
+
+                <TextView
+                    style="@style/item"
+                    android:text="@string/tls_direction"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+
+                
+                <Spinner
+                    android:id="@+id/tls_direction"
+                    style="@style/item"
+                    android:entries="@array/tls_directions"
+                    android:prompt="@string/tls_direction" /> 
+            </LinearLayout>
+        </LinearLayout>
+
+        <Button
+            android:id="@+id/connect"
+            style="@style/item"
+            android:text="@string/connect" />
+
+        <Button
+            android:id="@+id/about"
+            style="@style/item"
+            android:text="@string/about" />
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/file_dialog_main.xml b/res/layout/file_dialog_main.xml
new file mode 100644
index 00000000..c803522c
--- /dev/null
+++ b/res/layout/file_dialog_main.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout android:id="@+id/relativeLayout01"
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical" android:layout_width="fill_parent"
+	android:layout_height="fill_parent">
+
+	<LinearLayout android:id="@+id/fdLinearLayoutList"
+		android:orientation="vertical" android:layout_width="fill_parent"
+		android:layout_height="wrap_content" android:layout_alignParentBottom="true">
+
+		<LinearLayout android:id="@+id/fdLinearLayoutSelect"
+			android:orientation="vertical" android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_alignParentBottom="true" android:paddingLeft="10dp"
+			android:paddingRight="10dp" android:paddingBottom="5dp">
+
+			<LinearLayout android:orientation="horizontal"
+				android:layout_width="fill_parent" android:layout_height="fill_parent">
+				<Button android:id="@+id/fdButtonNew" android:layout_height="wrap_content"
+					android:layout_width="0dip" android:layout_weight=".3"
+					android:text="@string/nnew"></Button>
+				<Button android:id="@+id/fdButtonSelect" android:layout_height="wrap_content"
+					android:layout_width="0dip" android:layout_weight=".7"
+					android:text="@string/select"></Button>
+			</LinearLayout>
+		</LinearLayout>
+
+		<LinearLayout android:id="@+id/fdLinearLayoutCreate"
+			android:orientation="vertical" android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:layout_alignParentBottom="true" android:paddingLeft="10dp"
+			android:paddingRight="10dp" android:paddingBottom="5dp">
+			<TextView android:id="@+id/textViewFilename" android:text="@string/file_name"
+				android:layout_width="fill_parent" android:layout_height="wrap_content" />
+			<EditText android:text="" android:id="@+id/fdEditTextFile"
+				android:layout_width="fill_parent" android:layout_height="wrap_content"></EditText>
+
+			<LinearLayout android:orientation="horizontal"
+				android:layout_width="fill_parent" android:layout_height="fill_parent">
+				<Button android:id="@+id/fdButtonCancel" android:layout_height="wrap_content"
+					android:layout_width="0dip" android:layout_weight=".3"
+					android:text="@string/cancel"></Button>
+				<Button android:id="@+id/fdButtonCreate" android:layout_height="wrap_content"
+					android:layout_width="0dip" android:layout_weight=".7"
+					android:text="@string/create"></Button>
+			</LinearLayout>
+		</LinearLayout>
+
+	</LinearLayout>
+
+	<LinearLayout android:orientation="vertical"
+		android:layout_width="fill_parent" android:layout_height="fill_parent"
+		android:layout_above="@+id/fdLinearLayoutList">
+		<TextView android:id="@+id/path" android:layout_width="fill_parent"
+			android:layout_height="wrap_content" />
+		<ListView android:id="@android:id/list" android:layout_width="fill_parent"
+			android:layout_height="fill_parent" />
+		<TextView android:id="@android:id/empty"
+			android:layout_width="fill_parent" android:layout_height="fill_parent"
+			android:text="@string/no_data" />
+	</LinearLayout>
+
+
+
+
+</RelativeLayout>
diff --git a/res/layout/file_dialog_row.xml b/res/layout/file_dialog_row.xml
new file mode 100644
index 00000000..4dd8ecad
--- /dev/null
+++ b/res/layout/file_dialog_row.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <ImageView
+        android:id="@+id/fdrowimage"
+        android:layout_width="wrap_content"
+        android:layout_height="35dp"
+        android:layout_alignParentLeft="true"
+        android:contentDescription="@string/filetypeicon"
+        android:paddingLeft="3dp"
+        android:paddingRight="5dp" />
+
+    <TextView
+        android:id="@+id/fdrowtext"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/fdrowimage"
+        android:layout_alignTop="@+id/fdrowimage"
+        android:layout_toRightOf="@+id/fdrowimage"
+        android:gravity="center_vertical"
+        android:text="@+id/fdrowtext"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/file_select.xml b/res/layout/file_select.xml
new file mode 100644
index 00000000..0dd1abba
--- /dev/null
+++ b/res/layout/file_select.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- A layout to select a certificate, akin to a file selector on web pages. -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dip"
+    android:gravity="center_vertical" >
+
+    <Button
+        android:id="@+id/file_select_button"
+        style="@style/accountSetupButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:text="@string/file_select" />
+
+    <TextView
+        android:id="@+id/file_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_toLeftOf="@+id/file_select_button"
+        android:text="@string/client_certificate_title"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/file_selected_item"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/file_title"
+        android:layout_marginLeft="16dip"
+        android:layout_toLeftOf="@+id/file_select_button"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:text="@string/file_nothing_selected" />
+</RelativeLayout>
+
diff --git a/res/layout/keystore_selector.xml b/res/layout/keystore_selector.xml
new file mode 100644
index 00000000..21945104
--- /dev/null
+++ b/res/layout/keystore_selector.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- A layout to select a certificate, akin to a file selector on web pages. -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dip"
+    android:gravity="center_vertical" >
+
+    <Button
+        android:id="@+id/select_keystore_button"
+        style="@style/accountSetupButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentRight="true"
+        android:text="@string/select_certificate" />
+
+    <TextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentTop="true"
+        android:layout_toLeftOf="@+id/select_keystore_button"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/aliasname"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/title"
+        android:layout_marginLeft="16dip"
+        android:layout_toLeftOf="@+id/select_keystore_button"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:text="@string/no_certificate" />
+    <!-- android:textColor="@color/text_secondary_color" -->
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/log_entry.xml b/res/layout/log_entry.xml
new file mode 100644
index 00000000..5e204478
--- /dev/null
+++ b/res/layout/log_entry.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="0dp"
+    android:textSize="12sp" >
+</TextView>
\ No newline at end of file