From 123119866a0c1ede284488def8edac866df9cf4d Mon Sep 17 00:00:00 2001
From: Laurent <laurent@staxriver.com>
Date: Thu, 6 Jun 2019 12:50:36 +0200
Subject: [PATCH] Fixes Oreo crash when tapping on the Feed plus button

---
 app/src/main/AndroidManifest.xml                       | 10 +++++-----
 .../android/ui/activity/NewDataMenuActivity.kt         |  7 +++++++
 .../ui/activity/components/PokerAnalyticsActivity.kt   |  2 ++
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c296be62..ab69d755 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -58,10 +58,10 @@
 			android:screenOrientation="portrait"
 			android:windowSoftInputMode="adjustNothing" />
 
+		<!-- No screenOrientation="portrait" to fix Oreo crash -->
 		<activity
 			android:name="net.pokeranalytics.android.ui.activity.NewDataMenuActivity"
 			android:launchMode="singleTop"
-			android:screenOrientation="portrait"
 			android:theme="@style/PokerAnalyticsTheme.MenuDialog" />
 
 		<activity
@@ -144,10 +144,10 @@
 			android:launchMode="singleTop"
 			android:screenOrientation="portrait" />
 
-		<activity
-			android:name="net.pokeranalytics.android.ui.activity.TableReportActivity"
-			android:launchMode="singleTop"
-			android:screenOrientation="portrait" />
+			<activity
+				android:name="net.pokeranalytics.android.ui.activity.TableReportActivity"
+				android:launchMode="singleTop"
+				android:screenOrientation="portrait" />
 
 		<meta-data
 			android:name="preloaded_fonts"
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/NewDataMenuActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/NewDataMenuActivity.kt
index ac7570b2..089d3609 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/NewDataMenuActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/NewDataMenuActivity.kt
@@ -4,6 +4,8 @@ import android.animation.Animator
 import android.animation.AnimatorListenerAdapter
 import android.content.Context
 import android.content.Intent
+import android.content.pm.ActivityInfo
+import android.os.Build
 import android.os.Bundle
 import android.view.View
 import android.view.ViewAnimationUtils
@@ -33,6 +35,11 @@ class NewDataMenuActivity : PokerAnalyticsActivity() {
 
 	override fun onCreate(savedInstanceState: Bundle?) {
 		super.onCreate(savedInstanceState)
+
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { // used to fix Oreo crash
+			setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+		}
+
 		setContentView(net.pokeranalytics.android.R.layout.activity_new_data)
 		initUI()
 	}
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/components/PokerAnalyticsActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/components/PokerAnalyticsActivity.kt
index 77b324f0..f72d90b2 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/components/PokerAnalyticsActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/components/PokerAnalyticsActivity.kt
@@ -1,6 +1,7 @@
 package net.pokeranalytics.android.ui.activity.components
 
 import android.Manifest.permission.ACCESS_FINE_LOCATION
+import android.content.pm.ActivityInfo
 import android.content.pm.PackageManager
 import android.os.Bundle
 import android.os.PersistableBundle
@@ -33,6 +34,7 @@ open class PokerAnalyticsActivity : AppCompatActivity() {
 	override fun onCreate(savedInstanceState: Bundle?, persistentState: PersistableBundle?) {
 		super.onCreate(savedInstanceState, persistentState)
 		Crashlytics.log("$this.localClassName onCreate")
+		requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT // fixes crash
 	}
 
 	override fun onResume() {