Clean code

forcetech/src/main/java/com/forcetech/service/P2PService.java

@@ -1,34 +1,11 @@
 package com.forcetech.service;
 
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
 import com.forcetech.Util;
-import com.forcetech.android.ForceTV;
-import com.gsoft.mitv.LocalBinder;
-
-public class P2PService extends Service {
-
-    private ForceTV forceTV;
-    private IBinder binder;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        binder = new LocalBinder();
-    }
 
-    @Override
-    public IBinder onBind(Intent intent) {
-        forceTV = new ForceTV();
-        forceTV.start(intent.getStringExtra("path"), Util.P2P);
-        return binder;
-    }
+public class P2PService extends PxPService {
 
     @Override
-    public boolean onUnbind(Intent intent) {
-        if (forceTV != null) forceTV.stop();
-        return super.onUnbind(intent);
+    public int getPort() {
+        return Util.P2P;
     }
 }

forcetech/src/main/java/com/forcetech/service/P3PService.java

@@ -1,34 +1,11 @@
 package com.forcetech.service;
 
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
 import com.forcetech.Util;
-import com.forcetech.android.ForceTV;
-import com.gsoft.mitv.LocalBinder;
-
-public class P3PService extends Service {
-
-    private ForceTV forceTV;
-    private IBinder binder;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        binder = new LocalBinder();
-    }
 
-    @Override
-    public IBinder onBind(Intent intent) {
-        forceTV = new ForceTV();
-        forceTV.start(intent.getStringExtra("path"), Util.P3P);
-        return binder;
-    }
+public class P3PService extends PxPService {
 
     @Override
-    public boolean onUnbind(Intent intent) {
-        if (forceTV != null) forceTV.stop();
-        return super.onUnbind(intent);
+    public int getPort() {
+        return Util.P3P;
     }
 }

forcetech/src/main/java/com/forcetech/service/P4PService.java

@@ -1,34 +1,11 @@
 package com.forcetech.service;
 
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
 import com.forcetech.Util;
-import com.forcetech.android.ForceTV;
-import com.gsoft.mitv.LocalBinder;
-
-public class P4PService extends Service {
-
-    private ForceTV forceTV;
-    private IBinder binder;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        binder = new LocalBinder();
-    }
 
-    @Override
-    public IBinder onBind(Intent intent) {
-        forceTV = new ForceTV();
-        forceTV.start(intent.getStringExtra("path"), Util.P4P);
-        return binder;
-    }
+public class P4PService extends PxPService {
 
     @Override
-    public boolean onUnbind(Intent intent) {
-        if (forceTV != null) forceTV.stop();
-        return super.onUnbind(intent);
+    public int getPort() {
+        return Util.P4P;
     }
 }

forcetech/src/main/java/com/forcetech/service/P5PService.java

@@ -1,34 +1,11 @@
 package com.forcetech.service;
 
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
 import com.forcetech.Util;
-import com.forcetech.android.ForceTV;
-import com.gsoft.mitv.LocalBinder;
-
-public class P5PService extends Service {
-
-    private ForceTV forceTV;
-    private IBinder binder;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        binder = new LocalBinder();
-    }
 
-    @Override
-    public IBinder onBind(Intent intent) {
-        forceTV = new ForceTV();
-        forceTV.start(intent.getStringExtra("path"), Util.P5P);
-        return binder;
-    }
+public class P5PService extends PxPService {
 
     @Override
-    public boolean onUnbind(Intent intent) {
-        if (forceTV != null) forceTV.stop();
-        return super.onUnbind(intent);
+    public int getPort() {
+        return Util.P5P;
     }
 }

forcetech/src/main/java/com/forcetech/service/P6PService.java

@@ -1,34 +1,11 @@
 package com.forcetech.service;
 
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
 import com.forcetech.Util;
-import com.forcetech.android.ForceTV;
-import com.gsoft.mitv.LocalBinder;
-
-public class P6PService extends Service {
-
-    private ForceTV forceTV;
-    private IBinder binder;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        binder = new LocalBinder();
-    }
 
-    @Override
-    public IBinder onBind(Intent intent) {
-        forceTV = new ForceTV();
-        forceTV.start(intent.getStringExtra("path"), Util.P6P);
-        return binder;
-    }
+public class P6PService extends PxPService {
 
     @Override
-    public boolean onUnbind(Intent intent) {
-        if (forceTV != null) forceTV.stop();
-        return super.onUnbind(intent);
+    public int getPort() {
+        return Util.P6P;
     }
 }

forcetech/src/main/java/com/forcetech/service/P7PService.java

@@ -1,34 +1,11 @@
 package com.forcetech.service;
 
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
 import com.forcetech.Util;
-import com.forcetech.android.ForceTV;
-import com.gsoft.mitv.LocalBinder;
-
-public class P7PService extends Service {
-
-    private ForceTV forceTV;
-    private IBinder binder;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        binder = new LocalBinder();
-    }
 
-    @Override
-    public IBinder onBind(Intent intent) {
-        forceTV = new ForceTV();
-        forceTV.start(intent.getStringExtra("path"), Util.P7P);
-        return binder;
-    }
+public class P7PService extends PxPService {
 
     @Override
-    public boolean onUnbind(Intent intent) {
-        if (forceTV != null) forceTV.stop();
-        return super.onUnbind(intent);
+    public int getPort() {
+        return Util.P7P;
     }
 }

forcetech/src/main/java/com/forcetech/service/P8PService.java

@@ -1,34 +1,11 @@
 package com.forcetech.service;
 
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
 import com.forcetech.Util;
-import com.forcetech.android.ForceTV;
-import com.gsoft.mitv.LocalBinder;
-
-public class P8PService extends Service {
-
-    private ForceTV forceTV;
-    private IBinder binder;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        binder = new LocalBinder();
-    }
 
-    @Override
-    public IBinder onBind(Intent intent) {
-        forceTV = new ForceTV();
-        forceTV.start(intent.getStringExtra("path"), Util.P8P);
-        return binder;
-    }
+public class P8PService extends PxPService {
 
     @Override
-    public boolean onUnbind(Intent intent) {
-        if (forceTV != null) forceTV.stop();
-        return super.onUnbind(intent);
+    public int getPort() {
+        return Util.P8P;
     }
 }

forcetech/src/main/java/com/forcetech/service/P9PService.java

@@ -1,34 +1,11 @@
 package com.forcetech.service;
 
-import android.app.Service;
-import android.content.Intent;
-import android.os.IBinder;
-
 import com.forcetech.Util;
-import com.forcetech.android.ForceTV;
-import com.gsoft.mitv.LocalBinder;
-
-public class P9PService extends Service {
-
-    private ForceTV forceTV;
-    private IBinder binder;
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        binder = new LocalBinder();
-    }
 
-    @Override
-    public IBinder onBind(Intent intent) {
-        forceTV = new ForceTV();
-        forceTV.start(intent.getStringExtra("path"), Util.P9P);
-        return binder;
-    }
+public class P9PService extends PxPService {
 
     @Override
-    public boolean onUnbind(Intent intent) {
-        if (forceTV != null) forceTV.stop();
-        return super.onUnbind(intent);
+    public int getPort() {
+        return Util.P9P;
     }
 }

forcetech/src/main/java/com/forcetech/service/PxPService.java

@@ -0,0 +1,35 @@
+package com.forcetech.service;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+import com.forcetech.android.ForceTV;
+import com.gsoft.mitv.LocalBinder;
+
+public abstract class PxPService extends Service {
+
+    private ForceTV forceTV;
+    private IBinder binder;
+
+    public abstract int getPort();
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        binder = new LocalBinder();
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        forceTV = new ForceTV();
+        forceTV.start(intent.getStringExtra("path"), getPort());
+        return binder;
+    }
+
+    @Override
+    public boolean onUnbind(Intent intent) {
+        if (forceTV != null) forceTV.stop();
+        return super.onUnbind(intent);
+    }
+}