diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2013-08-07 00:05:02 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2013-08-07 00:05:02 +0200 |
| commit | be8b263f543530eb2142f362d0d7346f013c57c3 (patch) | |
| tree | 339b27c8cbfc6a1e0a79039afafa374805ae083c /src/de/blinkt/openvpn/fragments | |
| parent | 5e857c81eb31b4f1f445cffc28b575359993e38d (diff) | |
Always pass context when retrieving vpn config, don't try JB+ extra on ICS (closes issue #188)
Diffstat (limited to 'src/de/blinkt/openvpn/fragments')
| -rw-r--r-- | src/de/blinkt/openvpn/fragments/Settings_Basic.java | 4 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/fragments/ShowConfigFragment.java | 2 | ||||
| -rw-r--r-- | src/de/blinkt/openvpn/fragments/VPNProfileList.java | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/de/blinkt/openvpn/fragments/Settings_Basic.java b/src/de/blinkt/openvpn/fragments/Settings_Basic.java index 5dc4e437..28c2ca38 100644 --- a/src/de/blinkt/openvpn/fragments/Settings_Basic.java +++ b/src/de/blinkt/openvpn/fragments/Settings_Basic.java @@ -73,7 +73,7 @@ public class Settings_Basic extends Fragment implements View.OnClickListener, On public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); String profileuuid =getArguments().getString(getActivity().getPackageName() + ".profileUUID"); - mProfile=ProfileManager.get(profileuuid); + mProfile=ProfileManager.get(getActivity(),profileuuid); getActivity().setTitle(getString(R.string.edit_profile_title, mProfile.getName())); } @@ -155,7 +155,7 @@ public class Settings_Basic extends Fragment implements View.OnClickListener, On public void onStart() { super.onStart(); String profileuuid =getArguments().getString(getActivity().getPackageName() + ".profileUUID"); - mProfile=ProfileManager.get(profileuuid); + mProfile=ProfileManager.get(getActivity(),profileuuid); loadPreferences(); } diff --git a/src/de/blinkt/openvpn/fragments/ShowConfigFragment.java b/src/de/blinkt/openvpn/fragments/ShowConfigFragment.java index ad077633..bf673288 100644 --- a/src/de/blinkt/openvpn/fragments/ShowConfigFragment.java +++ b/src/de/blinkt/openvpn/fragments/ShowConfigFragment.java @@ -20,7 +20,7 @@ public class ShowConfigFragment extends Fragment { public android.view.View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { String profileUUID = getArguments().getString(getActivity().getPackageName() + ".profileUUID"); - final VpnProfile vp = ProfileManager.get(profileUUID); + final VpnProfile vp = ProfileManager.get(getActivity(),profileUUID); View v=inflater.inflate(R.layout.viewconfig, container,false); final TextView cv = (TextView) v.findViewById(R.id.configview); diff --git a/src/de/blinkt/openvpn/fragments/VPNProfileList.java b/src/de/blinkt/openvpn/fragments/VPNProfileList.java index d24aafc5..ccd8ef47 100644 --- a/src/de/blinkt/openvpn/fragments/VPNProfileList.java +++ b/src/de/blinkt/openvpn/fragments/VPNProfileList.java @@ -279,7 +279,7 @@ public class VPNProfileList extends ListFragment { if (requestCode == START_VPN_CONFIG) { String configuredVPN = data.getStringExtra(VpnProfile.EXTRA_PROFILEUUID); - VpnProfile profile = ProfileManager.get(configuredVPN); + VpnProfile profile = ProfileManager.get(getActivity(),configuredVPN); getPM().saveProfile(getActivity(), profile); // Name could be modified, reset List adapter setListAdapter(); @@ -293,7 +293,7 @@ public class VPNProfileList extends ListFragment { startActivityForResult(startImport, IMPORT_PROFILE); } else if(requestCode == IMPORT_PROFILE) { String profileUUID = data.getStringExtra(VpnProfile.EXTRA_PROFILEUUID); - mArrayadapter.add(ProfileManager.get(profileUUID)); + mArrayadapter.add(ProfileManager.get(getActivity(), profileUUID)); } } |