Skip to content

Commit 28fff56

Browse files
timscriptovtimscriptov
committed
Fix change app game
1 parent 7709b6c commit 28fff56

File tree

4 files changed

+37
-29
lines changed

4 files changed

+37
-29
lines changed

‎app/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
<queries>
2424
<package android:name="com.mojang.minecraftpe" />
2525
<package android:name="com.mojang.minecrafttrialpe" />
26-
2726
<intent>
2827
<action android:name="android.support.customtabs.action.CustomTabsService" />
2928
</intent>

‎app/src/main/java/com/mcal/mcpelauncher/fragments/MainSettingsFragment.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import com.mcal.mcpelauncher.R;
3838
import com.mcal.mcpelauncher.activities.MCPkgPickerActivity;
3939
import com.mcal.mcpelauncher.activities.SplashesActivity;
40+
import com.mcal.mcpelauncher.data.Constants;
4041
import com.mcal.mcpelauncher.data.Preferences;
4142
import com.mcal.mcpelauncher.services.BackgroundSoundPlayer;
4243
import com.mcal.mcpelauncher.ui.AboutActivity;
@@ -136,32 +137,32 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
136137
updatePreferences();
137138
}
138139

139-
/*@Override
140+
@Override
140141
public void onActivityResult(int requestCode, int resultCode, Intent data) {
141142
super.onActivityResult(requestCode, resultCode, data);
142143

143144
if (requestCode == DirPickerActivity.REQUEST_PICK_DIR && resultCode == AppCompatActivity.RESULT_OK) {
144145
String dir = data.getExtras().getString(DirPickerActivity.TAG_DIR_PATH);
145146
Preferences.setDataSavedPath(dir);
146-
if (dir.equals(Constants.STRING_VALUE_DEFAULT)) {
147-
Snackbar.make(requireActivity().getWindow().getDecorView(), getString(R.string.preferences_update_message_reset_data_path), 2500).show();
148-
} else {
149-
Snackbar.make(requireActivity().getWindow().getDecorView(), getString(R.string.preferences_update_message_data_path, dir), 2500).show();
150-
}
147+
// if (dir.equals(Constants.STRING_VALUE_DEFAULT)) {
148+
// Snackbar.make(requireActivity().getWindow().getDecorView(), getString(R.string.preferences_update_message_reset_data_path), 2500).show();
149+
// } else {
150+
// Snackbar.make(requireActivity().getWindow().getDecorView(), getString(R.string.preferences_update_message_data_path, dir), 2500).show();
151+
// }
151152
} else if (requestCode == MCPkgPickerActivity.REQUEST_PICK_PACKAGE && resultCode == AppCompatActivity.RESULT_OK) {
152153
String pkgName = data.getExtras().getString("package_name");
153154
Preferences.setMinecraftPackageName(pkgName);
154-
if (pkgName.equals(Constants.STRING_VALUE_DEFAULT)) {
155-
Snackbar.make(requireActivity().getWindow().getDecorView(), getString(R.string.preferences_update_message_reset_pkg_name), 2500).show();
156-
} else {
157-
Snackbar.make(requireActivity().getWindow().getDecorView(), getString(R.string.preferences_update_message_pkg_name, pkgName), 2500).show();
158-
}
155+
// if (pkgName.equals(Constants.STRING_VALUE_DEFAULT)) {
156+
// Snackbar.make(requireActivity().getWindow().getDecorView(), getString(R.string.preferences_update_message_reset_pkg_name), 2500).show();
157+
// } else {
158+
// Snackbar.make(requireActivity().getWindow().getDecorView(), getString(R.string.preferences_update_message_pkg_name, pkgName), 2500).show();
159+
// }
159160
Intent intent = new Intent(getActivity(), SplashesActivity.class);
160161
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
161162
requireActivity().startActivity(intent);
162163
}
163164
updatePreferences();
164-
}*/
165+
}
165166

166167
private void updatePreferences() {
167168
if (Preferences.getDataSavedPath().equals("default")) {

‎app/src/main/java/com/mcal/pesdk/nativeapi/LibraryLoader.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ object LibraryLoader {
4848

4949
@JvmStatic
5050
@SuppressLint("UnsafeDynamicallyLoadedCode")
51-
fun loadFMod(mcLibsPath: String?) {
51+
fun loadFMod(mcLibsPath: String) {
5252
try {
5353
System.load(File(mcLibsPath, "libfmod.so").absolutePath)
5454
} catch (e: UnsatisfiedLinkError) {
@@ -58,7 +58,7 @@ object LibraryLoader {
5858

5959
@JvmStatic
6060
@SuppressLint("UnsafeDynamicallyLoadedCode")
61-
fun loadMediaDecoders(mcLibsPath: String?) {
61+
fun loadMediaDecoders(mcLibsPath: String) {
6262
try {
6363
System.load(File(mcLibsPath, "libMediaDecoders_Android.so").absolutePath)
6464
} catch (e: UnsatisfiedLinkError) {
@@ -68,7 +68,7 @@ object LibraryLoader {
6868

6969
@JvmStatic
7070
@SuppressLint("UnsafeDynamicallyLoadedCode")
71-
fun loadMinecraftPE(mcLibsPath: String?) {
71+
fun loadMinecraftPE(mcLibsPath: String) {
7272
try {
7373
System.load(File(mcLibsPath, "libminecraftpe.so").absolutePath)
7474
} catch (e: UnsatisfiedLinkError) {
@@ -78,7 +78,7 @@ object LibraryLoader {
7878

7979
@JvmStatic
8080
@SuppressLint("UnsafeDynamicallyLoadedCode")
81-
fun loadCppShared(mcLibsPath: String?) {
81+
fun loadCppShared(mcLibsPath: String) {
8282
try {
8383
System.load(File(mcLibsPath, "libc++_shared.so").absolutePath)
8484
} catch (e: UnsatisfiedLinkError) {

‎app/src/main/java/com/mcal/pesdk/utils/SplitParser.kt‎

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package com.mcal.pesdk.utils
1818

1919
import android.annotation.SuppressLint
2020
import android.content.Context
21+
import android.util.Log
2122
import com.mcal.pesdk.utils.ABIInfo.ABI
2223
import java.io.File
2324
import java.io.FileOutputStream
@@ -48,19 +49,26 @@ class SplitParser(private var context: Context) {
4849
try {
4950
val mcAppInfo = MinecraftInfo.getMinecraftPackageContext().applicationInfo
5051
if (isAppBundle() && mcAppInfo != null) {
51-
val splitPath = mutableListOf(*mcAppInfo.splitPublicSourceDirs)[0]
52-
val buffer = ByteArray(2048)
53-
for (so in minecraftLibs) {
54-
val input = ZipFile(splitPath).getInputStream(ZipEntry("$abi$so"))
55-
val fos = FileOutputStream("$abiPath/$so")
56-
do {
57-
val numRead = input.read(buffer)
58-
if (numRead <= 0) {
59-
break
52+
mutableListOf(*mcAppInfo.splitPublicSourceDirs).forEach { path ->
53+
Log.e("TEST", path)
54+
val name = File(path).name
55+
if (name.contains("arm") || name.contains("x86")) {
56+
val buffer = ByteArray(2048)
57+
for (so in minecraftLibs) {
58+
val input = ZipFile(path).getInputStream(ZipEntry("$abi$so"))
59+
if (input != null) {
60+
val fos = FileOutputStream("$abiPath/$so")
61+
do {
62+
val numRead = input.read(buffer)
63+
if (numRead <= 0) {
64+
break
65+
}
66+
fos.write(buffer, 0, numRead)
67+
} while (true)
68+
fos.close()
69+
}
6070
}
61-
fos.write(buffer, 0, numRead)
62-
} while (true)
63-
fos.close()
71+
}
6472
}
6573
}
6674
} catch (e: Exception) {

0 commit comments

Comments
 (0)