mirror of
https://github.com/geode-sdk/android-launcher.git
synced 2026-10-22 08:42:38 +00:00
so i don't forget anymore
This commit is contained in:
4 files changed
+18
-1
No files matched your search
@@ -87,6 +87,8 @@ class GeometryDashActivity : AppCompatActivity(), Cocos2dxHelper.Cocos2dxHelperL
|
|||||||
val errorMessage = when {
|
val errorMessage = when {
|
||||||
abiMismatch && is64bit -> LaunchUtils.LauncherError.LINKER_NEEDS_32BIT
|
abiMismatch && is64bit -> LaunchUtils.LauncherError.LINKER_NEEDS_32BIT
|
||||||
abiMismatch -> LaunchUtils.LauncherError.LINKER_NEEDS_64BIT
|
abiMismatch -> LaunchUtils.LauncherError.LINKER_NEEDS_64BIT
|
||||||
|
e.message?.contains("__gxx_personality_v0") == true ->
|
||||||
|
LaunchUtils.LauncherError.LINKER_FAILED_STL
|
||||||
else -> LaunchUtils.LauncherError.LINKER_FAILED
|
else -> LaunchUtils.LauncherError.LINKER_FAILED
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -70,8 +70,20 @@ fun ErrorInfoBody(failureReason: LaunchUtils.LauncherError, modifier: Modifier =
|
|||||||
else -> stringResource(R.string.load_failed_generic_error_description)
|
else -> stringResource(R.string.load_failed_generic_error_description)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
val context = LocalContext.current
|
||||||
val recommendations = when (failureReason) {
|
val recommendations = when (failureReason) {
|
||||||
LaunchUtils.LauncherError.LINKER_FAILED -> listOf(
|
LaunchUtils.LauncherError.LINKER_FAILED_STL -> {
|
||||||
|
val isDeveloper = PreferenceUtils.get(context).getBoolean(PreferenceUtils.Key.DEVELOPER_MODE)
|
||||||
|
|
||||||
|
buildList {
|
||||||
|
add(stringResource(R.string.load_failed_recommendation_update))
|
||||||
|
add(stringResource(R.string.load_failed_recommendation_report))
|
||||||
|
|
||||||
|
if (isDeveloper)
|
||||||
|
add(stringResource(R.string.load_failed_recommendation_dev_stl))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
LaunchUtils.LauncherError.LINKER_FAILED -> listOfNotNull(
|
||||||
stringResource(R.string.load_failed_recommendation_reinstall),
|
stringResource(R.string.load_failed_recommendation_reinstall),
|
||||||
stringResource(R.string.load_failed_recommendation_update),
|
stringResource(R.string.load_failed_recommendation_update),
|
||||||
)
|
)
|
||||||
@@ -100,6 +112,7 @@ fun ErrorInfoTitle(failureReason: LaunchUtils.LauncherError) {
|
|||||||
val message = when (failureReason) {
|
val message = when (failureReason) {
|
||||||
LaunchUtils.LauncherError.LINKER_NEEDS_64BIT,
|
LaunchUtils.LauncherError.LINKER_NEEDS_64BIT,
|
||||||
LaunchUtils.LauncherError.LINKER_NEEDS_32BIT,
|
LaunchUtils.LauncherError.LINKER_NEEDS_32BIT,
|
||||||
|
LaunchUtils.LauncherError.LINKER_FAILED_STL,
|
||||||
LaunchUtils.LauncherError.LINKER_FAILED -> stringResource(R.string.load_failed_link_error)
|
LaunchUtils.LauncherError.LINKER_FAILED -> stringResource(R.string.load_failed_link_error)
|
||||||
LaunchUtils.LauncherError.GENERIC -> stringResource(R.string.load_failed_generic_error)
|
LaunchUtils.LauncherError.GENERIC -> stringResource(R.string.load_failed_generic_error)
|
||||||
LaunchUtils.LauncherError.CRASHED -> stringResource(R.string.load_failed_crashed)
|
LaunchUtils.LauncherError.CRASHED -> stringResource(R.string.load_failed_crashed)
|
||||||
|
|||||||
@@ -95,6 +95,7 @@ object LaunchUtils {
|
|||||||
enum class LauncherError {
|
enum class LauncherError {
|
||||||
LINKER_NEEDS_64BIT,
|
LINKER_NEEDS_64BIT,
|
||||||
LINKER_NEEDS_32BIT,
|
LINKER_NEEDS_32BIT,
|
||||||
|
LINKER_FAILED_STL,
|
||||||
LINKER_FAILED,
|
LINKER_FAILED,
|
||||||
GENERIC,
|
GENERIC,
|
||||||
CRASHED;
|
CRASHED;
|
||||||
|
|||||||
@@ -99,6 +99,7 @@
|
|||||||
<string name="load_failed_recommendation_update">Verify that the latest versions of the launcher and Geometry Dash are installed.</string>
|
<string name="load_failed_recommendation_update">Verify that the latest versions of the launcher and Geometry Dash are installed.</string>
|
||||||
<string name="load_failed_recommendation_report">Report this issue to the developers.</string>
|
<string name="load_failed_recommendation_report">Report this issue to the developers.</string>
|
||||||
<string name="load_failed_recommendation_safe_mode">Hold the Launch button to launch in safe mode.</string>
|
<string name="load_failed_recommendation_safe_mode">Hold the Launch button to launch in safe mode.</string>
|
||||||
|
<string name="load_failed_recommendation_dev_stl">Devs: If this is a locally built Geode version, please use the c++_shared ANDROID_STL!</string>
|
||||||
|
|
||||||
<string name="message_box_cancel">Cancel</string>
|
<string name="message_box_cancel">Cancel</string>
|
||||||
<string name="message_box_accept">OK</string>
|
<string name="message_box_accept">OK</string>
|
||||||
|
|||||||
Reference in new issue
Block a user