improve lifecyle of clients

steinwurf · Dec 13, 2017 · f3620c7 · f3620c7
1 parent c34f643
commit f3620c7
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 24 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-
     repositories {
         google()
         jcenter()

diff --git a/client/src/main/java/com/steinwurf/score/client_reference/audio/AudioClientActivity.java b/client/src/main/java/com/steinwurf/score/client_reference/audio/AudioClientActivity.java
@@ -76,6 +76,13 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     protected void onStart() {
         super.onStart();
+        if (keepAlive != null)
+            keepAlive.start();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
         startStopToggleButton.setOnCheckedChangeListener((buttonView, isChecked) -> {
             buttonView.setEnabled(false);
 
@@ -93,18 +100,24 @@ protected void onStart() {
                 lookingForSeverLinearLayout.setVisibility(View.VISIBLE);
             }
         });
-        if (keepAlive != null)
-            keepAlive.start();
     }
 
     @Override
     protected void onStop() {
         super.onStop();
-        client.stop();
         if (keepAlive != null)
             keepAlive.stop();
     }
 
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (isFinishing()) {
+            client.stop();
+            backgroundHandler.stop();
+        }
+    }
+
     private class ClientOnEventListener implements Client.OnEventListener {
         @Override
         public void onError(String reason) {

diff --git a/client/src/main/java/com/steinwurf/score/client_reference/video/VideoClientActivity.java b/client/src/main/java/com/steinwurf/score/client_reference/video/VideoClientActivity.java
@@ -126,6 +126,13 @@ protected void onCreate(Bundle savedInstanceState) {
     @Override
     protected void onStart() {
         super.onStart();
+        if (keepAlive != null)
+            keepAlive.start();
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
         startStopToggleButton.setOnCheckedChangeListener((buttonView, isChecked) -> {
             buttonView.setEnabled(false);
 
@@ -143,18 +150,25 @@ protected void onStart() {
                 lookingForSeverLinearLayout.setVisibility(View.VISIBLE);
             }
         });
-        if (keepAlive != null)
-            keepAlive.start();
     }
 
     @Override
     protected void onStop() {
         super.onStop();
-        client.stop();
         if (keepAlive != null)
             keepAlive.stop();
     }
 
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (isFinishing()) {
+            client.stop();
+            backgroundHandler.stop();
+        }
+    }
+
     /**
      * Hides the UI of the application
      */

diff --git a/client/src/main/res/values-v21/booleans.xml b/client/src/main/res/values-v21/booleans.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <bool name="sdk_version_16_available">true</bool>
-</resources>
+</resources>
diff --git a/client/src/main/res/values/booleans.xml b/client/src/main/res/values/booleans.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <bool name="sdk_version_16_available">false</bool>
-</resources>
+</resources>
diff --git a/server/src/main/java/com/steinwurf/score/server_reference/video/CameraActivity.java b/server/src/main/java/com/steinwurf/score/server_reference/video/CameraActivity.java
@@ -20,7 +20,6 @@
 import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
-import android.widget.Toast;
 import android.widget.ToggleButton;
 
 import com.steinwurf.score.server_reference.R;
@@ -80,12 +79,6 @@ public class CameraActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            Toast.makeText(this, "This application requires SDK level 21", Toast.LENGTH_SHORT).show();
-            finish();
-            return;
-        }
-
         setContentView(R.layout.activity_main);
         startStopToggleButton = findViewById(R.id.startStopToggleButton);
         backgroundHandler.start();

diff --git a/server/src/main/java/com/steinwurf/score/server_reference/video/ScreenCaptureActivity.java b/server/src/main/java/com/steinwurf/score/server_reference/video/ScreenCaptureActivity.java
@@ -81,12 +81,6 @@ public class ScreenCaptureActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-            Toast.makeText(this, "This application requires SDK level 21", Toast.LENGTH_SHORT).show();
-            finish();
-            return;
-        }
-
         setContentView(R.layout.activity_main);
 
         startStopToggleButton = findViewById(R.id.startStopToggleButton);

diff --git a/server/src/main/res/values-v21/booleans.xml b/server/src/main/res/values-v21/booleans.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <bool name="sdk_version_21_available">true</bool>
-</resources>
+</resources>
diff --git a/server/src/main/res/values/booleans.xml b/server/src/main/res/values/booleans.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <bool name="sdk_version_21_available">false</bool>
-</resources>
+</resources>