From c543e72dd140a624a3cebd08ed67e2b531b54f42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=92=E3=83=A5=E3=83=BC=E3=83=9E=E3=83=B3=E3=83=AF?=
 =?UTF-8?q?=E3=83=BC=E3=82=AD=E3=83=B3?= <coolxiaom95@gmail.com>
Date: Sat, 6 May 2023 13:35:49 +0800
Subject: [PATCH] revert: update mirai 2.15.0-dev-83

---
 app/build.gradle.kts                          |  2 +-
 .../cssxsh/mirai/tool/FixProtocolVersion.kt   | 52 -------------------
 release-note.md                               |  1 -
 3 files changed, 1 insertion(+), 54 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0ee8ef1..82be6ed 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     kotlin("android")
     kotlin("plugin.serialization")
 }
-val miraiVersion = "2.15.0-dev-83"
+val miraiVersion = "2.15.0-M1"
 
 android {
     namespace = "top.mrxiaom.mirai.aoki"
diff --git a/app/src/main/java/xyz/cssxsh/mirai/tool/FixProtocolVersion.kt b/app/src/main/java/xyz/cssxsh/mirai/tool/FixProtocolVersion.kt
index d28ab1c..a70617e 100644
--- a/app/src/main/java/xyz/cssxsh/mirai/tool/FixProtocolVersion.kt
+++ b/app/src/main/java/xyz/cssxsh/mirai/tool/FixProtocolVersion.kt
@@ -86,18 +86,6 @@ public object FixProtocolVersion {
                     sign = "A6 B7 45 BF 24 A2 C2 77 52 77 16 F6 F3 6E B6 8D"
                     buildTime = 1676531414L
                     ssoVersion = 19
-                }
-                impl.id < 537153294 -> impl.apply {
-                    apkId = "com.tencent.mobileqq"
-                    id = 537153294
-                    ver = "8.9.35.10440"
-                    sdkVer = "6.0.0.2535"
-                    miscBitMap = 0x08F7_FF7C
-                    subSigMap = 0x0001_0400
-                    mainSigMap = 0x00FF_32F2
-                    sign = "A6 B7 45 BF 24 A2 C2 77 52 77 16 F6 F3 6E B6 8D"
-                    buildTime = 1676531414L
-                    ssoVersion = 19
                     supportsQRLogin = false
                 }
                 else -> impl
@@ -117,18 +105,6 @@ public object FixProtocolVersion {
                     sign = "A6 B7 45 BF 24 A2 C2 77 52 77 16 F6 F3 6E B6 8D"
                     buildTime = 1676531414L
                     ssoVersion = 19
-                }
-                impl.id < 537152242 -> impl.apply {
-                    apkId = "com.tencent.mobileqq"
-                    id = 537152242
-                    ver = "8.9.35.10440"
-                    sdkVer = "6.0.0.2535"
-                    miscBitMap = 0x08F7_FF7C
-                    subSigMap = 0x0001_0400
-                    mainSigMap = 0x00FF_32F2
-                    sign = "A6 B7 45 BF 24 A2 C2 77 52 77 16 F6 F3 6E B6 8D"
-                    buildTime = 1676531414L
-                    ssoVersion = 19
                     supportsQRLogin = false
                 }
                 else -> impl
@@ -150,19 +126,6 @@ public object FixProtocolVersion {
                     ssoVersion = 5
                     supportsQRLogin = true
                 }
-                impl.id < 537065138 -> impl.apply {
-                    apkId = "com.tencent.qqlite"
-                    id = 537065138
-                    ver = "2.0.8"
-                    sdkVer = "6.0.0.2365"
-                    miscBitMap = 0x00F7_FF7C
-                    subSigMap = 0x0001_0400
-                    mainSigMap = 0x00FF_32F2
-                    sign = "A6 B7 45 BF 24 A2 C2 77 52 77 16 F6 F3 6E B6 8D"
-                    buildTime = 1559564731L
-                    ssoVersion = 5
-                    supportsQRLogin = true
-                }
                 else -> impl
             }
         }
@@ -180,18 +143,6 @@ public object FixProtocolVersion {
                     sign = "AA 39 78 F4 1F D9 6F F9 91 4A 66 9E 18 64 74 C7"
                     buildTime = 1640921786L
                     ssoVersion = 19
-                }
-                impl.id <= 537151363 -> impl.apply {
-                    apkId = "com.tencent.minihd.qq"
-                    id = 537151363
-                    ver = "8.9.33.614"
-                    sdkVer = "6.0.0.2433"
-                    miscBitMap = 0x08F7_FF7C
-                    subSigMap = 0x0001_0400
-                    mainSigMap = 0x001E_10E0
-                    sign = "AA 39 78 F4 1F D9 6F F9 91 4A 66 9E 18 64 74 C7"
-                    buildTime = 1640921786L
-                    ssoVersion = 19
                     supportsQRLogin = false
                 }
                 else -> impl
@@ -213,9 +164,6 @@ public object FixProtocolVersion {
                     buildTime = 1595836208L
                     ssoVersion = 12
                 }
-                impl.id < 537128930 -> impl.apply {
-                    // TODO
-                }
                 else -> impl
             }
         }
diff --git a/release-note.md b/release-note.md
index 1b65097..4bc12d1 100644
--- a/release-note.md
+++ b/release-note.md
@@ -7,7 +7,6 @@
 
 ## 修复或变更
 * 优化 ProducerFailureException 的查看体验。
-* 将 mirai 版本升级到开发版 [2.15.0-dev-83](https://github.com/mamoe/mirai/actions/runs/4865587143)
 * 暂时移除确认登录对话框。
 * 修复报错信息前缩进不正常的问题。