Merge Laurent updates

app/src/main/java/net/pokeranalytics/android/model/realm/Filter.kt

@@ -48,12 +48,13 @@ open class Filter : RealmObject(), RowRepresentable, Editable, Deletable, Counta
 		}
 
 		inline fun <reified T : Filterable> queryOn(realm: Realm, query: Query, sortField: String? = null): RealmResults<T> {
-			val realmQuery = realm.where<T>()
+			val rootQuery = realm.where<T>()
+			var realmQuery = query.queryWith(rootQuery)
 			sortField?.let {
-				return query.queryWith(realmQuery).sort(it).findAll()
+				realmQuery = realmQuery.sort(it)
-			} ?: run {
-				return query.queryWith(realmQuery).findAll()
 			}
+			val desc = realmQuery.description
+			return realmQuery.findAll()
 		}
 	}
 

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
@@ -36,6 +38,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(R.layout.activity_new_data)
 		initUI()
 	}