From a4b1751da49fffa6ad144b230953a4a9cec7045d Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Wed, 18 Jul 2018 16:01:53 +0200
Subject: [PATCH] Don't try to lock screen orientation in
 SecurityTokenOperationActivity on Android 8.0

---
 ...curityTokenChangePinOperationActivity.java |  2 +-
 .../ui/SecurityTokenOperationActivity.java    |  2 +-
 .../keychain/util/OrientationUtils.java       | 44 +++++--------------
 3 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenChangePinOperationActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenChangePinOperationActivity.java
index b66cfe1b7..c383f6c84 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenChangePinOperationActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenChangePinOperationActivity.java
@@ -78,7 +78,7 @@ public class SecurityTokenChangePinOperationActivity extends BaseSecurityTokenAc
         nfcGuideView = findViewById(R.id.nfc_guide_view);
 
         // prevent annoying orientation changes while fumbling with the device
-        OrientationUtils.lockOrientation(this);
+        OrientationUtils.lockCurrentOrientation(this);
         // prevent close when touching outside of the dialog (happens easily when fumbling with the device)
         setFinishOnTouchOutside(false);
         // keep screen on
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
index 698d8b515..b767f2465 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
@@ -96,7 +96,7 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenActivity {
         nfcGuideView = findViewById(R.id.nfc_guide_view);
 
         // prevent annoying orientation changes while fumbling with the device
-        OrientationUtils.lockOrientation(this);
+        OrientationUtils.lockCurrentOrientation(this);
         // prevent close when touching outside of the dialog (happens easily when fumbling with the device)
         setFinishOnTouchOutside(false);
         // keep screen on
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/OrientationUtils.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/OrientationUtils.java
index 8d1c109c8..429b16248 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/OrientationUtils.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/OrientationUtils.java
@@ -17,39 +17,27 @@
 
 package org.sufficientlysecure.keychain.util;
 
+
 import android.app.Activity;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
 import android.content.res.Configuration;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
 import android.view.Display;
 import android.view.Surface;
 import android.view.WindowManager;
 
-/**
- * Static methods related to device orientation.
- */
 public class OrientationUtils {
-
-    /**
-     * Locks the device window in landscape mode.
-     */
-    public static void lockOrientationLandscape(Activity activity) {
-        activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-    }
-
-    /**
-     * Locks the device window in portrait mode.
-     */
-    public static void lockOrientationPortrait(Activity activity) {
-        activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
-    }
-
-    /**
-     * Locks the device window in actual screen mode.
-     */
-    public static void lockOrientation(Activity activity) {
-        Display display = ((WindowManager) activity.getSystemService(Context.WINDOW_SERVICE))
-                .getDefaultDisplay();
+    public static void lockCurrentOrientation(Activity activity) {
+        // locking orientation for non-fullscreen activities is restricted in *exactly* Android 8.0.
+        // see https://github.com/aosp-mirror/platform_frameworks_base/commit/39791594560b2326625b663ed6796882900c220f#diff-960c6fdd4a4b336d98b785268b2a78ff
+        // But apparently, they changed their mind in 8.1 again
+        // and https://github.com/aosp-mirror/platform_frameworks_base/commit/d4ecffae67fa0dea03c581ca26f76b87a14be763#diff-960c6fdd4a4b336d98b785268b2a78ff
+        if (VERSION.SDK_INT == VERSION_CODES.O) {
+            return;
+        }
+        Display display = ((WindowManager) activity.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
         int rotation = display.getRotation();
         int tempOrientation = activity.getResources().getConfiguration().orientation;
         int orientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
@@ -74,12 +62,4 @@ public class OrientationUtils {
         }
         activity.setRequestedOrientation(orientation);
     }
-
-    /**
-     * Unlocks the device window in user defined screen mode.
-     */
-    public static void unlockOrientation(Activity activity) {
-        activity.setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_USER);
-    }
-
 }
\ No newline at end of file