From 512d77e01130389c2dee2061372f0c7248044663 Mon Sep 17 00:00:00 2001 From: FlukiestEmperor Date: Thu, 23 Apr 2020 22:21:28 -0500 Subject: [PATCH 1/2] Remove unreachable code Since the compile sdk is 19, the if check is always true since it's checking 19 >= 17. This also removes the need for the success boolean which would always be true. --- .../main/java/io/openrct2/MainActivity.java | 32 ++----------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/src/openrct2-android/app/src/main/java/io/openrct2/MainActivity.java b/src/openrct2-android/app/src/main/java/io/openrct2/MainActivity.java index 6a3f5f0c40..5b2368417c 100644 --- a/src/openrct2-android/app/src/main/java/io/openrct2/MainActivity.java +++ b/src/openrct2-android/app/src/main/java/io/openrct2/MainActivity.java @@ -28,8 +28,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; public class MainActivity extends AppCompatActivity { @@ -65,34 +63,8 @@ public class MainActivity extends AppCompatActivity { DisplayMetrics metrics = new DisplayMetrics(); display.getMetrics(metrics); - - boolean success = false; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) { - display.getRealSize(pixelSize); - display.getRealMetrics(metrics); - - success = true; - } else { - try { - Method getRawHeight = Display.class.getMethod("getRawHeight"); - Method getRawWidth = Display.class.getMethod("getRawWidth"); - pixelSize.x = (Integer) getRawWidth.invoke(display); - pixelSize.y = (Integer) getRawHeight.invoke(display); - - success = true; - } catch (NoSuchMethodException e) { - e.printStackTrace(); - } catch (InvocationTargetException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - } - - if (!success) { - // Fall back to viewport size - display.getSize(pixelSize); - } + display.getRealSize(pixelSize); + display.getRealMetrics(metrics); int rotation = display.getRotation(); if (rotation == Surface.ROTATION_90 || rotation == Surface.ROTATION_270) { From 944e61d4465ba68b337426ed1bc587195beb77a6 Mon Sep 17 00:00:00 2001 From: FlukiestEmperor Date: Thu, 23 Apr 2020 22:23:51 -0500 Subject: [PATCH 2/2] Add missing nullable annotations --- .../app/src/main/java/io/openrct2/MainActivity.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/openrct2-android/app/src/main/java/io/openrct2/MainActivity.java b/src/openrct2-android/app/src/main/java/io/openrct2/MainActivity.java index 5b2368417c..f1a6498bec 100644 --- a/src/openrct2-android/app/src/main/java/io/openrct2/MainActivity.java +++ b/src/openrct2-android/app/src/main/java/io/openrct2/MainActivity.java @@ -8,6 +8,8 @@ import android.graphics.Point; import android.graphics.PointF; import android.os.Build; import android.os.Bundle; + +import androidx.annotation.NonNull; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; import androidx.appcompat.app.AppCompatActivity; @@ -35,7 +37,10 @@ public class MainActivity extends AppCompatActivity { private boolean assetsCopied = false; @Override - public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { + public void onRequestPermissionsResult( + int requestCode, + @NonNull String[] permissions, + @NonNull int[] grantResults) { super.onRequestPermissionsResult(requestCode, permissions, grantResults); if (hasRequiredPermissions()) {