修复了无法通过设备锁验证的问题

Author: mzdluo123

app/build.gradle

@@ -1,5 +1,5 @@
-import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import com.android.build.gradle.internal.tasks.L8DexDesugarLibTask
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
@@ -19,10 +19,10 @@ android {
 
     defaultConfig {
         applicationId "io.github.mzdluo123.mirai.android"
-        minSdkVersion 21
+        minSdkVersion 26
         targetSdkVersion 30
-        versionCode 50
-        versionName "3.1.8"
+        versionCode 51
+        versionName "3.2.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "COREVERSION", "\"$CORE_VERSION\"")
         buildConfigField("String", "CONSOLEVERSION", "\"$CONSOLE_VERSION\"")
@@ -45,6 +45,20 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    flavorDimensions "api"
+    productFlavors {
+        minApi21 {
+            dimension "api"
+            minSdkVersion 21
+            versionNameSuffix "-Api21"
+            applicationIdSuffix ".Api21"
+        }
+        normal{
+            dimension "api"
+            minSdkVersion 26
+
+        }
+    }
 
 // To inline the bytecode built with JVM target 1.8 into
 // bytecode that is being built with JVM target 1.6. (e.g. navArgs)
@@ -90,8 +104,7 @@ android {
     }
 
     tasks.withType(L8DexDesugarLibTask) {
-        if (it.name.contains("Release"))
-        {
+        if (it.name.contains("Release")) {
             keepRulesFiles.from("desugar-rules.pro")
         }
     }
@@ -104,7 +117,7 @@ kotlin.sourceSets.all {
     languageSettings.useExperimentalAnnotation("splitties.experimental.ExperimentalSplittiesApi")
 }
 
-task nnioJar (type: ShadowJar) {
+task nnioJar(type: ShadowJar) {
     getArchiveClassifier().set('nnio')
 
     relocate 'org.lukhnos.nnio.file', 'java.nio.file'
@@ -114,7 +127,7 @@ task nnioJar (type: ShadowJar) {
 }
 
 dependencies {
-    implementation (fileTree(dir: 'libs', include: ['*.jar']))
+    implementation(fileTree(dir: 'libs', include: ['*.jar']))
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'com.google.android.material:material:1.3.0'
 
@@ -165,7 +178,7 @@ dependencies {
 
     //mirai-lua
     implementation "com.ooooonly:luaMirai:${LUAMIRAI_VERSION}"
-   // implementation 'org.json:json:20160212'
+    // implementation 'org.json:json:20160212'
     implementation 'com.ooooonly:giteeman:0.1.1'
 
     //splitties

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

@@ -8,18 +8,25 @@ import kotlinx.android.synthetic.main.activity_crash.*
 import org.acra.dialog.BaseCrashReportDialog
 import org.acra.file.CrashReportPersister
 import org.acra.interaction.DialogInteraction
+import splitties.toast.toast
 import java.io.File
 
 class CrashReportActivity : BaseCrashReportDialog() {
     override fun onStart() {
         super.onStart()
         setContentView(R.layout.activity_crash)
         val file = intent.getSerializableExtra(DialogInteraction.EXTRA_REPORT_FILE) as File
-        val data = CrashReportPersister().load(file)
-        file.delete()
-        crach_data_text.text = data["STACK_TRACE"].toString()
-        crash_share.setOnClickListener {
-            shareText(data.toJSON(), lifecycleScope)
+        try {
+            val data = CrashReportPersister().load(file)
+            file.delete()
+            crach_data_text.text = data["STACK_TRACE"].toString()
+            crash_share.setOnClickListener {
+                shareText(data.toJSON(), lifecycleScope)
+            }
+        } catch (e: Exception) {
+            toast("无法读取错误报告，请尝试手动删除crash文件夹")
+            finish()
         }
+
     }
 }

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

@@ -21,6 +21,11 @@ class UnsafeLoginActivity : AppCompatActivity() {
 
     private lateinit var conn: ServiceConnector
     val gson = JsonParser()
+
+    companion object {
+        const val TAG = "UnsafeLogin"
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         conn = ServiceConnector(this)
@@ -82,7 +87,8 @@ class UnsafeLoginActivity : AppCompatActivity() {
 
         conn.connectStatus.observe(this, Observer {
             if (it) {
-                unsafe_login_web.loadUrl(conn.botService.url)
+
+                unsafe_login_web.loadUrl(conn.botService.url.replace("verify", "qrcode"))
             }
         })
     }

docs/changelog.txt

@@ -1,3 +1,5 @@
-3.1.8
-https://maupdate.rainchan.win/app-release.apk
-更新mirai依赖版本至2.6.4
+3.2.0
+https://maupdate.rainchan.win/app-normal-release.apk
+修复了无法通过设备锁验证的问题
+从此版本开始，MA将会每次发布两个不同的版本，普通版版只能在Android8.0及以上系统使用，兼容版版增加了一些兼容性措施使得它能在8.0以下系统使用。
+更新默认为普通版，兼容版下载请到GitHub了解更多信息