Skip to content

Commit

Permalink
winter cleaning
Browse files Browse the repository at this point in the history
  • Loading branch information
irov committed Jan 4, 2024
1 parent ffc0022 commit 43a43e5
Show file tree
Hide file tree
Showing 283 changed files with 2,588 additions and 1,831 deletions.
2 changes: 1 addition & 1 deletion cmake/Android_SDL/Mengine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEPREFETCHER ON OFF "MENGINE_PLUGIN_RESOURCEPREF
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCECONVERT OFF OFF "MENGINE_PLUGIN_RESOURCECONVERT")
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEDEBUGGER OFF OFF "MENGINE_PLUGIN_RESOURCEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_NODEDEBUGGER OFF OFF "MENGINE_PLUGIN_NODEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUFLOADER ON OFF "MENGINE_PLUGIN_METABUFLOADER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUF ON OFF "MENGINE_PLUGIN_METABUF")
ADD_PLUGIN(MENGINE_PLUGIN_IMAGE_CODEC ON OFF "MENGINE_PLUGIN_IMAGE_CODEC")
ADD_PLUGIN(MENGINE_PLUGIN_WAV ON OFF "MENGINE_PLUGIN_WAV")
ADD_PLUGIN(MENGINE_PLUGIN_AMPLIFIER ON OFF "MENGINE_PLUGIN_AMPLIFIER")
Expand Down
2 changes: 1 addition & 1 deletion cmake/Dependencies/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
CMAKE_MINIMUM_REQUIRED(VERSION 3.10)

MENGINE_ENABLE_DEPENDENCE(MENGINE_DEPENDENCE_XMLSAX "xmlsax" ON)
MENGINE_ENABLE_DEPENDENCE(MENGINE_DEPENDENCE_LZ4 "lz4" ON)
Expand Down
4 changes: 2 additions & 2 deletions cmake/Dependencies/ae/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
CMAKE_MINIMUM_REQUIRED(VERSION 3.10)

project( ae )

SET( SOURCE_DIR ${THIRDPARTY_DIR}/AE )
Expand Down
2 changes: 1 addition & 1 deletion cmake/Dependencies/libjpeg/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
CMAKE_MINIMUM_REQUIRED(VERSION 3.10)

project(jpeg)

Expand Down
2 changes: 1 addition & 1 deletion cmake/Dependencies/libtheora/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
CMAKE_MINIMUM_REQUIRED(VERSION 3.10)

project(theora)

Expand Down
2 changes: 1 addition & 1 deletion cmake/Dependencies/lz4/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
CMAKE_MINIMUM_REQUIRED(VERSION 3.10)

project( lz4 )

Expand Down
2 changes: 1 addition & 1 deletion cmake/MinGW/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEPREFETCHER ON OFF "MENGINE_PLUGIN_RESOURCEPREF
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCECONVERT OFF OFF "MENGINE_PLUGIN_RESOURCECONVERT")
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEDEBUGGER OFF OFF "MENGINE_PLUGIN_RESOURCEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_NODEDEBUGGER OFF ON "MENGINE_PLUGIN_NODEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUFLOADER ON OFF "MENGINE_PLUGIN_METABUFLOADER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUF ON OFF "MENGINE_PLUGIN_METABUF")
ADD_PLUGIN(MENGINE_PLUGIN_IMAGE_CODEC ON OFF "MENGINE_PLUGIN_IMAGE_CODEC")
ADD_PLUGIN(MENGINE_PLUGIN_WAV ON OFF "MENGINE_PLUGIN_WAV")
ADD_PLUGIN(MENGINE_PLUGIN_AMPLIFIER ON OFF "MENGINE_PLUGIN_AMPLIFIER")
Expand Down
2 changes: 1 addition & 1 deletion cmake/MinGW64/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEPREFETCHER ON OFF "MENGINE_PLUGIN_RESOURCEPREF
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCECONVERT OFF OFF "MENGINE_PLUGIN_RESOURCECONVERT")
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEDEBUGGER OFF OFF "MENGINE_PLUGIN_RESOURCEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_NODEDEBUGGER OFF ON "MENGINE_PLUGIN_NODEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUFLOADER ON OFF "MENGINE_PLUGIN_METABUFLOADER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUF ON OFF "MENGINE_PLUGIN_METABUF")
ADD_PLUGIN(MENGINE_PLUGIN_IMAGE_CODEC ON OFF "MENGINE_PLUGIN_IMAGE_CODEC")
ADD_PLUGIN(MENGINE_PLUGIN_WAV ON OFF "MENGINE_PLUGIN_WAV")
ADD_PLUGIN(MENGINE_PLUGIN_AMPLIFIER ON OFF "MENGINE_PLUGIN_AMPLIFIER")
Expand Down
2 changes: 1 addition & 1 deletion cmake/Unix/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEPREFETCHER ON OFF "MENGINE_PLUGIN_RESOURCEPREF
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCECONVERT OFF OFF "MENGINE_PLUGIN_RESOURCECONVERT")
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEDEBUGGER OFF OFF "MENGINE_PLUGIN_RESOURCEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_NODEDEBUGGER ON OFF "MENGINE_PLUGIN_NODEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUFLOADER ON OFF "MENGINE_PLUGIN_METABUFLOADER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUF ON OFF "MENGINE_PLUGIN_METABUF")
ADD_PLUGIN(MENGINE_PLUGIN_IMAGE_CODEC ON OFF "MENGINE_PLUGIN_IMAGE_CODEC")
ADD_PLUGIN(MENGINE_PLUGIN_WAV ON OFF "MENGINE_PLUGIN_WAV")
ADD_PLUGIN(MENGINE_PLUGIN_AMPLIFIER ON OFF "MENGINE_PLUGIN_AMPLIFIER")
Expand Down
2 changes: 1 addition & 1 deletion cmake/Win32/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEPREFETCHER ON OFF "MENGINE_PLUGIN_RESOURCEPREF
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCECONVERT ON OFF "MENGINE_PLUGIN_RESOURCECONVERT")
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEDEBUGGER ON OFF "MENGINE_PLUGIN_RESOURCEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_NODEDEBUGGER ON ON "MENGINE_PLUGIN_NODEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUFLOADER ON OFF "MENGINE_PLUGIN_METABUFLOADER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUF ON OFF "MENGINE_PLUGIN_METABUF")
ADD_PLUGIN(MENGINE_PLUGIN_IMAGE_CODEC ON OFF "MENGINE_PLUGIN_IMAGE_CODEC")
ADD_PLUGIN(MENGINE_PLUGIN_WAV ON OFF "MENGINE_PLUGIN_WAV")
ADD_PLUGIN(MENGINE_PLUGIN_AMPLIFIER ON OFF "MENGINE_PLUGIN_AMPLIFIER")
Expand Down
2 changes: 1 addition & 1 deletion cmake/Win32_DX11/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEPREFETCHER ON OFF "MENGINE_PLUGIN_RESOURCEPREF
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCECONVERT ON OFF "MENGINE_PLUGIN_RESOURCECONVERT")
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEDEBUGGER ON OFF "MENGINE_PLUGIN_RESOURCEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_NODEDEBUGGER ON ON "MENGINE_PLUGIN_NODEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUFLOADER ON OFF "MENGINE_PLUGIN_METABUFLOADER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUF ON OFF "MENGINE_PLUGIN_METABUF")
ADD_PLUGIN(MENGINE_PLUGIN_IMAGE_CODEC ON OFF "MENGINE_PLUGIN_IMAGE_CODEC")
ADD_PLUGIN(MENGINE_PLUGIN_WAV ON OFF "MENGINE_PLUGIN_WAV")
ADD_PLUGIN(MENGINE_PLUGIN_AMPLIFIER ON OFF "MENGINE_PLUGIN_AMPLIFIER")
Expand Down
2 changes: 1 addition & 1 deletion cmake/Win32_SDL/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEPREFETCHER ON OFF "MENGINE_PLUGIN_RESOURCEPREF
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCECONVERT ON OFF "MENGINE_PLUGIN_RESOURCECONVERT")
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEDEBUGGER ON OFF "MENGINE_PLUGIN_RESOURCEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_NODEDEBUGGER ON ON "MENGINE_PLUGIN_NODEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUFLOADER ON OFF "MENGINE_PLUGIN_METABUFLOADER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUF ON OFF "MENGINE_PLUGIN_METABUF")
ADD_PLUGIN(MENGINE_PLUGIN_IMAGE_CODEC ON OFF "MENGINE_PLUGIN_IMAGE_CODEC")
ADD_PLUGIN(MENGINE_PLUGIN_WAV ON OFF "MENGINE_PLUGIN_WAV")
ADD_PLUGIN(MENGINE_PLUGIN_AMPLIFIER ON OFF "MENGINE_PLUGIN_AMPLIFIER")
Expand Down
2 changes: 1 addition & 1 deletion cmake/Win32_UWP/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEPREFETCHER ON OFF "MENGINE_PLUGIN_RESOURCEPREF
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCECONVERT OFF OFF "MENGINE_PLUGIN_RESOURCECONVERT")
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEDEBUGGER OFF OFF "MENGINE_PLUGIN_RESOURCEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_NODEDEBUGGER OFF ON "MENGINE_PLUGIN_NODEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUFLOADER ON OFF "MENGINE_PLUGIN_METABUFLOADER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUF ON OFF "MENGINE_PLUGIN_METABUF")
ADD_PLUGIN(MENGINE_PLUGIN_IMAGE_CODEC ON OFF "MENGINE_PLUGIN_IMAGE_CODEC")
ADD_PLUGIN(MENGINE_PLUGIN_WAV ON OFF "MENGINE_PLUGIN_WAV")
ADD_PLUGIN(MENGINE_PLUGIN_AMPLIFIER ON OFF "MENGINE_PLUGIN_AMPLIFIER")
Expand Down
2 changes: 1 addition & 1 deletion cmake/Win64/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEPREFETCHER ON OFF "MENGINE_PLUGIN_RESOURCEPREF
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCECONVERT ON OFF "MENGINE_PLUGIN_RESOURCECONVERT")
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEDEBUGGER ON OFF "MENGINE_PLUGIN_RESOURCEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_NODEDEBUGGER ON ON "MENGINE_PLUGIN_NODEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUFLOADER ON OFF "MENGINE_PLUGIN_METABUFLOADER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUF ON OFF "MENGINE_PLUGIN_METABUF")
ADD_PLUGIN(MENGINE_PLUGIN_IMAGE_CODEC ON OFF "MENGINE_PLUGIN_IMAGE_CODEC")
ADD_PLUGIN(MENGINE_PLUGIN_WAV ON OFF "MENGINE_PLUGIN_WAV")
ADD_PLUGIN(MENGINE_PLUGIN_AMPLIFIER ON OFF "MENGINE_PLUGIN_AMPLIFIER")
Expand Down
2 changes: 1 addition & 1 deletion cmake/Win64_SDL/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEPREFETCHER ON OFF "MENGINE_PLUGIN_RESOURCEPREF
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCECONVERT ON OFF "MENGINE_PLUGIN_RESOURCECONVERT")
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEDEBUGGER ON OFF "MENGINE_PLUGIN_RESOURCEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_NODEDEBUGGER ON ON "MENGINE_PLUGIN_NODEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUFLOADER ON OFF "MENGINE_PLUGIN_METABUFLOADER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUF ON OFF "MENGINE_PLUGIN_METABUF")
ADD_PLUGIN(MENGINE_PLUGIN_IMAGE_CODEC ON OFF "MENGINE_PLUGIN_IMAGE_CODEC")
ADD_PLUGIN(MENGINE_PLUGIN_WAV ON OFF "MENGINE_PLUGIN_WAV")
ADD_PLUGIN(MENGINE_PLUGIN_AMPLIFIER ON OFF "MENGINE_PLUGIN_AMPLIFIER")
Expand Down
2 changes: 1 addition & 1 deletion cmake/Xcode_IOS_SDL/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEPREFETCHER ON OFF "MENGINE_PLUGIN_RESOURCEPREF
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCECONVERT OFF OFF "MENGINE_PLUGIN_RESOURCECONVERT")
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEDEBUGGER OFF OFF "MENGINE_PLUGIN_RESOURCEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_NODEDEBUGGER OFF OFF "MENGINE_PLUGIN_NODEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUFLOADER ON OFF "MENGINE_PLUGIN_METABUFLOADER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUF ON OFF "MENGINE_PLUGIN_METABUF")
ADD_PLUGIN(MENGINE_PLUGIN_IMAGE_CODEC ON OFF "MENGINE_PLUGIN_IMAGE_CODEC")
ADD_PLUGIN(MENGINE_PLUGIN_WAV ON OFF "MENGINE_PLUGIN_WAV")
ADD_PLUGIN(MENGINE_PLUGIN_AMPLIFIER ON OFF "MENGINE_PLUGIN_AMPLIFIER")
Expand Down
2 changes: 1 addition & 1 deletion cmake/Xcode_IOS_Simulator_SDL/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEPREFETCHER ON OFF "MENGINE_PLUGIN_RESOURCEPREF
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCECONVERT OFF OFF "MENGINE_PLUGIN_RESOURCECONVERT")
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEDEBUGGER OFF OFF "MENGINE_PLUGIN_RESOURCEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_NODEDEBUGGER OFF OFF "MENGINE_PLUGIN_NODEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUFLOADER ON OFF "MENGINE_PLUGIN_METABUFLOADER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUF ON OFF "MENGINE_PLUGIN_METABUF")
ADD_PLUGIN(MENGINE_PLUGIN_IMAGE_CODEC ON OFF "MENGINE_PLUGIN_IMAGE_CODEC")
ADD_PLUGIN(MENGINE_PLUGIN_WAV ON OFF "MENGINE_PLUGIN_WAV")
ADD_PLUGIN(MENGINE_PLUGIN_AMPLIFIER ON OFF "MENGINE_PLUGIN_AMPLIFIER")
Expand Down
2 changes: 1 addition & 1 deletion cmake/Xcode_MacOS_SDL/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEPREFETCHER ON OFF "MENGINE_PLUGIN_RESOURCEPREF
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCECONVERT OFF OFF "MENGINE_PLUGIN_RESOURCECONVERT")
ADD_PLUGIN(MENGINE_PLUGIN_RESOURCEDEBUGGER OFF OFF "MENGINE_PLUGIN_RESOURCEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_NODEDEBUGGER OFF ON "MENGINE_PLUGIN_NODEDEBUGGER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUFLOADER ON OFF "MENGINE_PLUGIN_METABUFLOADER")
ADD_PLUGIN(MENGINE_PLUGIN_METABUF ON OFF "MENGINE_PLUGIN_METABUF")
ADD_PLUGIN(MENGINE_PLUGIN_IMAGE_CODEC ON OFF "MENGINE_PLUGIN_IMAGE_CODEC")
ADD_PLUGIN(MENGINE_PLUGIN_WAV ON OFF "MENGINE_PLUGIN_WAV")
ADD_PLUGIN(MENGINE_PLUGIN_AMPLIFIER ON OFF "MENGINE_PLUGIN_AMPLIFIER")
Expand Down
2 changes: 0 additions & 2 deletions cmake/macro_template.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
CMAKE_MINIMUM_REQUIRED(VERSION 3.0)

MACRO(MENGINE_ADD_DEFINITION Definition)
ADD_DEFINITIONS(-D${Definition})
IF(PROJECT_IS_TOP_LEVEL)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -259,35 +259,7 @@ protected void onCreate(Bundle savedInstanceState) {
m_semaphores = new HashMap<>();
m_requestCodes = new HashMap<>();

MengineApplication application;

try {
application = this.getMengineApplication();
} catch (ClassCastException e) {
this.setState("activity.init", "application_cast_exception");

MengineAnalytics.buildEvent("mng_activity_init_failed")
.addParameterException("reason", e)
.logAndFlush();

this.finishWithAlertDialog("[ERROR] onCreate invalid application ClassCastException: %s"
, e.getMessage()
);

return;
}

if (application.isInvalidInitialize() == true) {
this.setState("activity.init", "application_invalid_initialize");

String reason = application.getInvalidInitializeReason();

this.finishWithAlertDialog("[ERROR] onCreate invalid application initialize: %s"
, reason
);

return;
}
MengineApplication application = this.getMengineApplication();

this.setState("activity.lifecycle", "create");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

public class MengineAnalytics {
private static MengineApplication m_application;

private static Map<String, Object> m_bases = new HashMap<>();
private static Map<String, Object> m_getter = new HashMap<>();

Expand Down Expand Up @@ -79,7 +80,7 @@ static public void addContextGetterParameterDouble(@Size(min = 1L,max = 40L) Str
}

static private void collapseGetter(Map<String, Object> parameters) {
for (Map.Entry<String, Object> entry : m_getter.entrySet()) {
for (Map.Entry<String, Object> entry : MengineAnalytics.m_getter.entrySet()) {
String key = entry.getKey();
MengineAnalyticsGetter getter = (MengineAnalyticsGetter)entry.getValue();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -234,16 +234,27 @@ public int getMetaDataInteger(String name) {
}

public boolean hasOption(String option) {
if (BuildConfig.DEBUG == false) {
return false;
}

String options_str = this.getApplicationOptions();

String [] options = options_str.split(" ");

if (options.length == 0) {
return false;
}

String hyphen_option = "-" + option;
String double_hyphen_option = "--" + option;

for(String o : options) {
if (o.equals("-" + option) == true) {
if (o.equals(hyphen_option) == true) {
return true;
}

if (o.equals("--" + option) == true) {
if (o.equals(double_hyphen_option) == true) {
return true;
}
}
Expand Down Expand Up @@ -775,6 +786,9 @@ public void onCreate() {
return;
}

MengineLog.setMengineApplication(this);
MengineAnalytics.setMengineApplication(this);

this.setState("build.debug", BuildConfig.DEBUG);

this.setState("application.init", "started");
Expand Down Expand Up @@ -809,9 +823,6 @@ public void onCreate() {

AndroidEnv_setMengineAndroidApplicationJNI(this);

MengineLog.setMengineApplication(this);
MengineAnalytics.setMengineApplication(this);

if (this.getMetaDataBoolean("mengine.secure.allow_android_id") == true) {
m_androidId = this.getSecureAndroidId();
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,27 @@ public class MengineLauncher extends Activity {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);

MengineApplication application = (MengineApplication)this.getApplication();
MengineApplication application;

try {
application = (MengineApplication) this.getApplication();
} catch (ClassCastException e) {
MengineUtils.finishActivityWithAlertDialog(this, "[ERROR] onCreate invalid application ClassCastException: %s"
, e.getMessage()
);

return;
}

if (application.isInvalidInitialize() == true) {
String reason = application.getInvalidInitializeReason();

MengineUtils.finishActivityWithAlertDialog(this, "[ERROR] onCreate invalid application initialize: %s"
, reason
);

return;
}

String[] activities = application.getAndroidActivities();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@ public static void onMengineInitializeBaseServices(MengineActivity activity) {
MengineLog.m_initializeBaseServices = true;

synchronized (MengineLog.m_lock) {
for (HistoryRecord record : m_history) {
for (HistoryRecord record : MengineLog.m_history) {
AndroidEnvironmentService_log(record.level, record.tag, record.message);

if (record.application == null) {
MengineLog.m_application.onMengineLogger(record.level, record.tag, record.message);
}
}
}

m_history.clear();
m_history.clear();
}
}

public static void onMenginePlatformStop(MengineActivity activity) {
Expand Down
6 changes: 0 additions & 6 deletions gradle/plugins/AppLovin/NonetBanners/AndroidManifest.xml

This file was deleted.

Loading

0 comments on commit 43a43e5

Please sign in to comment.