From 2c104cf650052b544edc384f55798aacb44efbeb Mon Sep 17 00:00:00 2001
From: Javier <dev.git@javispedro.com>
Date: Sun, 16 Feb 2020 23:52:36 +0100
Subject: fix non-sticky service

---
 .../main/java/com/javispedro/vndroid/SettingsActivity.java   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'app/src/main/java/com/javispedro/vndroid/SettingsActivity.java')

diff --git a/app/src/main/java/com/javispedro/vndroid/SettingsActivity.java b/app/src/main/java/com/javispedro/vndroid/SettingsActivity.java
index 676af3d..f595eac 100644
--- a/app/src/main/java/com/javispedro/vndroid/SettingsActivity.java
+++ b/app/src/main/java/com/javispedro/vndroid/SettingsActivity.java
@@ -2,7 +2,6 @@ package com.javispedro.vndroid;
 
 import android.app.Activity;
 import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.media.projection.MediaProjectionManager;
@@ -83,7 +82,6 @@ public class SettingsActivity extends AppCompatActivity {
         }
 
         private void setServerEnabled(boolean state) {
-            Log.d(TAG, "setServerEnabled: " + state);
             ServerService server = serverConnection.getServer();
             if (state) {
                 if (server == null) {
@@ -183,12 +181,18 @@ public class SettingsActivity extends AppCompatActivity {
 
         public void bind(Activity activity, ServerService.ServerStatusCallback callback) {
             this.callback = callback;
-            activity.bindService(new Intent(activity, ServerService.class), this, Context.BIND_AUTO_CREATE);
+            Intent intent = new Intent(activity, ServerService.class);
+            intent.setAction(ServerService.ACTION_INIT_SERVICE);
+            activity.startService(intent);
+            activity.bindService(intent, this, 0);
         }
 
         public void close(Activity activity) {
-            server.setServerStatusCallback(null);
+            if (server != null) {
+                server.setServerStatusCallback(null);
+            }
             activity.unbindService(this);
+            callback = null;
         }
 
         public boolean connected() {
-- 
cgit v1.2.3