Rename OpenVpnService to OpenVPNService

--HG--
extra : rebase_source : 3b5415c5d7edd339768d84aa9bb02399c11a5f3a

10 files changed, 30 insertions, 32 deletions

diff --git a/main/src/main/AndroidManifest.xml b/main/src/main/AndroidManifest.xml
index 0f482b5f..5e8baa56 100644
--- a/main/src/main/AndroidManifest.xml
+++ b/main/src/main/AndroidManifest.xml
@@ -57,7 +57,7 @@
         </activity>
 
         <service
-            android:name="de.blinkt.openvpn.core.OpenVpnService"
+            android:name=".core.OpenVPNService"
             android:permission="android.permission.BIND_VPN_SERVICE" >
             <intent-filter>
                 <action android:name="android.net.VpnService" />
diff --git a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
index 679aa2fa..1ba74a97 100644
--- a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
+++ b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
@@ -43,7 +43,7 @@ import javax.crypto.IllegalBlockSizeException;
 import javax.crypto.NoSuchPaddingException;
 
 import de.blinkt.openvpn.core.NativeUtils;
-import de.blinkt.openvpn.core.OpenVpnService;
+import de.blinkt.openvpn.core.OpenVPNService;
 import de.blinkt.openvpn.core.VpnStatus;
 import de.blinkt.openvpn.core.X509Utils;
 
@@ -578,7 +578,7 @@ public class VpnProfile implements Serializable {
     public Intent prepareIntent(Context context) {
         String prefix = context.getPackageName();
 
-        Intent intent = new Intent(context, OpenVpnService.class);
+        Intent intent = new Intent(context, OpenVPNService.class);
 
         if (mAuthenticationType == VpnProfile.TYPE_KEYSTORE || mAuthenticationType == VpnProfile.TYPE_USERPASS_KEYSTORE) {
             if (getKeyStoreCertificates(context) == null)
diff --git a/main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java b/main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
index 2cd876b5..665603dc 100644
--- a/main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
+++ b/main/src/main/java/de/blinkt/openvpn/activities/DisconnectVPN.java
@@ -6,14 +6,14 @@ import android.content.*;
 import android.os.IBinder;
 
 import de.blinkt.openvpn.R;
-import de.blinkt.openvpn.core.OpenVpnService;
+import de.blinkt.openvpn.core.OpenVPNService;
 import de.blinkt.openvpn.core.ProfileManager;
 
 /**
  * Created by arne on 13.10.13.
  */
 public class DisconnectVPN extends Activity implements DialogInterface.OnClickListener{
-    protected OpenVpnService mService;
+    protected OpenVPNService mService;
 
     private ServiceConnection mConnection = new ServiceConnection() {
 
@@ -22,7 +22,7 @@ public class DisconnectVPN extends Activity implements DialogInterface.OnClickLi
         public void onServiceConnected(ComponentName className,
                                        IBinder service) {
             // We've bound to LocalService, cast the IBinder and get LocalService instance
-            OpenVpnService.LocalBinder binder = (OpenVpnService.LocalBinder) service;
+            OpenVPNService.LocalBinder binder = (OpenVPNService.LocalBinder) service;
             mService = binder.getService();
         }
 
@@ -36,8 +36,8 @@ public class DisconnectVPN extends Activity implements DialogInterface.OnClickLi
     @Override
     protected void onResume() {
         super.onResume();
-        Intent intent = new Intent(this, OpenVpnService.class);
-        intent.setAction(OpenVpnService.START_SERVICE);
+        Intent intent = new Intent(this, OpenVPNService.class);
+        intent.setAction(OpenVPNService.START_SERVICE);
         bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
         showDisconnectDialog();
     }
diff --git a/main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java
index 82b9f060..fa9fc5f9 100644
--- a/main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java
+++ b/main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java
@@ -21,11 +21,11 @@ import de.blinkt.openvpn.R;
 import de.blinkt.openvpn.VpnProfile;

 import de.blinkt.openvpn.core.ConfigParser;

 import de.blinkt.openvpn.core.ConfigParser.ConfigParseError;

+import de.blinkt.openvpn.core.OpenVPNService;

 import de.blinkt.openvpn.core.VpnStatus;

 import de.blinkt.openvpn.core.VpnStatus.ConnectionStatus;

 import de.blinkt.openvpn.core.VpnStatus.StateListener;

-import de.blinkt.openvpn.core.OpenVpnService;

-import de.blinkt.openvpn.core.OpenVpnService.LocalBinder;

+import de.blinkt.openvpn.core.OpenVPNService.LocalBinder;

 import de.blinkt.openvpn.core.ProfileManager;

 import de.blinkt.openvpn.core.VPNLaunchHelper;

 

@@ -37,7 +37,7 @@ public class ExternalOpenVPNService extends Service implements StateListener {
     final RemoteCallbackList<IOpenVPNStatusCallback> mCallbacks =

             new RemoteCallbackList<IOpenVPNStatusCallback>();

 

-    private OpenVpnService mService;

+    private OpenVPNService mService;

     private ExternalAppDatabase mExtAppDb;

 

 

@@ -65,8 +65,8 @@ public class ExternalOpenVPNService extends Service implements StateListener {
         VpnStatus.addStateListener(this);

         mExtAppDb = new ExternalAppDatabase(this);

 

-        Intent intent = new Intent(getBaseContext(), OpenVpnService.class);

-        intent.setAction(OpenVpnService.START_SERVICE);

+        Intent intent = new Intent(getBaseContext(), OpenVPNService.class);

+        intent.setAction(OpenVPNService.START_SERVICE);

 

         bindService(intent, mConnection, Context.BIND_AUTO_CREATE);

         mHandler.setService(this);

diff --git a/main/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java b/main/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java
index 41e8ff0a..ecd34ef7 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/DeviceStateReceiver.java
@@ -68,7 +68,7 @@ public class DeviceStateReceiver extends BroadcastReceiver implements ByteCountL
         if (windowtraffic < TRAFFIC_LIMIT) {

             screen = connectState.DISCONNECTED;

             VpnStatus.logInfo(R.string.screenoff_pause,

-                    OpenVpnService.humanReadableByteCount(TRAFFIC_LIMIT, false), TRAFFIC_WINDOW);

+                    OpenVPNService.humanReadableByteCount(TRAFFIC_LIMIT, false), TRAFFIC_WINDOW);

 

             mManagement.pause(getPauseReason());

         }

diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
index 28d10094..87f0d454 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVPNThread.java
@@ -33,11 +33,11 @@ public class OpenVPNThread implements Runnable {
     private String[] mArgv;

 	private Process mProcess;

 	private String mNativeDir;

-	private OpenVpnService mService;

+	private OpenVPNService mService;

 	private String mDumpPath;

 	private Map<String, String> mProcessEnv;

 

-	public OpenVPNThread(OpenVpnService service,String[] argv, Map<String,String> processEnv, String nativelibdir)

+	public OpenVPNThread(OpenVPNService service,String[] argv, Map<String,String> processEnv, String nativelibdir)

 	{

 		mArgv = argv;

 		mNativeDir = nativelibdir;

diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
index 3a37f5fb..2326a51c 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnManagementThread.java
@@ -36,7 +36,7 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
     private static final String TAG = "openvpn";

     private LocalSocket mSocket;

     private VpnProfile mProfile;

-    private OpenVpnService mOpenVPNService;

+    private OpenVPNService mOpenVPNService;

     private LinkedList<FileDescriptor> mFDList = new LinkedList<FileDescriptor>();

     private LocalServerSocket mServerSocket;

     private boolean mReleaseHold = true;

@@ -48,7 +48,7 @@ public class OpenVpnManagementThread implements Runnable, OpenVPNManagement {
 

     private pauseReason lastPauseReason = pauseReason.noNetwork;

 

-    public OpenVpnManagementThread(VpnProfile profile, OpenVpnService openVpnService) {

+    public OpenVpnManagementThread(VpnProfile profile, OpenVPNService openVpnService) {

         mProfile = profile;

         mOpenVPNService = openVpnService;

 

diff --git a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java
index a368edfe..09a2d91e 100644
--- a/main/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java
+++ b/main/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java
@@ -44,7 +44,7 @@ import static de.blinkt.openvpn.core.VpnStatus.ConnectionStatus.LEVEL_CONNECTED;
 import static de.blinkt.openvpn.core.VpnStatus.ConnectionStatus.LEVEL_CONNECTING_NO_SERVER_REPLY_YET;
 import static de.blinkt.openvpn.core.VpnStatus.ConnectionStatus.LEVEL_WAITING_FOR_USER_INPUT;
 
-public class OpenVpnService extends VpnService implements StateListener, Callback, ByteCountListener {
+public class OpenVPNService extends VpnService implements StateListener, Callback, ByteCountListener {
     public static final String START_SERVICE = "de.blinkt.openvpn.START_SERVICE";
     public static final String START_SERVICE_STICKY = "de.blinkt.openvpn.START_SERVICE_STICKY";
     public static final String ALWAYS_SHOW_NOTIFICATION = "de.blinkt.openvpn.NOTIFICATION_ALWAYS_VISIBLE";
@@ -209,7 +209,7 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
             nbuilder.addAction(android.R.drawable.ic_menu_close_clear_cancel,
                     getString(R.string.cancel_connection), disconnectPendingIntent);
 
-            Intent pauseVPN = new Intent(this, OpenVpnService.class);
+            Intent pauseVPN = new Intent(this, OpenVPNService.class);
             if (mDeviceStateReceiver == null || !mDeviceStateReceiver.isUserPaused()) {
                 pauseVPN.setAction(PAUSE_VPN);
                 PendingIntent pauseVPNPending = PendingIntent.getService(this, 0, pauseVPN, 0);
@@ -401,7 +401,7 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
     private OpenVPNManagement instantiateOpenVPN3Core() {
         try {
             Class cl = Class.forName("de.blinkt.openvpn.core.OpenVPNThreadv3");
-            return (OpenVPNManagement) cl.getConstructor(OpenVpnService.class,VpnProfile.class).newInstance(this,mProfile);
+            return (OpenVPNManagement) cl.getConstructor(OpenVPNService.class,VpnProfile.class).newInstance(this,mProfile);
         } catch (IllegalArgumentException e) {
             e.printStackTrace();
         } catch (InstantiationException e) {
@@ -767,9 +767,9 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
     }
 
     public class LocalBinder extends Binder {
-        public OpenVpnService getService() {
+        public OpenVPNService getService() {
             // Return this instance of LocalService so clients can call public methods
-            return OpenVpnService.this;
+            return OpenVPNService.this;
         }
     }
 }
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
index 5e48e72b..c387e8f5 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/LogFragment.java
@@ -51,7 +51,7 @@ import de.blinkt.openvpn.activities.DisconnectVPN;
 import de.blinkt.openvpn.activities.MainActivity;
 import de.blinkt.openvpn.activities.VPNPreferences;
 import de.blinkt.openvpn.core.OpenVPNManagement;
-import de.blinkt.openvpn.core.OpenVpnService;
+import de.blinkt.openvpn.core.OpenVPNService;
 import de.blinkt.openvpn.core.ProfileManager;
 import de.blinkt.openvpn.core.VpnStatus;
 import de.blinkt.openvpn.core.VpnStatus.ConnectionStatus;
@@ -59,7 +59,7 @@ import de.blinkt.openvpn.core.VpnStatus.LogItem;
 import de.blinkt.openvpn.core.VpnStatus.LogListener;
 import de.blinkt.openvpn.core.VpnStatus.StateListener;
 
-import static de.blinkt.openvpn.core.OpenVpnService.humanReadableByteCount;
+import static de.blinkt.openvpn.core.OpenVPNService.humanReadableByteCount;
 
 public class LogFragment extends ListFragment implements StateListener, SeekBar.OnSeekBarChangeListener, RadioGroup.OnCheckedChangeListener, VpnStatus.ByteCountListener {
 	private static final String LOGTIMEFORMAT = "logtimeformat";
@@ -499,8 +499,8 @@ public class LogFragment extends ListFragment implements StateListener, SeekBar.
 		super.onResume();
 		VpnStatus.addStateListener(this);
         VpnStatus.addByteCountListener(this);
-        Intent intent = new Intent(getActivity(), OpenVpnService.class);
-        intent.setAction(OpenVpnService.START_SERVICE);
+        Intent intent = new Intent(getActivity(), OpenVPNService.class);
+        intent.setAction(OpenVPNService.START_SERVICE);
 
     }
 
diff --git a/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java b/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
index 6d3dce69..e595106c 100644
--- a/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
+++ b/main/src/ovpn3/java/de/blinkt/openvpn/core/OpenVPNThreadv3.java
@@ -14,9 +14,7 @@ import net.openvpn.ovpn3.ClientAPI_TransportStats;
 import java.lang.Override;
 
 import de.blinkt.openvpn.VpnProfile;
-import de.blinkt.openvpn.core.OpenVPNManagement;
-import de.blinkt.openvpn.core.OpenVpnService;
-import de.blinkt.openvpn.core.VpnStatus;
+
 import android.content.Context;
 
 public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable, OpenVPNManagement {
@@ -29,7 +27,7 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable
 	}
 
 	private VpnProfile mVp;
-	private OpenVpnService mService;
+	private OpenVPNService mService;
 
 	class StatusPoller implements  Runnable 
 	{
@@ -224,7 +222,7 @@ public class OpenVPNThreadv3 extends ClientAPI_OpenVPNClient implements Runnable
 
 	}
 
-	public OpenVPNThreadv3(OpenVpnService openVpnService, VpnProfile vp) {
+	public OpenVPNThreadv3(OpenVPNService openVpnService, VpnProfile vp) {
 		init_process();
 		mVp =vp;
 		mService =openVpnService;