From 2d0ed30fd65ce6d5832dc857a69c8063cb8b48b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Parm=C3=A9nides=20GV?= Date: Wed, 14 May 2014 21:07:23 +0200 Subject: Filter R and BuildConfig to use ours. --- .../de/blinkt/openvpn/fragments/AboutFragment.java | 2 +- .../de/blinkt/openvpn/fragments/FaqFragment.java | 2 +- .../openvpn/fragments/FileSelectionFragment.java | 2 +- .../de/blinkt/openvpn/fragments/InlineFileTab.java | 2 +- .../fragments/OpenVpnPreferencesFragment.java | 96 +++++++++++----------- .../blinkt/openvpn/fragments/SendDumpFragment.java | 2 +- .../openvpn/fragments/Settings_Authentication.java | 2 +- .../blinkt/openvpn/fragments/Settings_Basic.java | 4 +- .../de/blinkt/openvpn/fragments/Settings_IP.java | 2 +- .../blinkt/openvpn/fragments/Settings_Obscure.java | 2 +- .../blinkt/openvpn/fragments/Settings_Routing.java | 2 +- .../openvpn/fragments/ShowConfigFragment.java | 2 +- 12 files changed, 60 insertions(+), 60 deletions(-) (limited to 'app/src/main/java/de/blinkt/openvpn/fragments') diff --git a/app/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java b/app/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java index a43bbbe8..f878e4fb 100644 --- a/app/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java +++ b/app/src/main/java/de/blinkt/openvpn/fragments/AboutFragment.java @@ -22,7 +22,7 @@ import android.view.ViewGroup; import android.webkit.WebView; import android.widget.TextView; import com.android.vending.billing.IInAppBillingService; -import de.blinkt.openvpn.R; +import se.leap.bitmaskclient.R; import de.blinkt.openvpn.core.VpnStatus; import org.json.JSONException; import org.json.JSONObject; diff --git a/app/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java b/app/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java index 238ad952..ef57a395 100644 --- a/app/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java +++ b/app/src/main/java/de/blinkt/openvpn/fragments/FaqFragment.java @@ -8,7 +8,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import de.blinkt.openvpn.R; +import se.leap.bitmaskclient.R; public class FaqFragment extends Fragment { diff --git a/app/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java b/app/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java index 84e065a5..271af173 100644 --- a/app/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java +++ b/app/src/main/java/de/blinkt/openvpn/fragments/FileSelectionFragment.java @@ -20,7 +20,7 @@ import android.widget.ListView; import android.widget.SimpleAdapter; import android.widget.TextView; import de.blinkt.openvpn.activities.FileSelect; -import de.blinkt.openvpn.R; +import se.leap.bitmaskclient.R; public class FileSelectionFragment extends ListFragment { diff --git a/app/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java b/app/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java index bea22442..f0aa4fe2 100644 --- a/app/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java +++ b/app/src/main/java/de/blinkt/openvpn/fragments/InlineFileTab.java @@ -10,7 +10,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.EditText; import de.blinkt.openvpn.activities.FileSelect; -import de.blinkt.openvpn.R; +import se.leap.bitmaskclient.R; public class InlineFileTab extends Fragment { diff --git a/app/src/main/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java b/app/src/main/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java index f23a50db..4a6f19b5 100644 --- a/app/src/main/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java +++ b/app/src/main/java/de/blinkt/openvpn/fragments/OpenVpnPreferencesFragment.java @@ -1,48 +1,48 @@ -package de.blinkt.openvpn.fragments; - -import android.os.Bundle; -import android.preference.PreferenceFragment; -import de.blinkt.openvpn.R; -import de.blinkt.openvpn.VpnProfile; -import de.blinkt.openvpn.core.ProfileManager; - -public abstract class OpenVpnPreferencesFragment extends PreferenceFragment { - - protected VpnProfile mProfile; - - protected abstract void loadSettings(); - protected abstract void saveSettings(); - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - String profileUUID = getArguments().getString(getActivity().getPackageName() + ".profileUUID"); - mProfile = ProfileManager.get(getActivity(),profileUUID); - getActivity().setTitle(getString(R.string.edit_profile_title, mProfile.getName())); - - } - - @Override - public void onPause() { - super.onPause(); - saveSettings(); - } - - @Override - public void onActivityCreated(Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - if(savedInstanceState!=null) { - String profileUUID=savedInstanceState.getString(VpnProfile.EXTRA_PROFILEUUID); - mProfile = ProfileManager.get(getActivity(),profileUUID); - loadSettings(); - } - } - - @Override - public void onSaveInstanceState (Bundle outState) { - super.onSaveInstanceState(outState); - saveSettings(); - outState.putString(VpnProfile.EXTRA_PROFILEUUID, mProfile.getUUIDString()); - } -} +package de.blinkt.openvpn.fragments; + +import android.os.Bundle; +import android.preference.PreferenceFragment; +import se.leap.bitmaskclient.R; +import de.blinkt.openvpn.VpnProfile; +import de.blinkt.openvpn.core.ProfileManager; + +public abstract class OpenVpnPreferencesFragment extends PreferenceFragment { + + protected VpnProfile mProfile; + + protected abstract void loadSettings(); + protected abstract void saveSettings(); + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + String profileUUID = getArguments().getString(getActivity().getPackageName() + ".profileUUID"); + mProfile = ProfileManager.get(getActivity(),profileUUID); + getActivity().setTitle(getString(R.string.edit_profile_title, mProfile.getName())); + + } + + @Override + public void onPause() { + super.onPause(); + saveSettings(); + } + + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + if(savedInstanceState!=null) { + String profileUUID=savedInstanceState.getString(VpnProfile.EXTRA_PROFILEUUID); + mProfile = ProfileManager.get(getActivity(),profileUUID); + loadSettings(); + } + } + + @Override + public void onSaveInstanceState (Bundle outState) { + super.onSaveInstanceState(outState); + saveSettings(); + outState.putString(VpnProfile.EXTRA_PROFILEUUID, mProfile.getUUIDString()); + } +} diff --git a/app/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java b/app/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java index d43f6427..fd01b89f 100644 --- a/app/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java +++ b/app/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java @@ -14,7 +14,7 @@ import android.view.LayoutInflater; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; -import de.blinkt.openvpn.R; +import se.leap.bitmaskclient.R; import de.blinkt.openvpn.core.VpnStatus; public class SendDumpFragment extends Fragment { diff --git a/app/src/main/java/de/blinkt/openvpn/fragments/Settings_Authentication.java b/app/src/main/java/de/blinkt/openvpn/fragments/Settings_Authentication.java index 6ce9c915..9bd3bf54 100644 --- a/app/src/main/java/de/blinkt/openvpn/fragments/Settings_Authentication.java +++ b/app/src/main/java/de/blinkt/openvpn/fragments/Settings_Authentication.java @@ -13,7 +13,7 @@ import android.preference.Preference.OnPreferenceClickListener; import android.preference.SwitchPreference; import android.util.Pair; import de.blinkt.openvpn.activities.FileSelect; -import de.blinkt.openvpn.R; +import se.leap.bitmaskclient.R; import de.blinkt.openvpn.core.VpnStatus; import de.blinkt.openvpn.views.RemoteCNPreference; import de.blinkt.openvpn.VpnProfile; diff --git a/app/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java b/app/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java index 4145c65f..203d6c5c 100644 --- a/app/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java +++ b/app/src/main/java/de/blinkt/openvpn/fragments/Settings_Basic.java @@ -27,9 +27,9 @@ import android.widget.Spinner; import android.widget.TextView; import android.widget.ToggleButton; import de.blinkt.openvpn.views.FileSelectLayout; -import de.blinkt.openvpn.R; +import se.leap.bitmaskclient.R; import de.blinkt.openvpn.VpnProfile; -import de.blinkt.openvpn.R.id; +import se.leap.bitmaskclient.R.id; import de.blinkt.openvpn.core.ProfileManager; import de.blinkt.openvpn.core.X509Utils; diff --git a/app/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java b/app/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java index 16e3a5c4..81988012 100644 --- a/app/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java +++ b/app/src/main/java/de/blinkt/openvpn/fragments/Settings_IP.java @@ -6,7 +6,7 @@ import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; import android.preference.PreferenceManager; import android.preference.SwitchPreference; -import de.blinkt.openvpn.R; +import se.leap.bitmaskclient.R; import de.blinkt.openvpn.VpnProfile; public class Settings_IP extends OpenVpnPreferencesFragment implements OnPreferenceChangeListener { diff --git a/app/src/main/java/de/blinkt/openvpn/fragments/Settings_Obscure.java b/app/src/main/java/de/blinkt/openvpn/fragments/Settings_Obscure.java index 0e8f1a02..4507d691 100644 --- a/app/src/main/java/de/blinkt/openvpn/fragments/Settings_Obscure.java +++ b/app/src/main/java/de/blinkt/openvpn/fragments/Settings_Obscure.java @@ -6,7 +6,7 @@ import android.preference.EditTextPreference; import android.preference.ListPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; -import de.blinkt.openvpn.R; +import se.leap.bitmaskclient.R; public class Settings_Obscure extends OpenVpnPreferencesFragment implements OnPreferenceChangeListener { private CheckBoxPreference mUseRandomHostName; diff --git a/app/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java b/app/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java index c6f0dcf8..8163a745 100644 --- a/app/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java +++ b/app/src/main/java/de/blinkt/openvpn/fragments/Settings_Routing.java @@ -4,7 +4,7 @@ import android.preference.CheckBoxPreference; import android.preference.EditTextPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; -import de.blinkt.openvpn.R; +import se.leap.bitmaskclient.R; public class Settings_Routing extends OpenVpnPreferencesFragment implements OnPreferenceChangeListener { diff --git a/app/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java b/app/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java index bf673288..0cf2bbb7 100644 --- a/app/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java +++ b/app/src/main/java/de/blinkt/openvpn/fragments/ShowConfigFragment.java @@ -10,7 +10,7 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; -import de.blinkt.openvpn.R; +import se.leap.bitmaskclient.R; import de.blinkt.openvpn.VpnProfile; import de.blinkt.openvpn.core.ProfileManager; -- cgit v1.2.3