From 8dc463c388b6cd7b601381f63c9fa1eb129e1235 Mon Sep 17 00:00:00 2001
From: Ruben <rubenvandeven@gmail.com>
Date: Wed, 29 Mar 2017 19:38:19 +0200
Subject: [PATCH] Kiosk goes to main menu after 60s no face found during game

---
 app/build.gradle                              |  4 ++--
 app/src/main/AndroidManifest.xml              |  5 -----
 .../emotionhero/GamingActivity.java           | 22 +++++++++++++++++++
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9a4aa11..3dd3a39 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId 'com.rubenvandeven.emotion_hero.kiosk'
         minSdkVersion 16
         targetSdkVersion 24
-        versionCode 7
-        versionName '0.9'
+        versionCode 8
+        versionName '1.0'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         renderscriptTargetApi 16
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7e5196f..de01c2e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,11 +28,6 @@
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/app_name"
             android:theme="@style/FullscreenTheme">
-
-            <!-- <intent-filter> -->
-            <!-- <action android:name="android.intent.action.MAIN" /> -->
-            <!-- <category android:name="android.intent.category.LAUNCHER" /> -->
-            <!-- </intent-filter> -->
         </activity>
         <activity
             android:name=".IntroActivity"
diff --git a/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java b/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java
index b7ce971..df5288c 100644
--- a/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java
+++ b/app/src/main/java/com/rubenvandeven/emotionhero/GamingActivity.java
@@ -35,6 +35,8 @@ import com.affectiva.android.affdex.sdk.detector.Face;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Timer;
+import java.util.TimerTask;
 
 
 /**
@@ -73,6 +75,8 @@ public class GamingActivity extends AppCompatActivity implements Detector.ImageL
 
     protected boolean isStarted = false;
 
+    protected Timer timeoutTimer;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -315,6 +319,11 @@ public class GamingActivity extends AppCompatActivity implements Detector.ImageL
         setText("START!");
         currentScenario.lostFace = false;
 
+        // in kioskmode, if no face is found for 60s return to main screen
+        if(timeoutTimer != null) {
+            timeoutTimer.cancel();
+        }
+
         if(isStarted)
             currentScenario.start();
     }
@@ -324,6 +333,19 @@ public class GamingActivity extends AppCompatActivity implements Detector.ImageL
     {
         currentScenario.pause();
         currentScenario.lostFace = true;
+
+        // in kioskmode, if no face is found for 60s return to main screen
+        timeoutTimer = new Timer();
+        TimerTask timeoutTimerTask = new TimerTask() {
+            @Override
+            public void run() {
+                Intent intent = new Intent(GamingActivity.this, MirrorMenuActivity.class);
+                intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+                intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                startActivity(intent);
+            }
+        };
+        timeoutTimer.schedule(timeoutTimerTask, 60*1000);
     }
 
     public void setText(String text)