summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.project2
-rw-r--r--AndroidManifest.xml44
-rw-r--r--README.txt6
-rw-r--r--openvpn/src/openvpn/breakpad.cpp2
-rw-r--r--project.properties2
-rw-r--r--res/layout/basic_settings.xml18
-rw-r--r--res/values/untranslatable.xml4
-rw-r--r--res/xml/main_headers.xml8
-rw-r--r--res/xml/vpn_headers.xml12
-rw-r--r--src/se/leap/openvpn/AboutFragment.java (renamed from src/de/blinkt/openvpn/AboutFragment.java)3
-rw-r--r--src/se/leap/openvpn/CIDRIP.java (renamed from src/de/blinkt/openvpn/CIDRIP.java)2
-rw-r--r--src/se/leap/openvpn/ConfigConverter.java (renamed from src/de/blinkt/openvpn/ConfigConverter.java)7
-rw-r--r--src/se/leap/openvpn/ConfigParser.java (renamed from src/de/blinkt/openvpn/ConfigParser.java)2
-rw-r--r--src/se/leap/openvpn/FaqFragment.java (renamed from src/de/blinkt/openvpn/FaqFragment.java)3
-rw-r--r--src/se/leap/openvpn/FileProvider.java (renamed from src/de/blinkt/openvpn/FileProvider.java)3
-rw-r--r--src/se/leap/openvpn/FileSelect.java (renamed from src/de/blinkt/openvpn/FileSelect.java)9
-rw-r--r--src/se/leap/openvpn/FileSelectLayout.java (renamed from src/de/blinkt/openvpn/FileSelectLayout.java)3
-rw-r--r--src/se/leap/openvpn/FileSelectionFragment.java (renamed from src/de/blinkt/openvpn/FileSelectionFragment.java)3
-rw-r--r--src/se/leap/openvpn/GeneralSettings.java (renamed from src/de/blinkt/openvpn/GeneralSettings.java)3
-rw-r--r--src/se/leap/openvpn/InlineFileTab.java (renamed from src/de/blinkt/openvpn/InlineFileTab.java)3
-rw-r--r--src/se/leap/openvpn/LaunchVPN.java (renamed from src/de/blinkt/openvpn/LaunchVPN.java)9
-rw-r--r--src/se/leap/openvpn/LogWindow.java (renamed from src/de/blinkt/openvpn/LogWindow.java)9
-rw-r--r--src/se/leap/openvpn/MainActivity.java (renamed from src/de/blinkt/openvpn/MainActivity.java)3
-rw-r--r--src/se/leap/openvpn/NetworkSateReceiver.java (renamed from src/de/blinkt/openvpn/NetworkSateReceiver.java)3
-rw-r--r--src/se/leap/openvpn/OnBootReceiver.java (renamed from src/de/blinkt/openvpn/OnBootReceiver.java)2
-rw-r--r--src/se/leap/openvpn/OpenVPN.java (renamed from src/de/blinkt/openvpn/OpenVPN.java)3
-rw-r--r--src/se/leap/openvpn/OpenVPNThread.java (renamed from src/de/blinkt/openvpn/OpenVPNThread.java)5
-rw-r--r--src/se/leap/openvpn/OpenVpnManagementThread.java (renamed from src/de/blinkt/openvpn/OpenVpnManagementThread.java)3
-rw-r--r--src/se/leap/openvpn/OpenVpnPreferencesFragment.java (renamed from src/de/blinkt/openvpn/OpenVpnPreferencesFragment.java)3
-rw-r--r--src/se/leap/openvpn/OpenVpnService.java (renamed from src/de/blinkt/openvpn/OpenVpnService.java)7
-rw-r--r--src/se/leap/openvpn/ProfileManager.java (renamed from src/de/blinkt/openvpn/ProfileManager.java)3
-rw-r--r--src/se/leap/openvpn/ProxyDetection.java (renamed from src/de/blinkt/openvpn/ProxyDetection.java)3
-rw-r--r--src/se/leap/openvpn/SendDumpActivity.java (renamed from src/de/blinkt/openvpn/SendDumpActivity.java)7
-rw-r--r--src/se/leap/openvpn/Settings_Authentication.java (renamed from src/de/blinkt/openvpn/Settings_Authentication.java)3
-rw-r--r--src/se/leap/openvpn/Settings_Basic.java (renamed from src/de/blinkt/openvpn/Settings_Basic.java)5
-rw-r--r--src/se/leap/openvpn/Settings_IP.java (renamed from src/de/blinkt/openvpn/Settings_IP.java)3
-rw-r--r--src/se/leap/openvpn/Settings_Obscure.java (renamed from src/de/blinkt/openvpn/Settings_Obscure.java)3
-rw-r--r--src/se/leap/openvpn/Settings_Routing.java (renamed from src/de/blinkt/openvpn/Settings_Routing.java)3
-rw-r--r--src/se/leap/openvpn/ShowConfigFragment.java (renamed from src/de/blinkt/openvpn/ShowConfigFragment.java)3
-rw-r--r--src/se/leap/openvpn/VPNLaunchHelper.java (renamed from src/de/blinkt/openvpn/VPNLaunchHelper.java)3
-rw-r--r--src/se/leap/openvpn/VPNPreferences.java (renamed from src/de/blinkt/openvpn/VPNPreferences.java)3
-rw-r--r--src/se/leap/openvpn/VPNProfileList.java (renamed from src/de/blinkt/openvpn/VPNProfileList.java)3
-rw-r--r--src/se/leap/openvpn/VpnProfile.java (renamed from src/de/blinkt/openvpn/VpnProfile.java)7
43 files changed, 130 insertions, 105 deletions
diff --git a/.project b/.project
index b9e0fd8f..1a0e1cda 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>icsopenvpn</name>
+ <name>leap_android</name>
<comment></comment>
<projects>
</projects>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 07fbde8a..b4df9219 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="de.blinkt.openvpn"
+ package="se.leap.leapclient"
android:versionCode="57"
android:versionName="0.5.29" >
@@ -33,7 +33,7 @@
android:targetSdkVersion="15" />
<permission
- android:name="de.blinkt.openvpn.REMOTE_API"
+ android:name="se.leap.openvpn.REMOTE_API"
android:description="@string/permission_description"
android:label="Control OpenVPN"
android:permissionGroup="android.permission-group.NETWORK"
@@ -43,16 +43,16 @@
android:allowBackup="true"
android:icon="@drawable/icon"
android:label="@string/app" >
- <activity android:name=".AboutFragment" />
+ <activity android:name="se.leap.openvpn.AboutFragment" />
<activity
- android:name=".VPNPreferences"
+ android:name="se.leap.openvpn.VPNPreferences"
android:windowSoftInputMode="stateHidden" />
<activity
- android:name=".LogWindow"
+ android:name="se.leap.openvpn.LogWindow"
android:label="@string/openvpn_log" />
- <activity android:name=".SendDumpActivity" />
- <activity android:name=".FileSelect" />
- <activity android:name=".MainActivity" >
+ <activity android:name="se.leap.openvpn.SendDumpActivity" />
+ <activity android:name="se.leap.openvpn.FileSelect" />
+ <activity android:name="se.leap.openvpn.MainActivity" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -62,36 +62,36 @@
</activity>
<service
- android:name=".OpenVpnService"
+ android:name="se.leap.openvpn.OpenVpnService"
android:permission="android.permission.BIND_VPN_SERVICE" >
<intent-filter>
<action android:name="android.net.VpnService" />
</intent-filter>
</service>
<service
- android:name=".api.ExternalOpenVPNService"
- android:permission="de.blinkt.openvpn.REMOTE_API" >
+ android:name="se.leap.openvpn.api.ExternalOpenVPNService"
+ android:permission="se.leap.openvpn.REMOTE_API" >
<intent-filter>
- <action android:name="de.blinkt.openvpn.api.IOpenVPNAPIService" />
+ <action android:name="se.leap.openvpn.api.IOpenVPNAPIService" />
</intent-filter>
</service>
<activity
- android:name=".api.GrantPermissionsActivity"
- android:permission="de.blinkt.openvpn.REMOTE_API" >
+ android:name="se.leap.openvpn.api.GrantPermissionsActivity"
+ android:permission="se.leap.openvpn.REMOTE_API" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
</activity>
- <receiver android:name=".OnBootReceiver" >
+ <receiver android:name="se.leap.openvpn.OnBootReceiver" >
<intent-filter>
<action android:name="android.intent.action.BOOT_COMPLETED" />
</intent-filter>
</receiver>
<activity
- android:name=".ConfigConverter"
+ android:name="se.leap.openvpn.ConfigConverter"
android:label="Convert Config File" >
<intent-filter android:label="@string/import_config" >
<action android:name="android.intent.action.VIEW" />
@@ -121,7 +121,7 @@
</intent-filter>
</activity>
<activity
- android:name=".LaunchVPN"
+ android:name="se.leap.openvpn.LaunchVPN"
android:label="@string/vpn_launch_title" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -131,9 +131,9 @@
</activity>
<activity-alias
- android:name=".app.CreateShortcuts"
+ android:name="se.leap.openvpn.app.CreateShortcuts"
android:label="@string/vpn_shortcut"
- android:targetActivity=".LaunchVPN" >
+ android:targetActivity="se.leap.openvpn.LaunchVPN" >
<intent-filter>
<action android:name="android.intent.action.CREATE_SHORTCUT" />
@@ -142,10 +142,10 @@
</activity-alias>
<provider
- android:name=".FileProvider"
- android:authorities="de.blinkt.openvpn.FileProvider"
+ android:name="se.leap.openvpn.FileProvider"
+ android:authorities="se.leap.openvpn.FileProvider"
android:exported="true"
android:grantUriPermissions="true" />
</application>
-</manifest> \ No newline at end of file
+</manifest>
diff --git a/README.txt b/README.txt
index 4a2c6bd4..17b9f50a 100644
--- a/README.txt
+++ b/README.txt
@@ -28,10 +28,10 @@ public class StartOpenVPNActivity extends Activity {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
- final String EXTRA_NAME = "de.blinkt.openvpn.shortcutProfileName";
+ final String EXTRA_NAME = "se.leap.openvpn.shortcutProfileName";
Intent shortcutIntent = new Intent(Intent.ACTION_MAIN);
- shortcutIntent.setClassName("de.blinkt.openvpn", "de.blinkt.openvpn.LaunchVPN");
+ shortcutIntent.setClassName("se.leap.openvpn", "se.leap.openvpn.LaunchVPN");
shortcutIntent.putExtra(EXTRA_NAME,"upb ssl");
startActivity(shortcutIntent);
}
@@ -39,5 +39,5 @@ public class StartOpenVPNActivity extends Activity {
or from the shell:
-am start -a android.intent.action.MAIN -n de.blinkt.openvpn/.LaunchVPN -e de.blinkt.openvpn.shortcutProfileName Home
+am start -a android.intent.action.MAIN -n se.leap.openvpn/.LaunchVPN -e se.leap.openvpn.shortcutProfileName Home
diff --git a/openvpn/src/openvpn/breakpad.cpp b/openvpn/src/openvpn/breakpad.cpp
index cfcc10a8..77c469f3 100644
--- a/openvpn/src/openvpn/breakpad.cpp
+++ b/openvpn/src/openvpn/breakpad.cpp
@@ -19,7 +19,7 @@ static google_breakpad::ExceptionHandler* eh;
void breakpad_setup(void)
{
printf("Initializing Google Breakpad!\n");
- desc = new google_breakpad::MinidumpDescriptor("/data/data/de.blinkt.openvpn/cache");
+ desc = new google_breakpad::MinidumpDescriptor("/data/data/se.leap.openvpn/cache");
eh = new google_breakpad::ExceptionHandler(*desc, NULL, DumpCallback, NULL, true,-1);
}
diff --git a/project.properties b/project.properties
index c4f09d2b..895c9ce2 100644
--- a/project.properties
+++ b/project.properties
@@ -8,4 +8,4 @@
# project structure.
# Project target.
-target=android-17
+target=android-16
diff --git a/res/layout/basic_settings.xml b/res/layout/basic_settings.xml
index d37bc37a..d56f6ad5 100644
--- a/res/layout/basic_settings.xml
+++ b/res/layout/basic_settings.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:blinkt="http://schemas.android.com/apk/res/de.blinkt.openvpn"
+ xmlns:leap="http://schemas.android.com/apk/res/se.leap.leapclient"
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
@@ -122,11 +122,11 @@
android:orientation="vertical"
android:visibility="gone" >
- <de.blinkt.openvpn.FileSelectLayout
+ <se.leap.openvpn.FileSelectLayout
android:id="@+id/caselect"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- blinkt:title="@string/ca_title" />
+ leap:title="@string/ca_title" />
</LinearLayout>
<LinearLayout
@@ -136,17 +136,17 @@
android:orientation="vertical"
android:visibility="gone" >
- <de.blinkt.openvpn.FileSelectLayout
+ <se.leap.openvpn.FileSelectLayout
android:id="@+id/certselect"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- blinkt:title="@string/client_certificate_title" />
+ leap:title="@string/client_certificate_title" />
- <de.blinkt.openvpn.FileSelectLayout
+ <se.leap.openvpn.FileSelectLayout
android:id="@+id/keyselect"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- blinkt:title="@string/client_key_title" />
+ leap:title="@string/client_key_title" />
<LinearLayout
android:id="@+id/key_password_layout"
@@ -179,11 +179,11 @@
android:orientation="vertical"
android:visibility="gone" >
- <de.blinkt.openvpn.FileSelectLayout
+ <se.leap.openvpn.FileSelectLayout
android:id="@+id/pkcs12select"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- blinkt:title="@string/client_pkcs12_title" />
+ leap:title="@string/client_pkcs12_title" />
<TextView
style="@style/item"
diff --git a/res/values/untranslatable.xml b/res/values/untranslatable.xml
index 48f77d98..79271141 100644
--- a/res/values/untranslatable.xml
+++ b/res/values/untranslatable.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="copyright_blinktgui" translatable="false">Copyright 2012\nArne Schwabe &lt;arne@rfc2549.org></string>
+ <string name="copyright_blinktgui" translatable="false">Copyright 2012\nLEAP &lt;info@leap.se></string>
<string name="opevpn_copyright" translatable="false">Copyright © 2002–2010 OpenVPN Technologies, Inc. &lt;sales@openvpn.net>\n
"OpenVPN" is a trademark of OpenVPN Technologies, Inc.\n</string>
@@ -41,4 +41,4 @@
<item>-1</item>
</string-array>
-</resources> \ No newline at end of file
+</resources>
diff --git a/res/xml/main_headers.xml b/res/xml/main_headers.xml
index 92740382..1ee238ea 100644
--- a/res/xml/main_headers.xml
+++ b/res/xml/main_headers.xml
@@ -2,18 +2,18 @@
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android" >
<header
- android:fragment="de.blinkt.openvpn.VPNProfileList"
+ android:fragment="se.leap.openvpn.VPNProfileList"
android:summary="@string/vpn_list_summary"
android:title="@string/vpn_list_title" />
<header
- android:fragment="de.blinkt.openvpn.GeneralSettings"
+ android:fragment="se.leap.openvpn.GeneralSettings"
android:title="@string/generalsettings" />
<header
- android:fragment="de.blinkt.openvpn.FaqFragment"
+ android:fragment="se.leap.openvpn.FaqFragment"
android:summary="@string/faq_summary"
android:title="@string/faq" />
<header
- android:fragment="de.blinkt.openvpn.AboutFragment"
+ android:fragment="se.leap.openvpn.AboutFragment"
android:summary="@string/about_summary"
android:title="@string/about" />
diff --git a/res/xml/vpn_headers.xml b/res/xml/vpn_headers.xml
index 495c2c72..96b49bf8 100644
--- a/res/xml/vpn_headers.xml
+++ b/res/xml/vpn_headers.xml
@@ -3,28 +3,28 @@
<header
android:id="@+id/basicsettingsid"
- android:fragment="de.blinkt.openvpn.Settings_Basic"
+ android:fragment="se.leap.openvpn.Settings_Basic"
android:title="@string/basic" />
<!-- android:icon="@drawable/ic_settings_applications" -->
<header
- android:fragment="de.blinkt.openvpn.Settings_IP"
+ android:fragment="se.leap.openvpn.Settings_IP"
android:title="@string/ipdns" />
<header
- android:fragment="de.blinkt.openvpn.Settings_Routing"
+ android:fragment="se.leap.openvpn.Settings_Routing"
android:title="@string/routing" />
<header
- android:fragment="de.blinkt.openvpn.Settings_Authentication"
+ android:fragment="se.leap.openvpn.Settings_Authentication"
android:title="@string/settings_auth" />
<!-- android:icon="@drawable/ic_settings_display" -->
<header
- android:fragment="de.blinkt.openvpn.Settings_Obscure"
+ android:fragment="se.leap.openvpn.Settings_Obscure"
android:summary="@string/obscure"
android:title="@string/advanced" >
</header>
<header
- android:fragment="de.blinkt.openvpn.ShowConfigFragment"
+ android:fragment="se.leap.openvpn.ShowConfigFragment"
android:summary="@string/generated_config_summary"
android:title="@string/generated_config" />
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");