lynx
/
NekoX
mirror of https://github.com/NekoX-Dev/NekoX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix single abi version

This commit is contained in:
世界 2020-05-08 10:18:14 +08:00
parent ae044a1d03
commit 43e7d33afe
No known key found for this signature in database
GPG Key ID: CD109927C34A63C4
3 changed files with 57 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java
View File

@ -2417,7 +2417,7 @@ public class SettingsActivity extends BaseFragment implements NotificationCenter
cell.getTextView().setMovementMethod(null);
cell.setBackgroundDrawable(Theme.getThemedDrawable(mContext, R.drawable.greydivider_bottom, Theme.key_windowBackgroundGrayShadow));
String abi = new File(getParentActivity().getApplicationInfo().nativeLibraryDir).getName();
String abi = FileUtil.getAbi();
cell.setText(String.format("%1$s %2$s", LocaleController.getString("NekoX", R.string.NekoX), String.format(Locale.US, "v%s %s %s", BuildConfig.VERSION_NAME, abi, BuildConfig.BUILD_TYPE)));
cell.getTextView().setPadding(0, AndroidUtilities.dp(14), 0, AndroidUtilities.dp(14));
view = cell;

2
TMessagesProj/src/main/java/tw/nekomimi/nekogram/VmessLoader.kt
View File

@ -386,7 +386,7 @@ class VmessLoader {
}
point.configureFileContent = V2rayConfigUtil.getV2rayConfig(bean, port).content
point.configureFileContent = conf
point.domainName = V2rayConfigUtil.currDomain
point.runLoop(true)

78
TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/FileUtil.kt
View File

@ -1,12 +1,11 @@
package tw.nekomimi.nekogram.utils
import android.os.Build
import cn.hutool.core.io.FileUtil
import cn.hutool.core.io.resource.ResourceUtil
import org.telegram.messenger.ApplicationLoader
import org.telegram.messenger.BuildVars
import org.telegram.messenger.FileLog
import java.io.File
import java.util.*
import java.util.zip.ZipFile
object FileUtil {
@ -91,28 +90,61 @@ object FileUtil {
}
@JvmStatic
@Suppress("DEPRECATION") val abi by lazy {
val libDirs = mutableListOf<String>()
ZipFile(ApplicationLoader.applicationContext.applicationInfo.sourceDir).use {
it.getEntry("lib/") ?: return@use
for (entry in it.entries()) {
if (entry.isDirectory && it.name.length > 4 && it.name.startsWith("lib/")) {
libDirs.add(entry.name.substringAfter("lib/").substringBefore("/"))
}
@Suppress("DEPRECATION")
private fun getAbi() = try {
if (Build.CPU_ABI.equals("x86_64", ignoreCase = true)) {
"x86_64"
} else if (Build.CPU_ABI.equals("arm64-v8a", ignoreCase = true)) {
"arm64-v8a"
} else if (Build.CPU_ABI.equals("armeabi-v7a", ignoreCase = true)) {
"armeabi-v7a"
} else if (Build.CPU_ABI.equals("armeabi", ignoreCase = true)) {
"armeabi"
} else if (Build.CPU_ABI.equals("x86", ignoreCase = true)) {
"x86"
} else {
if (BuildVars.LOGS_ENABLED) {
FileLog.e("Unsupported arch: " + Build.CPU_ABI)
}
"armeabi"
}
} catch (e: Exception) {
FileLog.e(e)
"armeabi"
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
ApplicationLoader.applicationContext.applicationInfo.splitSourceDirs?.forEach { split ->
ZipFile(split).use {
it.getEntry("lib/") ?: return@use
for (entry in it.entries()) {
if (entry.isDirectory && it.name.length > 4 && it.name.startsWith("lib/")) {
libDirs.add(entry.name.substringAfter("lib/").substringBefore("/"))
}
}
}
}
}
if (libDirs.size == 1) libDirs[0] else {
Build.CPU_ABI.toLowerCase()
}.also {
FileLog.d("current abi: $it")
}
}
@JvmStatic
@ -132,7 +164,7 @@ object FileUtil {
if (!execFile.isFile) {
saveNonAsset("lib/${getAbi()}/${execFile.name}", execFile);
saveNonAsset("lib/$abi/${execFile.name}", execFile);
}
@ -167,7 +199,7 @@ object FileUtil {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
ApplicationLoader.applicationContext.applicationInfo.splitSourceDirs.forEach { split ->
ApplicationLoader.applicationContext.applicationInfo.splitSourceDirs?.forEach { split ->
ZipFile(split).use {