From 051a33ab18116f63ef497b6c7269be10e2692022 Mon Sep 17 00:00:00 2001
From: marc barbier <mmarc471@gmail.com>
Date: Sat, 9 Jan 2021 13:07:27 +0100
Subject: [PATCH] =?UTF-8?q?patch=20crash=20au=20d=C3=A9marage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                           | 3 ++-
 .../com/iutlaval/myapplication/Game/GameLogicThread.java   | 3 +++
 .../main/java/com/iutlaval/myapplication/GameActivity.java | 7 ++++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c5a1658..82d6f87 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,8 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".GameActivity">
+        <activity android:name=".GameActivity"
+            android:screenOrientation="landscape">
             <intent-filter>
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java
index d98388a..9657eef 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java
+++ b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java
@@ -554,6 +554,9 @@ public class GameLogicThread extends Thread{
         interrupt();
     }
 
+    /**
+     * déclanche une demande de debut de tours
+     */
     public void requestEndTurn() {
         if(isYourMainPhase || isYourBattlePhase)
         {
diff --git a/app/src/main/java/com/iutlaval/myapplication/GameActivity.java b/app/src/main/java/com/iutlaval/myapplication/GameActivity.java
index ee315cd..7494de3 100644
--- a/app/src/main/java/com/iutlaval/myapplication/GameActivity.java
+++ b/app/src/main/java/com/iutlaval/myapplication/GameActivity.java
@@ -6,7 +6,6 @@ import android.app.Activity;
 import android.content.pm.ActivityInfo;
 import android.os.Build;
 import android.os.Bundle;
-import android.view.Display;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
@@ -37,9 +36,11 @@ public class GameActivity extends Activity {
                 decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN);
         }
 
+        //changement d'orientation sur des telephones moderne
+        if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
+        }
 
-        setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-        Display display = getWindowManager().getDefaultDisplay();
 
         String deck = getIntent().getStringExtra("DECK");