From 3398b2fa67f8c5be397cce1cc2afe959d57d801e Mon Sep 17 00:00:00 2001 From: Alexander Sergeev Date: Fri, 26 Jul 2024 21:54:42 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=83=D0=B1=D0=BB=D0=B8=D0=BA=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Bot_Funcs.cs | 3 +- FirehoseFinder.csproj | 2 +- ForFilter.xml | 113 ++++++++++++++++-------------- ForFound.xml | 2 +- Properties/AssemblyInfo.cs | 4 +- Properties/Resources.Designer.cs | 9 +++ Properties/Resources.en.resx | 4 ++ Properties/Resources.resx | 3 + Properties/Resources.zh-Hans.resx | 4 ++ 9 files changed, 87 insertions(+), 57 deletions(-) diff --git a/Bot_Funcs.cs b/Bot_Funcs.cs index c7aa2b6..c1cd877 100644 --- a/Bot_Funcs.cs +++ b/Bot_Funcs.cs @@ -40,8 +40,7 @@ internal static async Task BotWork() // ErrorHandler - обработчик ошибок, связанных с Bot API _botClient.StartReceiving(UpdateHandler, ErrorHandler, _receiverOptions, cts.Token); // Запускаем бота var me = await _botClient.GetMeAsync(); // Создаем переменную, в которую помещаем информацию о нашем боте. - MessageBox.Show("Если у вас не получилость автоматически авторизоваться, то вы можете найти в Телеграм бота \"Hoplik-Bot\"" + - " и при запущенном приложении FhF попробовать ввести после команды /start код авторизации:" + Environment.NewLine + Settings.Default.auth_code.ToString(), + MessageBox.Show(LocRes.GetString("bot_code_start") + Environment.NewLine + Settings.Default.auth_code.ToString(), me.FirstName + '\u0020' + LocRes.GetString("bot_title_start_suc")); await Task.Delay(-1); } diff --git a/FirehoseFinder.csproj b/FirehoseFinder.csproj index e64b3db..4cc9cc5 100644 --- a/FirehoseFinder.csproj +++ b/FirehoseFinder.csproj @@ -37,7 +37,7 @@ false true 0 - 24.7.18.0 + 24.7.26.0 false true true diff --git a/ForFilter.xml b/ForFilter.xml index 63528f6..c024d2b 100644 --- a/ForFilter.xml +++ b/ForFilter.xml @@ -96,7 +96,7 @@ - + 009600E1 Snapdragon 210 @@ -2713,7 +2713,7 @@ ZUK ZUK Z2131 z2_plus -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D7D6A1C7/prog_ufs_firehose_8996_ddr_zuk.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D7D6A1C7/prog_emmc_firehose_8996_ddr_zuk.elf# 009470E1 @@ -2724,7 +2724,7 @@ ZUK ZUK Z2131 z2_plus -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D7D6A1C7/prog_emmc_firehose_8996_ddr_zuk.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D7D6A1C7/prog_ufs_firehose_8996_ddr_zuk.elf# 009470E1 @@ -2800,7 +2800,7 @@ AGM AGM Glory_G1S AGM_Glory_G1S_US -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/707AF1D8/prog_firehose_ddr_0016F0E1.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/707AF1D8/prog_firehose_lite_0016F0E1.elf# full trust @@ -2813,7 +2813,7 @@ AGM AGM Glory_G1S AGM_Glory_G1S_US -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/707AF1D8/prog_firehose_lite_0016F0E1.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/707AF1D8/prog_firehose_ddr_0016F0E1.elf# full trust @@ -2877,7 +2877,7 @@ blackshark SHARK MBU-H0 MBU-H0, Black Shark 3 (8/128) -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D00B50E2/prog_ufs_firehose_sm8250_lite_lp4.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D00B50E2/prog_ufs_firehose_sm8250_ddr_lp4.elf# full trust @@ -2890,7 +2890,7 @@ blackshark SHARK MBU-H0 MBU-H0, Black Shark 3 (8/128) -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D00B50E2/prog_ufs_firehose_sm8250_ddr_lp4.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D00B50E2/prog_ufs_firehose_sm8250_lite_lp4.elf# full trust @@ -3179,7 +3179,7 @@ HUAWEI BKK-L21 Honor 8C, BKK-L21RU, BKK-AL10 -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/BF6AE119/000ba0e100150067_6bc369511da9cadb_fhprg_peek.bin# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/BF6AE119/prog_emmc_firehose.mbn# full trust @@ -3192,7 +3192,7 @@ HUAWEI BKK-L21 Honor 8C, BKK-L21RU, BKK-AL10 -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/BF6AE119/prog_emmc_firehose.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/BF6AE119/000ba0e100150067_6bc369511da9cadb_fhprg_peek.bin# full trust @@ -4336,25 +4336,25 @@ full trust 0010A0E1 Snapdragon 665 -0000 -0000 -D40EEE56F3194665574109A39267724AE7944134CD53CB767E293D3C40497955BC8A4519FF992B031FADC6355015AC87 +0042 +0052 +9F9740C424E5BCFA8C8F60BBE3F9B5F7E4905E4F5D7CE24BD39AACF30CC1EE6067755FB7E94DDA7FBC9BBEA3BABC051B 00000000 TCL 9296Q -TABMAX 10.4, 9296Q_EEA +TABMAX 10.4, 9296Q_RU full trust 0010A0E1 Snapdragon 665 -0042 -0052 -9F9740C424E5BCFA8C8F60BBE3F9B5F7E4905E4F5D7CE24BD39AACF30CC1EE6067755FB7E94DDA7FBC9BBEA3BABC051B +0000 +0000 +D40EEE56F3194665574109A39267724AE7944134CD53CB767E293D3C40497955BC8A4519FF992B031FADC6355015AC87 00000000 TCL 9296Q -TABMAX 10.4, 9296Q_RU +TABMAX 10.4, 9296Q_EEA full trust @@ -4673,7 +4673,7 @@ Xiaomi Redmi Note 4 mido, 4X -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/prog_emmc_firehose_8953_ddr_mido.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/26-03-2021_16-02-22_prog_emmc_firehose_8953_ddr.mbn# full trust @@ -4686,7 +4686,7 @@ Xiaomi Redmi Note 4 mido, 4X -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/26-03-2021_16-02-22_prog_emmc_firehose_8953_ddr.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/prog_emmc_firehose_8953_ddr_mido.mbn# full trust @@ -6599,9 +6599,9 @@ real dev 0008B0E1 Snapdragon 845 -0000 +0031 0000 -AFCA69D4235117E5BFC21467068B20DF85E0115D7413D5821883A6D244961581 +1030CD12CE708F29D6914D7529DF75149D8EF91C27DAF0E1F84B90F4B707329A 00000000 LGE LM-V400N @@ -6612,9 +6612,9 @@ real dev 0008B0E1 Snapdragon 845 -0031 +0000 0000 -1030CD12CE708F29D6914D7529DF75149D8EF91C27DAF0E1F84B90F4B707329A +AFCA69D4235117E5BFC21467068B20DF85E0115D7413D5821883A6D244961581 00000000 LGE LM-V400N @@ -7125,7 +7125,7 @@ motorola Moto Z Force griffin_verizon, XT1650-01, XT1650-02, XT1650-03, XT1650-05 (Griffin) -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/F543B6A5/prog_ufs_firehose_8996_ddr_motogriff.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/F543B6A5/prog_ufs_firehose_8996_lge.elf# real dev @@ -7138,7 +7138,7 @@ motorola Moto Z Force griffin_verizon, XT1650-01, XT1650-02, XT1650-03, XT1650-05 (Griffin) -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/F543B6A5/prog_ufs_firehose_8996_lge.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/F543B6A5/prog_ufs_firehose_8996_ddr_motogriff.elf# real dev @@ -7179,11 +7179,11 @@ real dev -001360E1 -Snapdragon 460 -0000 -0000 -6343DCCCA225D2B3CA208F9775971EC38D3DECF67CD6FFE39158E5A340B2C16E0DBAC21A3AF087471BA86B713CAA5036 +000BF0E1 +Snapdragon 439 +0035 +9571 +06917D466C907E9F411207A6E1F8663EBEAFB598DA3A6DAFFE2F538FA75DB643 00000000 Nokia 4.2 @@ -7191,11 +7191,11 @@ real dev -000BF0E1 -Snapdragon 439 -0035 -9571 -06917D466C907E9F411207A6E1F8663EBEAFB598DA3A6DAFFE2F538FA75DB643 +001360E1 +Snapdragon 460 +0000 +0000 +6343DCCCA225D2B3CA208F9775971EC38D3DECF67CD6FFE39158E5A340B2C16E0DBAC21A3AF087471BA86B713CAA5036 00000000 Nokia 4.2 @@ -7731,8 +7731,8 @@ real dev -009510E1 -Snapdragon X12 LTE +007050E1 +Snapdragon 400/410 0000 0000 CC3153A80293939B90D02D3BF8B23E0292E452FEF662C74998421ADAD42A380F @@ -7743,8 +7743,8 @@ real dev -007050E1 -Snapdragon 400/410 +009510E1 +Snapdragon X12 LTE 0000 0000 CC3153A80293939B90D02D3BF8B23E0292E452FEF662C74998421ADAD42A380F @@ -7951,7 +7951,7 @@ Snapdragon 410 0000 0000 -996C7888282743ACED72ACC73D3228DBF4938C291AC05931A79E45BC0BCE268A +0A89F6A5832A55D32CD3FAC927372439D63B329A1135B0CB72A8E4013EC94E89 00000001 Samsung GT-I9192I @@ -7963,7 +7963,7 @@ Snapdragon 410 0000 0000 -0A89F6A5832A55D32CD3FAC927372439D63B329A1135B0CB72A8E4013EC94E89 +996C7888282743ACED72ACC73D3228DBF4938C291AC05931A79E45BC0BCE268A 00000001 Samsung GT-I9192I @@ -8015,7 +8015,7 @@ Samsung SM-A015F Galaxy A01 -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8AA10082/1/000bf0e100200000_3cc959ac5b3364a4_fhprg.bin# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8AA10082/1/A015F_prog_emmc_firehose_8937_ddr.mbn# real dev @@ -8028,7 +8028,7 @@ Samsung SM-A015F Galaxy A01 -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8AA10082/1/A015F_prog_emmc_firehose_8937_ddr.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8AA10082/1/000bf0e100200000_3cc959ac5b3364a4_fhprg.bin# real dev @@ -8641,8 +8641,8 @@ Snapdragon 778G (SM7325-AB) 0020 0000 -D574514FCEEEAFAB1DC6A85E34E335521B8C6159BA28CC4D4EEEF3D6E8D81DF616B5FD8C281B2E0DEF8817B43EC79F71 -00000004 +7B1E99351BE83CB8BDE679B37FB7F32AFEC065A4389302A2CF41025AFF4E64620CCCDED659EB4825835F3D9612ACE862 +00000003 Samsung SM-M526B Galaxy M52 5G @@ -8653,8 +8653,8 @@ Snapdragon 778G (SM7325-AB) 0020 0000 -7B1E99351BE83CB8BDE679B37FB7F32AFEC065A4389302A2CF41025AFF4E64620CCCDED659EB4825835F3D9612ACE862 -00000003 +D574514FCEEEAFAB1DC6A85E34E335521B8C6159BA28CC4D4EEEF3D6E8D81DF616B5FD8C281B2E0DEF8817B43EC79F71 +00000004 Samsung SM-M526B Galaxy M52 5G @@ -9090,6 +9090,17 @@ real dev +0007D0E1 +Snapdragon 660 +0000 +0000 +36C886068D9A6634E9C55185044344E9E756DCC3B5960874942C7A1A1550DEE0D42CDBC7D1923B7F0123420E1793A010 +00000000 +Telit +LM960A18 + + +real dev 009600E1 Snapdragon 210 0000 @@ -9321,7 +9332,7 @@ Xiaomi Black Shark 3 5G KLE-A0, 12/256 -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D00B50E2/prog_ufs_firehose_sm8250_lite_lp5.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D00B50E2/prog_ufs_firehose_sm8250_ddr_lp5.elf# real dev @@ -9334,7 +9345,7 @@ Xiaomi Black Shark 3 5G KLE-A0, 12/256 -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D00B50E2/prog_ufs_firehose_sm8250_ddr_lp5.elf# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/D00B50E2/prog_ufs_firehose_sm8250_lite_lp5.elf# real dev @@ -9922,7 +9933,7 @@ Xiaomi Redmi Go tiare -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/Go_prog_emmc_firehose_8917_ddr.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/Redmi_8917.mbn# real dev @@ -9935,7 +9946,7 @@ Xiaomi Redmi Go tiare -#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/Redmi_8917.mbn# +#https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/Go_prog_emmc_firehose_8917_ddr.mbn# real dev diff --git a/ForFound.xml b/ForFound.xml index ec31bab..4341cce 100644 --- a/ForFound.xml +++ b/ForFound.xml @@ -75,7 +75,7 @@ - + #https://github.com/hoplik/Firehose-Finder/blob/master/fh_collection/8403D39A/Go_prog_emmc_firehose_8917_ddr.mbn# 000560E1 diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 6663f6e..46bdf48 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -32,6 +32,6 @@ // Можно задать все значения или принять номера сборки и редакции по умолчанию // используя "*", как показано ниже: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("24.7.18.0")] -[assembly: AssemblyFileVersion("24.7.18.0")] +[assembly: AssemblyVersion("24.7.26.0")] +[assembly: AssemblyFileVersion("24.7.26.0")] [assembly: NeutralResourcesLanguage("ru-RU")] diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 9f7dcd7..b22c332 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -191,6 +191,15 @@ internal static string bot { } } + /// + /// Ищет локализованную строку, похожую на Если у вас не получилость автоматически авторизоваться, то вы можете найти в Телеграм бота "Hoplik-Bot" и при запущенном приложении FhF попробовать ввести после команды /start код авторизации:. + /// + internal static string bot_code_start { + get { + return ResourceManager.GetString("bot_code_start", resourceCulture); + } + } + /// /// Ищет локализованную строку, похожую на успешно запущен!. /// diff --git a/Properties/Resources.en.resx b/Properties/Resources.en.resx index a5ff655..ff64c8c 100644 --- a/Properties/Resources.en.resx +++ b/Properties/Resources.en.resx @@ -149,6 +149,10 @@ Authorization is required! Требуется авторизация! + + If you failed to log in automatically, then you can find the "Hoplik-Bot" bot in the Telegram and try to enter the authorization code after the /start command when the FhF application is running: + Если у вас не получилость автоматически авторизоваться, то вы можете найти в Телеграм бота "Hoplik-Bot" и при запущенном приложении FhF попробовать ввести после команды /start код авторизации: + successfully launched! успешно запущен! diff --git a/Properties/Resources.resx b/Properties/Resources.resx index b042447..5fbc5d9 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -715,4 +715,7 @@ Пожалуйста, дождитесь сообщения об успешном запуске бота! + + Если у вас не получилость автоматически авторизоваться, то вы можете найти в Телеграм бота "Hoplik-Bot" и при запущенном приложении FhF попробовать ввести после команды /start код авторизации: + \ No newline at end of file diff --git a/Properties/Resources.zh-Hans.resx b/Properties/Resources.zh-Hans.resx index 5789575..486fc0f 100644 --- a/Properties/Resources.zh-Hans.resx +++ b/Properties/Resources.zh-Hans.resx @@ -149,6 +149,10 @@ 需要授权! Требуется авторизация! + + 如果您未能自动登录，那么您可以在Telegram中找到"Hoplik-Bot"机器人，并尝试在FhF应用程序运行时在/start命令之后输入授权代码: + Если у вас не получилость автоматически авторизоваться, то вы можете найти в Телеграм бота "Hoplik-Bot" и при запущенном приложении FhF попробовать ввести после команды /start код авторизации: + 成功发射！ успешно запущен!