Leahnaya/PKHeX
1
0
Fork 0
mirror of https://github.com/kwsch/PKHeX.git synced 2026-10-02 05:28:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix past gen qr imports

Browse Source
This commit is contained in:
Kurt
2016-11-22 17:04:10 -08:00
parent 404b9dab93
commit 0a6228ff0b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
PKHeX/Misc/QR.cs
View File

@@ -96,7 +96,7 @@ internal static byte[] getQRData()
if (data.Contains("could not find")) { Util.Alert("Reader could not find QR data in the image."); return null; }
if (data.Contains("filetype not supported")) { Util.Alert("Input URL is not valid. Double check that it is an image (jpg/png).", address); return null; }
// Quickly convert the json response to a data string
const string cap = ",\"error\":null}]}]";
const string cap = "\",\"error\":null}]}]";
const string intro = "[{\"type\":\"qrcode\",\"symbol\":[{\"seq\":0,\"data\":\"";
if (!data.StartsWith(intro))
throw new Exception();
@@ -115,7 +115,7 @@ internal static byte[] getQRData()
return raw.ToList().Where((c, i) => i % 2 == 0).Skip(0x30).Take(0xE8).ToArray();
}
// All except G7
pkstr = data.Substring(data.IndexOf("#", StringComparison.Ordinal) + 1); // Trim URL
pkstr = pkstr.Substring(pkstr.IndexOf("#", StringComparison.Ordinal) + 1); // Trim URL
pkstr = pkstr.Replace("\\", ""); // Rectify response
return Convert.FromBase64String(pkstr);