diff --git a/forcetech/src/main/java/com/forcetech/service/P2PService.java b/forcetech/src/main/java/com/forcetech/service/P2PService.java index 827d9e624..944915ad4 100644 --- a/forcetech/src/main/java/com/forcetech/service/P2PService.java +++ b/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; } } diff --git a/forcetech/src/main/java/com/forcetech/service/P3PService.java b/forcetech/src/main/java/com/forcetech/service/P3PService.java index bccac570e..69efb7b31 100644 --- a/forcetech/src/main/java/com/forcetech/service/P3PService.java +++ b/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; } } diff --git a/forcetech/src/main/java/com/forcetech/service/P4PService.java b/forcetech/src/main/java/com/forcetech/service/P4PService.java index 33069ecea..c92f92d3f 100644 --- a/forcetech/src/main/java/com/forcetech/service/P4PService.java +++ b/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; } } diff --git a/forcetech/src/main/java/com/forcetech/service/P5PService.java b/forcetech/src/main/java/com/forcetech/service/P5PService.java index 13065a55b..6de159736 100644 --- a/forcetech/src/main/java/com/forcetech/service/P5PService.java +++ b/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; } } diff --git a/forcetech/src/main/java/com/forcetech/service/P6PService.java b/forcetech/src/main/java/com/forcetech/service/P6PService.java index d31455e70..7c0cb724a 100644 --- a/forcetech/src/main/java/com/forcetech/service/P6PService.java +++ b/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; } } diff --git a/forcetech/src/main/java/com/forcetech/service/P7PService.java b/forcetech/src/main/java/com/forcetech/service/P7PService.java index a64317012..4c0d74bc5 100644 --- a/forcetech/src/main/java/com/forcetech/service/P7PService.java +++ b/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; } } diff --git a/forcetech/src/main/java/com/forcetech/service/P8PService.java b/forcetech/src/main/java/com/forcetech/service/P8PService.java index 5145374ae..e653e05fd 100644 --- a/forcetech/src/main/java/com/forcetech/service/P8PService.java +++ b/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; } } diff --git a/forcetech/src/main/java/com/forcetech/service/P9PService.java b/forcetech/src/main/java/com/forcetech/service/P9PService.java index b8871a7aa..733c3d9e4 100644 --- a/forcetech/src/main/java/com/forcetech/service/P9PService.java +++ b/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; } } diff --git a/forcetech/src/main/java/com/forcetech/service/PxPService.java b/forcetech/src/main/java/com/forcetech/service/PxPService.java new file mode 100644 index 000000000..84d7ae580 --- /dev/null +++ b/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); + } +} \ No newline at end of file