From: DeaDDooMER <deaddoomer@deadsoftware.ru>
Date: Sun, 4 Mar 2018 15:27:34 +0000 (+0300)
Subject: Fix crash on android 4.1
X-Git-Url: http://deadsoftware.ru/gitweb?p=d2df-sdl.git;a=commitdiff_plain;h=c2c92502388d8ac34c0f64c124cad68d6b142796

Fix crash on android 4.1
---

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index e4b81a3..c1be474 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -29,7 +29,8 @@
                  android:icon="@drawable/ic_launcher"
                  android:allowBackup="true"
                  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-                 android:hardwareAccelerated="true" >
+                 android:hardwareAccelerated="true"
+                 android:debuggable="true" >
         <activity android:name="Doom2DF"
                   android:label="Doom2D Forever"
                   android:configChanges="keyboardHidden|orientation|screenSize"
diff --git a/android/README b/android/README
index af6f4fc..e99a2f6 100644
--- a/android/README
+++ b/android/README
@@ -8,7 +8,7 @@ Building
 
 Requirements:
 * Android SDK build-tools >= 19.1.0;
-* Android SDK platforms >= android-19;
+* Android SDK platforms >= android-16;
 * Android NDK >= r16b;
 * Open JDK >= 8;
 * FPC >= 3.0.4;
@@ -79,4 +79,4 @@ jarsigner -sigalg SHA1withRSA -digestalg SHA1 \
         bin/d2df.unsigned.apk androiddebugkey
 ```
 
-Where ${ANDROID_JAR} is path to android.jar file. Typically placed in ~/Android/android-sdk/platforms/android-19/android.jar.
+Where ${ANDROID_JAR} is path to android.jar file. Typically placed in ~/Android/android-sdk/platforms/android-16/android.jar.
diff --git a/android/src/org/libsdl/app/SDLActivity.java b/android/src/org/libsdl/app/SDLActivity.java
index 9119473..57f931e 100644
--- a/android/src/org/libsdl/app/SDLActivity.java
+++ b/android/src/org/libsdl/app/SDLActivity.java
@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.Arrays;
 import java.lang.reflect.Method;
-import java.util.Objects;
 
 import android.app.*;
 import android.content.*;
@@ -542,7 +541,7 @@ public class SDLActivity extends Activity {
     {
       int orientation = -1;
 
-      if (!Objects.equals(hint, "")) {
+      if (hint != null && !hint.equals("")) {
          if (hint.contains("LandscapeRight") && hint.contains("LandscapeLeft")) {
             orientation = ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
          } else if (hint.contains("LandscapeRight")) {
diff --git a/android/src/org/libsdl/app/SDLControllerManager.java b/android/src/org/libsdl/app/SDLControllerManager.java
index 3629442..1f21eab 100644
--- a/android/src/org/libsdl/app/SDLControllerManager.java
+++ b/android/src/org/libsdl/app/SDLControllerManager.java
@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
-import java.util.Objects;
 
 import android.content.Context;
 import android.os.*;
@@ -266,7 +265,7 @@ class SDLJoystickHandler_API16 extends SDLJoystickHandler_API12 {
     public String getJoystickDescriptor(InputDevice joystickDevice) {
         String desc = joystickDevice.getDescriptor();
 
-        if (desc != null && !Objects.equals(desc, "")) {
+        if (desc != null && !desc.equals("")) {
             return desc;
         }