Minor fixes, clean up

12 files changed, 6 insertions, 21 deletions

diff --git a/app/src/main/java/com/clusterrr/usbserialtelnetserver/MainActivity.java b/app/src/main/java/com/clusterrr/usbserialtelnetserver/MainActivity.java
index a860941..aba4ea3 100644
--- a/app/src/main/java/com/clusterrr/usbserialtelnetserver/MainActivity.java
+++ b/app/src/main/java/com/clusterrr/usbserialtelnetserver/MainActivity.java
@@ -1,13 +1,9 @@
 package com.clusterrr.usbserialtelnetserver;
 
-import static android.hardware.usb.UsbManager.EXTRA_PERMISSION_GRANTED;
-import static android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON;
-
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 
 import android.Manifest;
-import android.annotation.TargetApi;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -33,7 +29,6 @@ import com.hoho.android.usbserial.driver.UsbSerialDriver;
 import com.hoho.android.usbserial.driver.UsbSerialPort;
 import com.hoho.android.usbserial.driver.UsbSerialProber;
 
-import java.text.ParseException;
 import java.util.List;
 
 public class MainActivity extends AppCompatActivity implements View.OnClickListener, UsbSerialTelnetService.IOnStopListener {
@@ -71,8 +66,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 
         Intent serviceIntent = new Intent(this, UsbSerialTelnetService.class);
         bindService(serviceIntent, serviceConnection, 0); // in case it's service already started
-        Intent intent = getIntent();
-        //if (intent != null) onNewIntent(intent);
 
         updateSettings();
     }
@@ -81,7 +74,9 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         if (intent != null) {
-            if (intent.getBooleanExtra(UsbSerialTelnetService.KEY_NEED_TO_START, false)) {
+            // Start service if need
+            if ((intent.getAction() == UsbSerialTelnetService.ACTION_NEED_TO_START) &&
+                    (!(mServiceBinder != null && mServiceBinder.isStarted()))) {
                 // Test that permission is granted
                 UsbManager manager = (UsbManager) getSystemService(Context.USB_SERVICE);
                 List<UsbSerialDriver> availableDrivers = UsbSerialProber.getDefaultProber().findAllDrivers(manager);
diff --git a/app/src/main/java/com/clusterrr/usbserialtelnetserver/UsbSerialTelnetService.java b/app/src/main/java/com/clusterrr/usbserialtelnetserver/UsbSerialTelnetService.java
index d7749ff..1d0e2fa 100644
--- a/app/src/main/java/com/clusterrr/usbserialtelnetserver/UsbSerialTelnetService.java
+++ b/app/src/main/java/com/clusterrr/usbserialtelnetserver/UsbSerialTelnetService.java
@@ -22,28 +22,19 @@ import androidx.core.app.NotificationCompat;
 import com.hoho.android.usbserial.driver.UsbSerialDriver;
 import com.hoho.android.usbserial.driver.UsbSerialPort;
 import com.hoho.android.usbserial.driver.UsbSerialProber;
-import com.hoho.android.usbserial.util.SerialInputOutputManager;
 
 import java.io.IOException;
 import java.net.Inet4Address;
-import java.net.Inet6Address;
 import java.net.InetAddress;
-import java.net.InetSocketAddress;
 import java.net.InterfaceAddress;
 import java.net.NetworkInterface;
 import java.net.ServerSocket;
-import java.net.SocketAddress;
-import java.nio.charset.StandardCharsets;
 import java.util.Enumeration;
 import java.util.List;
 
 public class UsbSerialTelnetService extends Service {
     final static String TAG = "UsbSerialTelnet";
-    final static String KEY_NEED_TO_START = "need_to_start";
-//    final static String START_INTENT = "com.clusterrr.usbserialtelnetserver.START";
-//    final static String STOP_INTENT = "com.clusterrr.usbserialtelnetserver.STOP";
-//    final static String STARTED_INTENT = "com.clusterrr.usbserialtelnetserver.STARTED";
-//    final static String STOPPED_INTENT = "com.clusterrr.usbserialtelnetserver.STOPPED";
+    final static String ACTION_NEED_TO_START = "need_to_start";
     final static String KEY_TCP_PORT = "tcp_port";
     final static String KEY_BAUD_RATE = "baud_rate";
     final static String KEY_DATA_BITS = "data_bits";
@@ -90,8 +81,7 @@ public class UsbSerialTelnetService extends Service {
                 if (connection == null) {
                     message = null; // "Please grant permission and try again";
                     Intent mainActivityStartIntent = new Intent(this, MainActivity.class);
-                    mainActivityStartIntent.putExtra(KEY_NEED_TO_START, true);
-                    mainActivityStartIntent.setAction(KEY_NEED_TO_START);
+                    mainActivityStartIntent.setAction(ACTION_NEED_TO_START);
                     PendingIntent mainActivityStartPendingIntent = PendingIntent.getActivity(this, 0, mainActivityStartIntent, PendingIntent.FLAG_IMMUTABLE);
                     manager.requestPermission(driver.getDevice(), mainActivityStartPendingIntent);
                 } else {
@@ -128,7 +118,7 @@ public class UsbSerialTelnetService extends Service {
         }
         Notification notification = new NotificationCompat.Builder(this, TAG)
                 .setOngoing(true)
-                .setSmallIcon(R.mipmap.ic_notification)
+                .setSmallIcon(R.drawable.ic_notification)
                 .setLargeIcon(BitmapFactory.decodeResource(this.getResources(), R.mipmap.ic_launcher))
                 .setContentTitle(message)
                 .setPriority(NotificationCompat.PRIORITY_DEFAULT)
diff --git a/app/src/main/res/drawable-hdpi/ic_notification.png b/app/src/main/res/drawable-hdpi/ic_notification.png
new file mode 100644
index 0000000..8aca717
--- /dev/null
+++ b/app/src/main/res/drawable-hdpi/ic_notification.png
diff --git a/app/src/main/res/drawable-mdpi/ic_notification.png b/app/src/main/res/drawable-mdpi/ic_notification.png
new file mode 100644
index 0000000..3717e44
--- /dev/null
+++ b/app/src/main/res/drawable-mdpi/ic_notification.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_notification.png b/app/src/main/res/drawable-xhdpi/ic_notification.png
new file mode 100644
index 0000000..9d0f0c6
--- /dev/null
+++ b/app/src/main/res/drawable-xhdpi/ic_notification.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_notification.png b/app/src/main/res/drawable-xxhdpi/ic_notification.png
new file mode 100644
index 0000000..5043ae3
--- /dev/null
+++ b/app/src/main/res/drawable-xxhdpi/ic_notification.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_notification.png b/app/src/main/res/drawable-xxxhdpi/ic_notification.png
new file mode 100644
index 0000000..262e860
--- /dev/null
+++ b/app/src/main/res/drawable-xxxhdpi/ic_notification.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_notification.png b/app/src/main/res/mipmap-hdpi/ic_notification.png
deleted file mode 100644
index 052830e..0000000
--- a/app/src/main/res/mipmap-hdpi/ic_notification.png
+++ /dev/null
diff --git a/app/src/main/res/mipmap-mdpi/ic_notification.png b/app/src/main/res/mipmap-mdpi/ic_notification.png
deleted file mode 100644
index 5a7430c..0000000
--- a/app/src/main/res/mipmap-mdpi/ic_notification.png
+++ /dev/null
diff --git a/app/src/main/res/mipmap-xhdpi/ic_notification.png b/app/src/main/res/mipmap-xhdpi/ic_notification.png
deleted file mode 100644
index caa5017..0000000
--- a/app/src/main/res/mipmap-xhdpi/ic_notification.png
+++ /dev/null
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_notification.png b/app/src/main/res/mipmap-xxhdpi/ic_notification.png
deleted file mode 100644
index 6407767..0000000
--- a/app/src/main/res/mipmap-xxhdpi/ic_notification.png
+++ /dev/null
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_notification.png b/app/src/main/res/mipmap-xxxhdpi/ic_notification.png
deleted file mode 100644
index f116fa9..0000000
--- a/app/src/main/res/mipmap-xxxhdpi/ic_notification.png
+++ /dev/null