diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2012-05-09 02:11:34 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2012-05-09 02:11:34 +0200 |
| commit | e689637b7c3555c464f800f049fe4059b908ca27 (patch) | |
| tree | 01feed96bd0559c660ec5ce45945c019c198d1a5 /src/de | |
| parent | b2b46c1867bd7282c91f43e80e0763f86ec791d4 (diff) | |
| parent | 6dc0a6c39024a9a6931b85f72d099072e1473595 (diff) | |
Merge
Diffstat (limited to 'src/de')
| -rw-r--r-- | src/de/blinkt/openvpn/AboutFragment.java | 8 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/AboutPreference.java | 14 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/LaunchVPN.java | 2 |
3 files changed, 7 insertions, 17 deletions
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; } diff --git a/src/de/blinkt/openvpn/AboutPreference.java b/src/de/blinkt/openvpn/AboutPreference.java deleted file mode 100644 index ff6c611d..00000000 --- a/src/de/blinkt/openvpn/AboutPreference.java +++ /dev/null @@ -1,14 +0,0 @@ -package de.blinkt.openvpn; - -import android.content.Context; -import android.preference.Preference; -import android.util.AttributeSet; - -public class AboutPreference extends Preference { - - public AboutPreference(Context context, AttributeSet attrs) { - super(context, attrs); - setWidgetLayoutResource(R.layout.about); - } - -} diff --git a/src/de/blinkt/openvpn/LaunchVPN.java b/src/de/blinkt/openvpn/LaunchVPN.java index 28abaf3d..88c14da3 100644 --- a/src/de/blinkt/openvpn/LaunchVPN.java +++ b/src/de/blinkt/openvpn/LaunchVPN.java @@ -291,7 +291,7 @@ public class LaunchVPN extends ListActivity implements OnItemClickListener { try { startActivityForResult(intent, START_VPN_PROFILE); } catch (ActivityNotFoundException ane){ - Toast.makeText(this, "Your image does not support the VPNService API,sorry :(", Toast.LENGTH_LONG); + Toast.makeText(this, "Your image does not support the VPNService API,sorry :(", Toast.LENGTH_LONG).show(); } } else { onActivityResult(START_VPN_PROFILE, Activity.RESULT_OK, null); |