From deae3e37551374338450235d68422e2a9da9c96c Mon Sep 17 00:00:00 2001
From: wdvxdr <wdvxdr@foxmail.com>
Date: Tue, 22 Dec 2020 14:04:56 +0800
Subject: [PATCH] Android 8.5.0

---
 client/builders.go | 6 ++----
 client/global.go   | 8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/client/builders.go b/client/builders.go
index 77cfd3c2..22b06042 100644
--- a/client/builders.go
+++ b/client/builders.go
@@ -36,9 +36,9 @@ func (c *QQClient) buildLoginPacket() (uint16, []byte) {
 	req := packets.BuildOicqRequestPacket(c.Uin, 0x0810, crypto.ECDH, c.RandomKey, func(w *binary.Writer) {
 		w.WriteUInt16(9)
 		if c.AllowSlider {
-			w.WriteUInt16(0x18)
-		} else {
 			w.WriteUInt16(0x17)
+		} else {
+			w.WriteUInt16(0x16)
 		}
 
 		w.Write(tlv.T18(16, uint32(c.Uin)))
@@ -47,7 +47,6 @@ func (c *QQClient) buildLoginPacket() (uint16, []byte) {
 		w.Write(tlv.T116(c.version.MiscBitmap, c.version.SubSigmap))
 		w.Write(tlv.T100(c.version.SSOVersion, c.version.AppId, c.version.MainSigMap))
 		w.Write(tlv.T107(0))
-		w.Write(tlv.T108(SystemDeviceInfo.IMEI))
 		w.Write(tlv.T142(c.version.ApkId))
 		w.Write(tlv.T144(
 			[]byte(SystemDeviceInfo.IMEI),
@@ -79,7 +78,6 @@ func (c *QQClient) buildLoginPacket() (uint16, []byte) {
 			"qqweb.qq.com", "office.qq.com", "ti.qq.com", "mail.qq.com", "mma.qq.com",
 		}))
 
-		//todo: tlv 400
 		w.Write(tlv.T187(SystemDeviceInfo.MacAddress))
 		w.Write(tlv.T188(SystemDeviceInfo.AndroidId))
 		if len(SystemDeviceInfo.IMSIMd5) != 0 {
diff --git a/client/global.go b/client/global.go
index 8f3c8b91..644548c9 100644
--- a/client/global.go
+++ b/client/global.go
@@ -151,12 +151,12 @@ func genVersionInfo(p ClientProtocol) *versionInfo {
 	case AndroidPhone: // Dumped by mirai from qq android v8.2.7
 		return &versionInfo{
 			ApkId:           "com.tencent.mobileqq",
-			AppId:           537066419,
-			SortVersionName: "8.4.18",
-			BuildTime:       1604580615,
+			AppId:           537066738,
+			SortVersionName: "8.5.0",
+			BuildTime:       1607689988,
 			ApkSign:         []byte{0xA6, 0xB7, 0x45, 0xBF, 0x24, 0xA2, 0xC2, 0x77, 0x52, 0x77, 0x16, 0xF6, 0xF3, 0x6E, 0xB6, 0x8D},
 			SdkVersion:      "6.0.0.2454",
-			SSOVersion:      13,
+			SSOVersion:      15,
 			MiscBitmap:      184024956,
 			SubSigmap:       0x10400,
 			MainSigMap:      34869472,