Compare commits

...

3 Commits

Author SHA1 Message Date
elasota
4182a1a107 Bump version to 1.1.3 2022-06-22 21:31:46 -04:00
elasota
5643f464cc Discard security exception on getSerialNumber, fixes Android USB gamepad crash. 2022-06-22 21:29:55 -04:00
elasota
a04c5f10df Reject zip archives with non-zero file count but empty central directory 2022-06-22 21:28:28 -04:00
4 changed files with 16 additions and 6 deletions

View File

@@ -15,8 +15,8 @@ android {
}
minSdkVersion 16
targetSdkVersion 30
versionCode 16
versionName "1.1.2"
versionCode 17
versionName "1.1.3"
externalNativeBuild {
ndkBuild {
arguments "APP_PLATFORM=android-16"

View File

@@ -2,8 +2,8 @@
#define GP_BUILD_VERSION_MAJOR 1
#define GP_BUILD_VERSION_MINOR 1
#define GP_BUILD_VERSION_UPDATE 2
#define GP_BUILD_VERSION_UPDATE 3
#define GP_APPLICATION_VERSION_STRING "1.1.2"
#define GP_APPLICATION_COPYRIGHT_STRING "2019-2021 Gale Force Games LLC"
#define GP_APPLICATION_VERSION_STRING "1.1.3"
#define GP_APPLICATION_COPYRIGHT_STRING "2019-2022 Gale Force Games LLC"
#define GP_APPLICATION_WEBSITE_STRING "https://github.com/elasota/Aerofoil"

View File

@@ -324,6 +324,11 @@ namespace PortabilityLayer
return nullptr;
}
}
else
{
if (numFiles != 0)
return nullptr;
}
bool failed = false;

View File

@@ -53,7 +53,12 @@ class HIDDeviceUSB implements HIDDevice {
public String getSerialNumber() {
String result = null;
if (Build.VERSION.SDK_INT >= 21) {
result = mDevice.getSerialNumber();
try {
result = mDevice.getSerialNumber();
}
catch (SecurityException exception) {
//Log.w(TAG, "App permissions mean we cannot get serial number for device " + getDeviceName() + " message: " + exception.getMessage());
}
}
if (result == null) {
result = "";