Merge pull request #13 from rMozg/disconnect_crash_fix

Disconnect crash fix

Author: thenixan

app/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion 22
         targetSdkVersion 25
         versionCode 2
-        versionName "0.1.0"
+        versionName "0.1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/java/ru/evotor/devices/commons/DeviceServiceConnector.java

@@ -61,27 +61,15 @@ public static void startInitConnections(final Context appContext, final boolean
 
         DeviceServiceConnector.context = appContext;
 
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                printerService.initConnection(context, force);
-            }
-        }).start();
-
+        printerService.startInitConnection(context, force);
     }
 
 
     public static void startDeinitConnections() {
         if (context == null) {
             return;
         }
-
-        new Thread(new Runnable() {
-            @Override
-            public void run() {
-                printerService.deInitConnection();
-            }
-        }).start();
+        printerService.startDeinitConnection();
     }
 
     public static void processException(Exception exc) throws DeviceServiceException {

app/src/main/java/ru/evotor/devices/commons/services/AbstractService.java

@@ -10,7 +10,9 @@ public abstract class AbstractService {
 
     protected Context context;
 
-    protected abstract void initConnection(Context appContext, boolean force);
+    protected abstract void startInitConnection(Context appContext, boolean force);
+
+    protected abstract void startDeinitConnection();
 
     protected abstract Boolean getServiceConnected();
 
@@ -26,7 +28,7 @@ public void waitInitService(Context context) throws ServiceNotConnectedException
         Boolean connected = this.getServiceConnected();
 
         if (connected == null || !connected) {
-            this.initConnection(context, false);
+            this.startInitConnection(context, false);
         }
 
         while ((connected = this.getServiceConnected()) == null) {

app/src/main/java/ru/evotor/devices/commons/services/PrinterService.java

@@ -41,7 +41,7 @@ public void onServiceConnected(ComponentName name, IBinder binder) {
         public void onServiceDisconnected(ComponentName name) {
             service = null;
             serviceConnected = false;
-            initConnection(context, false);
+            startInitConnection(context, false);
             for (ConnectionWrapper connectionWrapper : DeviceServiceConnector.getConnectionWrappers()) {
                 connectionWrapper.onPrinterServiceDisconnected();
             }
@@ -56,36 +56,45 @@ public Boolean getServiceConnected() {
         return serviceConnected;
     }
 
-    public void initConnection(Context appContext, boolean force) {
-        DeviceServiceOperationOnMainThreadException.throwIfMainThread();
-
-        if (appContext == null) {
-            return;
-        }
-        context = appContext;
-        if (service == null || force) {
-            Intent pr = new Intent(ACTION_PRINTER_SERVICE);
-            pr.setPackage(TARGET_PACKAGE);
-            pr.setClassName(TARGET_PACKAGE, TARGET_CLASS_NAME);
-            serviceConnected = null;
-            boolean serviceBound = context.bindService(pr, serviceConnection, Service.BIND_AUTO_CREATE);
-            if (!serviceBound) {
-                serviceConnected = false;
+    @Override
+    public void startInitConnection(final Context appContext, final boolean force) {
+        new Thread() {
+            @Override
+            public void run() {
+                if (appContext == null) {
+                    return;
+                }
+
+                context = appContext;
+                if (service == null || force) {
+                    Intent pr = new Intent(ACTION_PRINTER_SERVICE);
+                    pr.setPackage(TARGET_PACKAGE);
+                    pr.setClassName(TARGET_PACKAGE, TARGET_CLASS_NAME);
+                    serviceConnected = null;
+                    boolean serviceBound = context.bindService(pr, serviceConnection, Service.BIND_AUTO_CREATE);
+                    if (!serviceBound) {
+                        serviceConnected = false;
+                    }
+                }
             }
-        }
+        }.start();
     }
 
-    public void deInitConnection() {
-        DeviceServiceOperationOnMainThreadException.throwIfMainThread();
-
-        if (context == null) {
-            return;
-        }
-        context.unbindService(serviceConnection);
-        service = null;
-        for (ConnectionWrapper connectionWrapper : DeviceServiceConnector.getConnectionWrappers()) {
-            connectionWrapper.onPrinterServiceDisconnected();
-        }
+    @Override
+    public void startDeinitConnection() {
+        new Thread() {
+            @Override
+            public void run() {
+                if (context == null) {
+                    return;
+                }
+                context.unbindService(serviceConnection);
+                service = null;
+                for (ConnectionWrapper connectionWrapper : DeviceServiceConnector.getConnectionWrappers()) {
+                    connectionWrapper.onPrinterServiceDisconnected();
+                }
+            }
+        }.start();
     }
 
     public int getAllowableSymbolsLineLength(int deviceId) throws DeviceServiceException {