34 files changed, 81 insertions, 56 deletions

diff --git a/src/de/blinkt/openvpn/AboutFragment.java b/src/se/leap/openvpn/AboutFragment.java
index 85f48bc7..3563528b 100644
--- a/src/de/blinkt/openvpn/AboutFragment.java
+++ b/src/se/leap/openvpn/AboutFragment.java
@@ -1,4 +1,4 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import android.app.Fragment;
 import android.content.pm.PackageInfo;
@@ -11,6 +11,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import se.leap.leapclient.R;
 
 public class AboutFragment extends Fragment  {
 
diff --git a/src/de/blinkt/openvpn/CIDRIP.java b/src/se/leap/openvpn/CIDRIP.java
index ccb3836a..8c4b6709 100644
--- a/src/de/blinkt/openvpn/CIDRIP.java
+++ b/src/se/leap/openvpn/CIDRIP.java
@@ -1,4 +1,4 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 class CIDRIP{
 	String mIp;
diff --git a/src/de/blinkt/openvpn/ConfigConverter.java b/src/se/leap/openvpn/ConfigConverter.java
index 5065436c..8b5f316d 100644
--- a/src/de/blinkt/openvpn/ConfigConverter.java
+++ b/src/se/leap/openvpn/ConfigConverter.java
@@ -1,5 +1,5 @@
 
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -9,6 +9,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.List;
 import java.util.Vector;
+import se.leap.leapclient.R;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -27,11 +28,11 @@ import android.view.MenuItem;
 import android.view.View;
 import android.widget.ArrayAdapter;
 import android.widget.CheckBox;
-import de.blinkt.openvpn.ConfigParser.ConfigParseError;
+import se.leap.openvpn.ConfigParser.ConfigParseError;
 
 public class ConfigConverter extends ListActivity {
 
-	public static final String IMPORT_PROFILE = "de.blinkt.openvpn.IMPORT_PROFILE";
+	public static final String IMPORT_PROFILE = "se.leap.openvpn.IMPORT_PROFILE";
 
 	private VpnProfile mResult;
 	private ArrayAdapter<String> mArrayAdapter;
diff --git a/src/de/blinkt/openvpn/ConfigParser.java b/src/se/leap/openvpn/ConfigParser.java
index dc605bbc..f57bbae9 100644
--- a/src/de/blinkt/openvpn/ConfigParser.java
+++ b/src/se/leap/openvpn/ConfigParser.java
@@ -1,4 +1,4 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/de/blinkt/openvpn/FaqFragment.java b/src/se/leap/openvpn/FaqFragment.java
index a358dc9a..2b9f02eb 100644
--- a/src/de/blinkt/openvpn/FaqFragment.java
+++ b/src/se/leap/openvpn/FaqFragment.java
@@ -1,4 +1,4 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import android.app.Fragment;
 import android.os.Bundle;
@@ -8,6 +8,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import se.leap.leapclient.R;
 
 public class FaqFragment extends Fragment  {
 
diff --git a/src/de/blinkt/openvpn/FileProvider.java b/src/se/leap/openvpn/FileProvider.java
index e86b544f..d2714b2c 100644
--- a/src/de/blinkt/openvpn/FileProvider.java
+++ b/src/se/leap/openvpn/FileProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -22,7 +22,6 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-
 import android.content.ContentProvider;
 import android.content.ContentProvider.PipeDataWriter;
 import android.content.ContentValues;
diff --git a/src/de/blinkt/openvpn/FileSelect.java b/src/se/leap/openvpn/FileSelect.java
index b6239433..4abf6c31 100644
--- a/src/de/blinkt/openvpn/FileSelect.java
+++ b/src/se/leap/openvpn/FileSelect.java
@@ -1,4 +1,4 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 
 import java.io.File;
@@ -6,6 +6,7 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import se.leap.leapclient.R;
 
 import android.app.ActionBar;
 import android.app.ActionBar.Tab;
@@ -23,9 +24,9 @@ public class FileSelect extends Activity {
 	public static final String RESULT_DATA = "RESULT_PATH";
 	public static final String START_DATA = "START_DATA";
 	public static final String WINDOW_TITLE = "WINDOW_TILE";
-	public static final String NO_INLINE_SELECTION = "de.blinkt.openvpn.NO_INLINE_SELECTION";
-	public static final String SHOW_CLEAR_BUTTON = "de.blinkt.openvpn.SHOW_CLEAR_BUTTON";
-	public static final String DO_BASE64_ENCODE = "de.blinkt.openvpn.BASE64ENCODE";
+	public static final String NO_INLINE_SELECTION = "se.leap.openvpn.NO_INLINE_SELECTION";
+	public static final String SHOW_CLEAR_BUTTON = "se.leap.openvpn.SHOW_CLEAR_BUTTON";
+	public static final String DO_BASE64_ENCODE = "se.leap.openvpn.BASE64ENCODE";
 	
 	private FileSelectionFragment mFSFragment;
 	private InlineFileTab mInlineFragment;
diff --git a/src/de/blinkt/openvpn/FileSelectLayout.java b/src/se/leap/openvpn/FileSelectLayout.java
index 93e438fc..2ca4490d 100644
--- a/src/de/blinkt/openvpn/FileSelectLayout.java
+++ b/src/se/leap/openvpn/FileSelectLayout.java
@@ -1,4 +1,4 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import android.app.Fragment;
 import android.content.Context;
@@ -10,6 +10,7 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import se.leap.leapclient.R;
 
 
 public class FileSelectLayout extends LinearLayout implements OnClickListener {
diff --git a/src/de/blinkt/openvpn/FileSelectionFragment.java b/src/se/leap/openvpn/FileSelectionFragment.java
index 2d8110e1..5bc981fe 100644
--- a/src/de/blinkt/openvpn/FileSelectionFragment.java
+++ b/src/se/leap/openvpn/FileSelectionFragment.java
@@ -1,10 +1,11 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import java.io.File;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.TreeMap;
+import se.leap.leapclient.R;
 
 import android.app.AlertDialog;
 import android.app.ListFragment;
diff --git a/src/de/blinkt/openvpn/GeneralSettings.java b/src/se/leap/openvpn/GeneralSettings.java
index b9c412c0..34657914 100644
--- a/src/de/blinkt/openvpn/GeneralSettings.java
+++ b/src/se/leap/openvpn/GeneralSettings.java
@@ -1,5 +1,6 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 import java.io.File;
+import se.leap.leapclient.R;
 
 import android.os.Bundle;
 import android.preference.Preference;
diff --git a/src/de/blinkt/openvpn/InlineFileTab.java b/src/se/leap/openvpn/InlineFileTab.java
index 1104d290..40995ceb 100644
--- a/src/de/blinkt/openvpn/InlineFileTab.java
+++ b/src/se/leap/openvpn/InlineFileTab.java
@@ -1,4 +1,4 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import android.app.Fragment;
 import android.os.Bundle;
@@ -9,6 +9,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
+import se.leap.leapclient.R;
 
 public class InlineFileTab extends Fragment
 {
diff --git a/src/de/blinkt/openvpn/LaunchVPN.java b/src/se/leap/openvpn/LaunchVPN.java
index 32ebe33d..3df2aacb 100644
--- a/src/de/blinkt/openvpn/LaunchVPN.java
+++ b/src/se/leap/openvpn/LaunchVPN.java
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Vector;
+import se.leap.leapclient.R;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -69,9 +70,9 @@ import android.widget.TextView;
  */
 public class LaunchVPN extends ListActivity implements OnItemClickListener {
 
-	public static final String EXTRA_KEY = "de.blinkt.openvpn.shortcutProfileUUID";
-	public static final String EXTRA_NAME = "de.blinkt.openvpn.shortcutProfileName";
-	public static final String EXTRA_HIDELOG =  "de.blinkt.openvpn.showNoLogWindow";;
+	public static final String EXTRA_KEY = "se.leap.openvpn.shortcutProfileUUID";
+	public static final String EXTRA_NAME = "se.leap.openvpn.shortcutProfileName";
+	public static final String EXTRA_HIDELOG =  "se.leap.openvpn.showNoLogWindow";;
 
 	private static final int START_VPN_PROFILE= 70;
 	
diff --git a/src/de/blinkt/openvpn/LogWindow.java b/src/se/leap/openvpn/LogWindow.java
index 88615e12..abd1acd6 100644
--- a/src/de/blinkt/openvpn/LogWindow.java
+++ b/src/se/leap/openvpn/LogWindow.java
@@ -1,6 +1,7 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import java.util.Vector;
+import se.leap.leapclient.R;
 
 import android.app.AlertDialog;
 import android.app.AlertDialog.Builder;
@@ -27,9 +28,9 @@ import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
-import de.blinkt.openvpn.OpenVPN.LogItem;
-import de.blinkt.openvpn.OpenVPN.LogListener;
-import de.blinkt.openvpn.OpenVPN.StateListener;
+import se.leap.openvpn.OpenVPN.LogItem;
+import se.leap.openvpn.OpenVPN.LogListener;
+import se.leap.openvpn.OpenVPN.StateListener;
 
 public class LogWindow extends ListActivity implements StateListener  {
 	private static final int START_VPN_CONFIG = 0;
diff --git a/src/de/blinkt/openvpn/MainActivity.java b/src/se/leap/openvpn/MainActivity.java
index 57506c4f..d33fd832 100644
--- a/src/de/blinkt/openvpn/MainActivity.java
+++ b/src/se/leap/openvpn/MainActivity.java
@@ -1,6 +1,7 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import java.util.List;
+import se.leap.leapclient.R;
 
 import android.content.Intent;
 import android.preference.PreferenceActivity;
diff --git a/src/de/blinkt/openvpn/NetworkSateReceiver.java b/src/se/leap/openvpn/NetworkSateReceiver.java
index e20c8e52..301803b6 100644
--- a/src/de/blinkt/openvpn/NetworkSateReceiver.java
+++ b/src/se/leap/openvpn/NetworkSateReceiver.java
@@ -1,4 +1,4 @@
-package de.blinkt.openvpn;

+package se.leap.openvpn;

 

 import android.content.BroadcastReceiver;

 import android.content.Context;

@@ -8,6 +8,7 @@ import android.net.ConnectivityManager;
 import android.net.NetworkInfo;

 import android.net.NetworkInfo.State;

 import android.preference.PreferenceManager;

+import se.leap.leapclient.R;

 

 public class NetworkSateReceiver extends BroadcastReceiver {

 	private int lastNetwork=-1;

diff --git a/src/de/blinkt/openvpn/OnBootReceiver.java b/src/se/leap/openvpn/OnBootReceiver.java
index 032501b6..d97097c3 100644
--- a/src/de/blinkt/openvpn/OnBootReceiver.java
+++ b/src/se/leap/openvpn/OnBootReceiver.java
@@ -1,4 +1,4 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
diff --git a/src/de/blinkt/openvpn/OpenVPN.java b/src/se/leap/openvpn/OpenVPN.java
index 8d6cb4c8..152cf2d8 100644
--- a/src/de/blinkt/openvpn/OpenVPN.java
+++ b/src/se/leap/openvpn/OpenVPN.java
@@ -1,8 +1,9 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import java.util.LinkedList;
 import java.util.Locale;
 import java.util.Vector;
+import se.leap.leapclient.R;
 
 
 import android.content.Context;
diff --git a/src/de/blinkt/openvpn/OpenVPNThread.java b/src/se/leap/openvpn/OpenVPNThread.java
index 1ef04f70..3f9a0d91 100644
--- a/src/de/blinkt/openvpn/OpenVPNThread.java
+++ b/src/se/leap/openvpn/OpenVPNThread.java
@@ -1,4 +1,4 @@
-package de.blinkt.openvpn;

+package se.leap.openvpn;

 

 import java.io.BufferedReader;

 import java.io.BufferedWriter;

@@ -7,9 +7,10 @@ import java.io.IOException;
 import java.io.InputStream;

 import java.io.InputStreamReader;

 import java.util.LinkedList;

+import se.leap.leapclient.R;

 

 import android.util.Log;

-import de.blinkt.openvpn.OpenVPN.LogItem;

+import se.leap.openvpn.OpenVPN.LogItem;

 

 public class OpenVPNThread implements Runnable {

 	private static final String DUMP_PATH_STRING = "Dump path: ";

diff --git a/src/de/blinkt/openvpn/OpenVpnManagementThread.java b/src/se/leap/openvpn/OpenVpnManagementThread.java
index 3d68d943..43d4f701 100644
--- a/src/de/blinkt/openvpn/OpenVpnManagementThread.java
+++ b/src/se/leap/openvpn/OpenVpnManagementThread.java
@@ -1,4 +1,4 @@
-package de.blinkt.openvpn;

+package se.leap.openvpn;

 

 import java.io.FileDescriptor;

 import java.io.IOException;

@@ -17,6 +17,7 @@ import javax.crypto.BadPaddingException;
 import javax.crypto.Cipher;

 import javax.crypto.IllegalBlockSizeException;

 import javax.crypto.NoSuchPaddingException;

+import se.leap.leapclient.R;

 

 import android.content.SharedPreferences;

 import android.net.LocalServerSocket;

diff --git a/src/de/blinkt/openvpn/OpenVpnPreferencesFragment.java b/src/se/leap/openvpn/OpenVpnPreferencesFragment.java
index 4cf3b10b..31746332 100644
--- a/src/de/blinkt/openvpn/OpenVpnPreferencesFragment.java
+++ b/src/se/leap/openvpn/OpenVpnPreferencesFragment.java
@@ -1,7 +1,8 @@
-package de.blinkt.openvpn;

+package se.leap.openvpn;

 

 import android.os.Bundle;

 import android.preference.PreferenceFragment;

+import se.leap.leapclient.R;

 

 public abstract class OpenVpnPreferencesFragment extends PreferenceFragment {

 	

diff --git a/src/de/blinkt/openvpn/OpenVpnService.java b/src/se/leap/openvpn/OpenVpnService.java
index 4dff943b..c745ee3b 100644
--- a/src/de/blinkt/openvpn/OpenVpnService.java
+++ b/src/se/leap/openvpn/OpenVpnService.java
@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.Vector;
+import se.leap.leapclient.R;
 
 import android.annotation.TargetApi;
 import android.app.Notification;
@@ -40,10 +41,10 @@ import android.os.Build;
 import android.os.IBinder;
 import android.os.Message;
 import android.os.ParcelFileDescriptor;
-import de.blinkt.openvpn.OpenVPN.StateListener;
+import se.leap.openvpn.OpenVPN.StateListener;
 
 public class OpenVpnService extends VpnService implements StateListener, Callback {
-	public static final String START_SERVICE = "de.blinkt.openvpn.START_SERVICE";
+	public static final String START_SERVICE = "se.leap.openvpn.START_SERVICE";
 
 	private Thread mProcessThread=null;
 
diff --git a/src/de/blinkt/openvpn/ProfileManager.java b/src/se/leap/openvpn/ProfileManager.java
index 9f17a68e..b9eb3ab6 100644
--- a/src/de/blinkt/openvpn/ProfileManager.java
+++ b/src/se/leap/openvpn/ProfileManager.java
@@ -1,4 +1,4 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -9,7 +9,6 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/src/de/blinkt/openvpn/ProxyDetection.java b/src/se/leap/openvpn/ProxyDetection.java
index dfcfbf19..7114857d 100644
--- a/src/de/blinkt/openvpn/ProxyDetection.java
+++ b/src/se/leap/openvpn/ProxyDetection.java
@@ -1,4 +1,4 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import java.net.InetSocketAddress;
 import java.net.MalformedURLException;
@@ -8,6 +8,7 @@ import java.net.SocketAddress;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.List;
+import se.leap.leapclient.R;
 
 public class ProxyDetection {
 	static SocketAddress detectProxy(VpnProfile vp) {
diff --git a/src/de/blinkt/openvpn/SendDumpActivity.java b/src/se/leap/openvpn/SendDumpActivity.java
index 8a09b535..20194db0 100644
--- a/src/de/blinkt/openvpn/SendDumpActivity.java
+++ b/src/se/leap/openvpn/SendDumpActivity.java
@@ -1,8 +1,7 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import java.io.File;
 import java.util.ArrayList;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -34,8 +33,8 @@ public class SendDumpActivity extends Activity {
 			OpenVPN.logError("No Minidump found!");
 		}
 		
-		uris.add(Uri.parse("content://de.blinkt.openvpn.FileProvider/" + ldump.getName()));
-		uris.add(Uri.parse("content://de.blinkt.openvpn.FileProvider/" + ldump.getName() + ".log"));
+		uris.add(Uri.parse("content://se.leap.openvpn.FileProvider/" + ldump.getName()));
+		uris.add(Uri.parse("content://se.leap.openvpn.FileProvider/" + ldump.getName() + ".log"));
 
 		emailIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
 		emailIntent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
diff --git a/src/de/blinkt/openvpn/Settings_Authentication.java b/src/se/leap/openvpn/Settings_Authentication.java
index 6733ed0c..00f4c08a 100644
--- a/src/de/blinkt/openvpn/Settings_Authentication.java
+++ b/src/se/leap/openvpn/Settings_Authentication.java
@@ -1,4 +1,4 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -11,6 +11,7 @@ import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.SwitchPreference;
+import se.leap.leapclient.R;
 
 
 public class Settings_Authentication extends OpenVpnPreferencesFragment implements OnPreferenceChangeListener, OnPreferenceClickListener {
diff --git a/src/de/blinkt/openvpn/Settings_Basic.java b/src/se/leap/openvpn/Settings_Basic.java
index 9c85094a..f3510da9 100644
--- a/src/de/blinkt/openvpn/Settings_Basic.java
+++ b/src/se/leap/openvpn/Settings_Basic.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -39,7 +39,8 @@ import android.widget.EditText;
 import android.widget.Spinner;
 import android.widget.TextView;
 import android.widget.ToggleButton;
-import de.blinkt.openvpn.R.id;
+import se.leap.leapclient.R.id;
+import se.leap.leapclient.R;
 
 public class Settings_Basic extends Fragment implements View.OnClickListener, OnItemSelectedListener, Callback {
 	private static final int CHOOSE_FILE_OFFSET = 1000;
diff --git a/src/de/blinkt/openvpn/Settings_IP.java b/src/se/leap/openvpn/Settings_IP.java
index d6fd19d4..df2efb40 100644
--- a/src/de/blinkt/openvpn/Settings_IP.java
+++ b/src/se/leap/openvpn/Settings_IP.java
@@ -1,4 +1,4 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
@@ -6,6 +6,7 @@ import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.PreferenceManager;
 import android.preference.SwitchPreference;
+import se.leap.leapclient.R;
 
 public class Settings_IP extends OpenVpnPreferencesFragment implements OnPreferenceChangeListener {
 		private EditTextPreference mIPv4;
diff --git a/src/de/blinkt/openvpn/Settings_Obscure.java b/src/se/leap/openvpn/Settings_Obscure.java
index 160dbe0c..ffbce971 100644
--- a/src/de/blinkt/openvpn/Settings_Obscure.java
+++ b/src/se/leap/openvpn/Settings_Obscure.java
@@ -1,4 +1,4 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
@@ -6,6 +6,7 @@ import android.preference.EditTextPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
+import se.leap.leapclient.R;
 
 public class Settings_Obscure extends OpenVpnPreferencesFragment implements OnPreferenceChangeListener {
 	private CheckBoxPreference mUseRandomHostName;
diff --git a/src/de/blinkt/openvpn/Settings_Routing.java b/src/se/leap/openvpn/Settings_Routing.java
index 202c45c1..48c09ff0 100644
--- a/src/de/blinkt/openvpn/Settings_Routing.java
+++ b/src/se/leap/openvpn/Settings_Routing.java
@@ -1,9 +1,10 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 import android.os.Bundle;
 import android.preference.CheckBoxPreference;
 import android.preference.EditTextPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
+import se.leap.leapclient.R;
 
 
 public class Settings_Routing extends OpenVpnPreferencesFragment implements OnPreferenceChangeListener {
diff --git a/src/de/blinkt/openvpn/ShowConfigFragment.java b/src/se/leap/openvpn/ShowConfigFragment.java
index dae83438..9bce67a6 100644
--- a/src/de/blinkt/openvpn/ShowConfigFragment.java
+++ b/src/se/leap/openvpn/ShowConfigFragment.java
@@ -1,4 +1,4 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import android.app.Fragment;
 import android.content.Intent;
@@ -10,6 +10,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import se.leap.leapclient.R;
 
 
 public class ShowConfigFragment extends Fragment {
diff --git a/src/de/blinkt/openvpn/VPNLaunchHelper.java b/src/se/leap/openvpn/VPNLaunchHelper.java
index 8389462a..59303748 100644
--- a/src/de/blinkt/openvpn/VPNLaunchHelper.java
+++ b/src/se/leap/openvpn/VPNLaunchHelper.java
@@ -1,9 +1,10 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import se.leap.leapclient.R;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/src/de/blinkt/openvpn/VPNPreferences.java b/src/se/leap/openvpn/VPNPreferences.java
index c49d39de..81d854ce 100644
--- a/src/de/blinkt/openvpn/VPNPreferences.java
+++ b/src/se/leap/openvpn/VPNPreferences.java
@@ -1,6 +1,7 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import java.util.List;
+import se.leap.leapclient.R;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
diff --git a/src/de/blinkt/openvpn/VPNProfileList.java b/src/se/leap/openvpn/VPNProfileList.java
index 1e24bfe7..a7132c9e 100644
--- a/src/de/blinkt/openvpn/VPNProfileList.java
+++ b/src/se/leap/openvpn/VPNProfileList.java
@@ -1,8 +1,9 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.TreeSet;
+import se.leap.leapclient.R;
 
 import android.app.Activity;
 import android.app.AlertDialog;
diff --git a/src/de/blinkt/openvpn/VpnProfile.java b/src/se/leap/openvpn/VpnProfile.java
index d8b22ae6..293a3d06 100644
--- a/src/de/blinkt/openvpn/VpnProfile.java
+++ b/src/se/leap/openvpn/VpnProfile.java
@@ -1,4 +1,4 @@
-package de.blinkt.openvpn;
+package se.leap.openvpn;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
@@ -20,6 +20,7 @@ import java.util.Vector;
 
 import org.spongycastle.util.io.pem.PemObject;
 import org.spongycastle.util.io.pem.PemWriter;
+import se.leap.leapclient.R;
 
 import android.content.Context;
 import android.content.Intent;
@@ -45,7 +46,7 @@ public class VpnProfile implements  Serializable{
 	public static final int TYPE_USERPASS_KEYSTORE = 7;
 
 	// Don't change this, not all parts of the program use this constant
-	public static final String EXTRA_PROFILEUUID = "de.blinkt.openvpn.profileUUID";
+	public static final String EXTRA_PROFILEUUID = "se.leap.openvpn.profileUUID";
 	public static final String INLINE_TAG = "[[INLINE]]";
 	private static final String OVPNCONFIGFILE = "android.conf";
 
@@ -471,7 +472,7 @@ public class VpnProfile implements  Serializable{
 		Vector<String> args = new Vector<String>();
 
 		// Add fixed paramenters
-		//args.add("/data/data/de.blinkt.openvpn/lib/openvpn");
+		//args.add("/data/data/se.leap.openvpn/lib/openvpn");
 		args.add(cacheDir.getAbsolutePath() +"/" + VpnProfile.MINIVPN);
 
 		args.add("--config");