3.2.2

Author: mzdluo123

app/build.gradle

@@ -21,8 +21,8 @@ android {
         applicationId "io.github.mzdluo123.mirai.android"
         minSdkVersion 26
         targetSdkVersion 30
-        versionCode 52
-        versionName "3.2.1"
+        versionCode 53
+        versionName "3.2.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "COREVERSION", "\"$CORE_VERSION\"")
         buildConfigField("String", "CONSOLEVERSION", "\"$CONSOLE_VERSION\"")
@@ -188,8 +188,8 @@ dependencies {
 //    }
 
     //mirai-lua
-    // implementation "com.ooooonly:luaMirai:${LUAMIRAI_VERSION}"
-    // implementation 'org.json:json:20160212'
+     implementation "com.ooooonly:luaMirai:${LUAMIRAI_VERSION}"
+     implementation 'org.json:json:20160212'
     implementation 'com.ooooonly:giteeman:0.1.1'
 
     //splitties

app/src/main/AndroidManifest.xml

@@ -50,7 +50,8 @@
             android:name=".activity.UnsafeLoginActivity"
             android:excludeFromRecents="true"
             android:label="请完成登录验证"
-            android:launchMode="singleTask" />
+            android:launchMode="singleTask"
+            android:parentActivityName=".activity.MainActivity" />
         <activity android:name=".activity.PluginImportActivity">
             <intent-filter tools:ignore="AppLinkUrlError">
                 <action android:name="android.intent.action.VIEW" />

app/src/main/java/io/github/mzdluo123/mirai/android/BotApplication.kt

@@ -19,9 +19,7 @@ import org.acra.ACRA
 import org.acra.config.CoreConfigurationBuilder
 import org.acra.config.DialogConfigurationBuilder
 import org.acra.data.StringFormat
-import org.bouncycastle.jce.provider.BouncyCastleProvider
 import splitties.init.injectAsAppCtx
-import java.security.Security
 
 class BotApplication : Application() {
     companion object {
@@ -38,6 +36,7 @@ class BotApplication : Application() {
         super.onCreate()
         injectAsAppCtx()
         context = this
+        byPassECDHCHeck()
         val processName = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
             getProcessName()
         else
@@ -47,10 +46,16 @@ class BotApplication : Application() {
         if (processName?.isEmpty() == false && processName == packageName) {
             initNotification()
         }
-        if (Security.getProperty(BouncyCastleProvider.PROVIDER_NAME) != null) {
-            Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME)
-        }
-        Security.addProvider(BouncyCastleProvider())
+    }
+
+    /**
+     * 在新版系统上无法使用ECDH算法，使用下面的代码绕过
+     * */
+    private fun byPassECDHCHeck() {
+        val cls = Class.forName("sun.security.jca.Providers")
+        val field = cls.getDeclaredField("maximumAllowableApiLevelForBcDeprecation")
+        field.isAccessible = true
+        field.setInt(null, 999)
     }
 
 

app/src/main/java/io/github/mzdluo123/mirai/android/miraiconsole/MiraiAndroidLogger.kt

@@ -1,5 +1,6 @@
 package io.github.mzdluo123.mirai.android.miraiconsole
 
+import android.text.TextUtils
 import android.util.Log
 import io.github.mzdluo123.mirai.android.AppSettings
 import io.github.mzdluo123.mirai.android.BuildConfig
@@ -32,6 +33,7 @@ fun logException(err: Throwable?) {
     MiraiAndroidLogger.error(stringWriter.toString())
 }
 
+
 private val lock = Object()
 
 internal fun pushLog(log: String) {
@@ -47,7 +49,6 @@ internal fun pushLog(log: String) {
             }
         }
         BotService.consoleUi.finishBroadcast()
-
     }
 }
 
@@ -58,17 +59,12 @@ object MiraiAndroidLogger :
         logException(e)
         synchronized(this) {
             message?.split("\n")?.forEach {
-                val log = "[${priority.name}] ${it}"
+                val log = "[${priority.name}] $it"
                 val colorLog =
-                    "<font color=\"${LogColor.valueOf(priority.name).color}\">[${priority.name}]</font><![CDATA[${
-                        it.replace(
-                            "\n",
-                            "\r"
-                        )
-                    }]]>"
+                    "<font color=\"${LogColor.valueOf(priority.name).color}\">[${priority.name}]</font>${
+                        TextUtils.htmlEncode(it)
+                    }"
                 pushLog(colorLog)
-
-
                 if (BuildConfig.DEBUG || printToSysLog) {
                     Log.i("MA", log)
                 }

app/src/main/java/io/github/mzdluo123/mirai/android/service/BotService.kt

@@ -17,6 +17,7 @@ import android.os.RemoteCallbackList
 import android.util.Log
 import androidx.lifecycle.LifecycleService
 import androidx.lifecycle.lifecycleScope
+import com.ooooonly.luaMirai.miraiconsole.LuaMiraiPlugin
 import io.github.mzdluo123.mirai.android.AppSettings
 import io.github.mzdluo123.mirai.android.IConsole
 import io.github.mzdluo123.mirai.android.IbotAidlInterface
@@ -39,6 +40,8 @@ import net.mamoe.mirai.console.MiraiConsoleImplementation.Companion.start
 import net.mamoe.mirai.console.command.CommandManager.INSTANCE.register
 import net.mamoe.mirai.console.command.ConsoleCommandSender
 import net.mamoe.mirai.console.command.executeCommand
+import net.mamoe.mirai.console.plugin.PluginManager.INSTANCE.enable
+import net.mamoe.mirai.console.plugin.PluginManager.INSTANCE.load
 import net.mamoe.mirai.console.rootDir
 import net.mamoe.mirai.event.GlobalEventChannel
 import net.mamoe.mirai.event.events.BotOnlineEvent
@@ -182,8 +185,8 @@ class BotService : LifecycleService() {
 //            path = getExternalFilesDir(null).toString()
 //        )
 //
-//        LuaMiraiPlugin.load()
-//        LuaMiraiPlugin.enable()
+        LuaMiraiPlugin.load()
+        LuaMiraiPlugin.enable()
 
         registerReceiver()
         isStart = true

docs/changelog.txt

@@ -1,5 +1,5 @@
-3.2.1
+3.2.2
 https://maupdate.rainchan.win/app-normal-release.apk
-修复了部分系统无法编译插件的问题
-修复了网络异常导致的启动崩溃问题
-更新mirai-core到2.7-M1
+更新mirai-core到2.7-RC
+修复了部分情况下无法登录的问题
+修复了部分情况下控制台指令无回显的问题