From 43e7d33afeefe2836dcaa254bb374681401c13c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@nekox.me>
Date: Fri, 8 May 2020 10:18:14 +0800
Subject: [PATCH] fix single abi version

---
 .../org/telegram/ui/SettingsActivity.java     |  2 +-
 .../java/tw/nekomimi/nekogram/VmessLoader.kt  |  2 +-
 .../tw/nekomimi/nekogram/utils/FileUtil.kt    | 78 +++++++++++++------
 3 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java
index b74023902..fddfd3ba1 100644
--- a/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java
+++ b/TMessagesProj/src/main/java/org/telegram/ui/SettingsActivity.java
@@ -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;
diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/VmessLoader.kt b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/VmessLoader.kt
index d4327bc71..ba9dfb480 100644
--- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/VmessLoader.kt
+++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/VmessLoader.kt
@@ -386,7 +386,7 @@ class VmessLoader {
 
                 }
 
-                point.configureFileContent = V2rayConfigUtil.getV2rayConfig(bean, port).content
+                point.configureFileContent = conf
                 point.domainName = V2rayConfigUtil.currDomain
 
                 point.runLoop(true)
diff --git a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/FileUtil.kt b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/FileUtil.kt
index 08d65e058..565de0474 100644
--- a/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/FileUtil.kt
+++ b/TMessagesProj/src/main/java/tw/nekomimi/nekogram/utils/FileUtil.kt
@@ -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 {