更新V11.1

修复安卓7闪退的bug
mingzhixian · Jun 24, 2023 · 4328700 · 4328700
1 parent bef9581
commit 4328700
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/scrcpy_android/.idea/modules/server/scrcpy_android.server.androidTest.iml b/scrcpy_android/.idea/modules/server/scrcpy_android.server.androidTest.iml
diff --git a/scrcpy_android/.idea/modules/server/scrcpy_android.server.unitTest.iml b/scrcpy_android/.idea/modules/server/scrcpy_android.server.unitTest.iml
diff --git a/scrcpy_android/app/build.gradle b/scrcpy_android/app/build.gradle
@@ -11,16 +11,19 @@ android {
         applicationId "top.saymzx.scrcpy.android"
         minSdk 24
         targetSdk 33
-        versionCode 110
-        versionName "11.0"
+        versionCode 111
+        versionName "11.1"
         resConfigs "zh"
         resConfigs "xhdpi"
         ndk {
-            abiFilter "arm64-v8a"
+            abiFilters "arm64-v8a" , "x86"
         }
     }
     buildTypes {
         release {
+            ndk {
+                abiFilter "arm64-v8a"
+            }
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'

diff --git a/scrcpy_android/app/src/main/java/dev/mobile/dadb/AdbKeyPair.kt b/scrcpy_android/app/src/main/java/dev/mobile/dadb/AdbKeyPair.kt
@@ -17,14 +17,14 @@
 
 package dev.mobile.dadb
 
+import android.util.Base64
 import java.io.File
 import java.math.BigInteger
 import java.nio.ByteBuffer
 import java.nio.ByteOrder
 import java.security.KeyPairGenerator
 import java.security.PrivateKey
 import java.security.interfaces.RSAPublicKey
-import java.util.*
 import javax.crypto.Cipher
 
 
@@ -104,16 +104,14 @@ class AdbKeyPair(
       publicKeyFile.absoluteFile.parentFile?.mkdirs()
 
       privateKeyFile.writer().use { out ->
-        val base64 = Base64.getMimeEncoder(64, "\n".toByteArray())
         out.write("-----BEGIN PRIVATE KEY-----\n")
-        out.write(base64.encodeToString(keyPair.private.encoded))
+        out.write(Base64.encodeToString(keyPair.private.encoded, 0))
         out.write("\n-----END PRIVATE KEY-----")
       }
 
       publicKeyFile.writer().use { out ->
-        val base64 = Base64.getEncoder()
         val bytes = convertRsaPublicKeyToAdbFormat(keyPair.public as RSAPublicKey)
-        out.write(base64.encodeToString(bytes))
+        out.write(Base64.encodeToString(bytes, 0))
         out.write(" unknown@unknown")
       }
     }