diff options
| -rw-r--r-- | res/layout/about.xml | 17 | ||||
| -rw-r--r-- | res/values/strings.xml | 7 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/AboutFragment.java | 8 | ||||
| -rw-r--r-- | todo.txt | 7 |
4 files changed, 28 insertions, 11 deletions
diff --git a/res/layout/about.xml b/res/layout/about.xml index f8f10a2a..a66a0cc9 100644 --- a/res/layout/about.xml +++ b/res/layout/about.xml @@ -13,12 +13,25 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/version" /> + <Space + android:layout_width="match_parent" + android:layout_height="10sp" /> + <TextView android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/copyright_blinktgui" /> - + android:text="@string/copyright_blinktgui" + android:autoLink="all" /> + <Space + android:layout_width="match_parent" + android:layout_height="10sp" /> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/copyright_guicode" + android:autoLink="all" /> + <Space android:layout_width="match_parent" android:layout_height="20sp" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index b53bae5b..5d7b5396 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -31,7 +31,7 @@ <string name="defaultport">1194</string> - <string name="app_name">File dialog</string> + <string name="app_name">File dialog</string> <string name="location">Location</string> <string name="cant_read_folder">folder can\'t be read!</string> <string name="nnew">New</string> @@ -55,7 +55,8 @@ <string name="opevpn_copyright">Copyright © 2002–2010 OpenVPN Technologies, Inc. <sales@openvpn.net>\n "OpenVPN" is a trademark of OpenVPN Technologies, Inc.\n</string> - <string name="copyright_blinktgui">Copyright 2012 Arne Schwabe</string> + <string name="copyright_blinktgui">Copyright 2012\nArne Schwabe <arne@rfc2549.org></string> + <string name="copyright_guicode">Source code and issue tracker available under http://code.google.com/p/ics-openvpn/ </string> <string name="copyright_others">The program uses the following components. See the source for full details on the licenses</string> <string name="copyright_file_dialog">File Dialog for the Android\nAlexander Ponomarev"</string> <string name="lzo_copyright">Copyright © 1996 – 2011 Markus Franz Xaver Johannes Oberhumer</string> @@ -167,7 +168,7 @@ <string name="route_not_cidr">Cannot make sense of %1$s and %2$s as IP route with CIDR netmask, using /32 as netmask.</string> <string name="route_not_netip">Corrected route %1$s/%2$s to %3$s/%2$s</string> <string name="keychain_access">Cannot accces the Android Keychain Certificates. If you restored a backup of the app/app settings reselect the certificate to recreate the permission to access the certificate.</string> - <string name="version_info">Version: %s</string> + <string name="version_info">%1$s %2$s</string> <string name="could_not_write_log">Could not write log contents to file</string> <string name="send_logfile">Send Logfile</string> <string name="send">Send</string> diff --git a/src/de/blinkt/openvpn/AboutFragment.java b/src/de/blinkt/openvpn/AboutFragment.java index 065e53bc..77132299 100644 --- a/src/de/blinkt/openvpn/AboutFragment.java +++ b/src/de/blinkt/openvpn/AboutFragment.java @@ -1,6 +1,7 @@ package de.blinkt.openvpn; import android.app.Fragment; +import android.content.pm.PackageInfo; import android.content.pm.PackageManager.NameNotFoundException; import android.os.Bundle; import android.view.LayoutInflater; @@ -23,14 +24,17 @@ public class AboutFragment extends Fragment { TextView ver = (TextView) v.findViewById(R.id.version); String version; + String name="Openvpn"; try { - version = getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0).versionName; + PackageInfo packageinfo = getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0); + version = packageinfo.versionName; + name = getString(R.string.app); } catch (NameNotFoundException e) { version = "error fetching version"; } - ver.setText(getString(R.string.version_info,version)); + ver.setText(getString(R.string.version_info,name,version)); return v; } @@ -14,12 +14,12 @@ Ideas: - finish .ovpn -> configuration importer - depends on inline file storage, since config files can include inline files -- implement an encryption for profiles, so no sensitive data has be stored in plaintext +- implement an encryption for profiles, so no sensitive data has be stored in plain text - encrypt/decrypt with android private storage key (+no user input required) - implement general settings dialog - - encyrption of profiles - - Speed/Transfered in notifcation bar (byte counter of managment) + - encryption of profiles + - Speed/Transfered in notification bar (byte counter of managment) Missing configuration options: @@ -42,4 +42,3 @@ cipher auth mtu-link - |