234 lines
22 KiB
Plaintext
234 lines
22 KiB
Plaintext
|
+
|
|||
|
|
ƒÛiTX ã ó
|
|||
|
|
€ ^ RI t ^ RIt^ RIt^ RItR tR tR tR tR tR t R t
|
|||
|
|
R t R
|
|||
|
|
t R t
|
|||
|
|
R tR
|
|||
|
|
R lt]R8X dE ]! ]P$ 4 ^8 d ]P& ! R4 ]! ]P$ ^, 4 R# R# )é Nc óŒ € \ V R RR7 ;_uu_ 4 pVP 4 uuRRR4 # + ' g i R# ; i)Úrúutf-8©ÚencodingN)ÚopenÚread)ÚpathÚfs & ÚE/Users/justinoros/Downloads/xteink-plugins/plugins/locksreen/patch.pyÚ read_filer
|
|||
|
|
s+ € Ü
|
|||
|
|
ˆd�C '× *Õ *¨aØ�v‰v‹x÷
|
|||
|
|
+× *× *Ó *ús —2² A c óŽ € \ V R RR7 ;_uu_ 4 pVP V4 RRR4 R# + ' g i R# ; i)Úwr r N)r Úwrite)r
|
|||
|
|
Úcontentr s && r Ú
|
|||
|
|
write_filer
|
|||
|
|
s. € Ü
|
|||
|
|
ˆd�C '× *Õ *¨aØ �‰�Ô÷
|
|||
|
|
+× *× *Ò *ús —3³ A c óÊ € \ P ! \ P P VR V 4 RR7 pV' g \ P
|
|||
|
|
! RV RV 24 V^ , # )z**T)Ú recursivezERROR: Could not locate z in )ÚglobÚosr
|
|||
|
|
ÚjoinÚsysÚexit)ÚfilenameÚrepo_dirÚresultss && r Ú
|
|||
|
|
find_firstr sJ € Ü�iŠiœŸ™Ÿ ™ X¨t°XÓ>È$ÔO€Gß Ü �ŠÐ+¨H¨:°T¸(¸ÐDÔEØ �1�:Ðó c ó € \ P P VR RR4 p\ P P VR R4 p\ P ! VRR7 0 Rmp\ P ! V 4 F‡ pVP R4 ' g K \ P P W4 p\ P P WT9 d TMTV4 p\ P ! Wg4 \ RV 24 K‰ R# ) ÚsrcÚ
|
|||
|
|
activitiesÚsettingsT)Úexist_oku ✓ N> úLockscreenPlugin.húLockscreenPlugin.cppúLockscreenSettingsPage.húLockscreenSettingsPage.cpp)z.hz.cppz.hpp) r r
|
|||
|
|
r ÚmakedirsÚlistdirÚendswithÚshutilÚcopy2Úprint)Ú
|
|||
|
|
plugin_dirr Ú
|
|||
|
|
settings_destÚactivities_destÚsettings_filesÚfnamer Údsts && r Úcopy_plugin_sourcesr4 s¶ € Ü—g‘g—l‘l 8¨U°LÀ*ÓM€MÜ—g‘g—l‘l 8¨U°LÓA€O܇K‚K�
|
|||
|
|
¨Õ-ò€Nô
|
|||
|
|
—’˜JÖ'ˆØ�~‰~Ð 4×5Ò5Ù Ü�g‰g�l‰l˜:Ó-ˆÜ�g‰g�l‰l¨EÔ,C™=È ÐZ_Ó`ˆÜ� Š �SÔ Ü
|
|||
|
|
�˜˜Ð Ö!ó
|
|||
|
|
(r c óÐ € \ R V 4 p\ V4 pRV9 d \ R4 R# VP RR4 pVP RR4 p\ W4 \ R4 R# ) zCrossPointSettings.hÚlockscreenModez1 CrossPointSettings.h already patched, skipping.Nz$#pragma once
|
|||
|
|
#include <HalStorage.h>zV#pragma once
|
|||
|
|
#include <HalStorage.h>
|
|||
|
|
#include "activities/settings/LockscreenPlugin.h"z* uint8_t imageRendering = IMAGES_DISPLAY;zm uint8_t imageRendering = IMAGES_DISPLAY;
|
|||
|
|
uint8_t lockscreenMode = 0;
|
|||
|
|
char lockscreenPinHash[9] = {};z CrossPointSettings.h patched.©r r
|
|||
|
|
r- Úreplacer )r r
|
|||
|
|
r s & r Ú patch_cross_point_settings_hr9 + sk € ÜÐ/°Ó:€Dܘ‹o€Gà˜7Ô"Ü
|
|||
|
|
ÐAÔBÙà�o‰oØ/Øbó€Gð �o‰oØ4ð /ó€Gô ˆtÔ Ü Ð
|
|||
|
|
+Ö,r c óž € \ R V 4 p\ V4 pRV9 dF RV9 d? RV9 d+ VP RR4 p\ W4 \ R4 R# \ R4 R# RV9 d2 RV9 d+ VP R R
|
|||
|
|
4 p\ W4 \ R 4 R# R pVP R
|
|||
|
|
VR
|
|||
|
|
, 4 p\ W4 \ R4 R# )zSettingsList.hr6 ÚlockscreenPinHashzm{StrId::STR_NONE_OPT, StrId::STR_NONE_OPT,
|
|||
|
|
StrId::STR_NONE_OPT, StrId::STR_NONE_OPT}z‡ {StrId::STR_NONE_OPT, StrId::STR_NONE_OPT,
|
|||
|
|
StrId::STR_NONE_OPT, StrId::STR_NONE_OPT},
|
|||
|
|
zD {StrId::STR_NONE_OPT, StrId::STR_NONE_OPT},
|
|||
|
|
z? SettingsList.h patched (reduced lockscreenMode to 2 options).z+ SettingsList.h already patched, skipping.Nz@ "lockscreenMode", StrId::STR_NONE_OPT),
|
|||
|
|
a "lockscreenMode", StrId::STR_NONE_OPT),
|
|||
|
|
SettingInfo::String(StrId::STR_NONE_OPT, SETTINGS.lockscreenPinHash,
|
|||
|
|
sizeof(SETTINGS.lockscreenPinHash),
|
|||
|
|
"lockscreenPinHash", StrId::STR_NONE_OPT),
|
|||
|
|
z3 SettingsList.h patched (added lockscreenPinHash).a¥
|
|||
|
|
SettingInfo::Enum(StrId::STR_NONE_OPT, &CrossPointSettings::lockscreenMode,
|
|||
|
|
{StrId::STR_NONE_OPT, StrId::STR_NONE_OPT},
|
|||
|
|
"lockscreenMode", StrId::STR_NONE_OPT),
|
|||
|
|
SettingInfo::String(StrId::STR_NONE_OPT, SETTINGS.lockscreenPinHash,
|
|||
|
|
sizeof(SETTINGS.lockscreenPinHash),
|
|||
|
|
"lockscreenPinHash", StrId::STR_NONE_OPT),
|
|||
|
|
z };
|
|||
|
|
return list;
|
|||
|
|
}
|
|||
|
|
z SettingsList.h patched.©r r
|
|||
|
|
r8 r r- )r r
|
|||
|
|
r Úentrys & r Úpatch_settings_list_hr> B sì € ÜÐ)¨8Ó4€Dܘ‹o€Gà˜7Ô"Ð':¸gÔ'EØ {ð @Gô GØ —o‘oðXàWóˆGô
|
|||
|
|
|
|||
|
|
�tÔ %Ü ÐSÔ Tñ ô
|
|||
|
|
Ð?Ô @Ùà˜7Ô"Ð':À'Ô'IØ—/‘/Ø Oð
|
|||
|
|
Uó
|
|||
|
|
ˆô �4Ô!Ü
|
|||
|
|
ÐCÔDÙð Qð
|
|||
|
|
ð �o‰oØ#Ø
|
|||
|
|
Ð+Õ+ó€Gô
|
|||
|
|
ˆtÔ Ü Ð
|
|||
|
|
%Ö&r c ó € \ R V 4 p\ V4 pRV9 pRV9 pV' d V' d \ R4 R# V' g VP RR4 pV' g VP RR4 p\ W4 \ R 4 R# )
|
|||
|
|
zSettingsActivity.hzcategoryCount = 5ÚpluginsSettingsz/ SettingsActivity.h already patched, skipping.Nz'static constexpr int categoryCount = 4;z'static constexpr int categoryCount = 5;z* std::vector<SettingInfo> systemSettings;zV std::vector<SettingInfo> systemSettings;
|
|||
|
|
std::vector<SettingInfo> pluginsSettings;z SettingsActivity.h patched.r7 )r r
|
|||
|
|
r Úalready_has_plugins_tabÚalready_has_plugins_vecs & r Úpatch_settings_hrC r sƒ € ÜÐ-¨xÓ8€Dܘ‹o€Gà 1°WÑ <ÐØ /°7Ñ :Ðç ×#:Ü
|
|||
|
|
Ð?Ô@Ùç "Ø—/‘/Ø 5Ø 5ó
|
|||
|
|
ˆ÷
|
|||
|
|
#Ø—/‘/Ø 8Ø eó
|
|||
|
|
ˆô
|
|||
|
|
ˆtÔ Ü Ð
|
|||
|
|
)Ö*r c ó¸ € \ R V 4 p\ V4 pRV9 d RV9 d RV9 d \ R4 R# RpRV9 d VP RR4 pR pR
|
|||
|
|
V9 d VP R R 4 pR pR
|
|||
|
|
V9 d VP RR4 pR pMcRV9 d VP RR4 pR pMGRV9 dA VP RR4 pRV9 d& ^ RIpVP RR V^VP R7 pR pRV9 d VP RR4 pR pRV9 d VP R R 4 pR pR V9 d VP R R 4 pR pR!V9 d VP R"R#4 pR pMRV9 d VP R$R%4 pR pR&V9 d VP R'R(4 pR pRV9 d VP R)R*4 pR pV' d \ W4 \ R+4 R# \ R4 R# ),zSettingsActivity.cppz"LockscreenPlugin.h"r; z%"lockscreenMode") return "Lockscreen"z1 SettingsActivity.cpp already patched, skipping.NFz#include "SettingsList.h"zv#include "SettingsList.h"
|
|||
|
|
#include "activities/settings/LockscreenPlugin.h"
|
|||
|
|
#include "activities/LockscreenActivity.h"TzSTR_NONE_OPT};z0StrId::STR_CAT_CONTROLS, StrId::STR_CAT_SYSTEM};zƒStrId::STR_CAT_CONTROLS, StrId::STR_CAT_SYSTEM,
|
|||
|
|
StrId::STR_NONE_OPT};zpluginsSettings.clear()z systemSettings.clear();
|
|||
|
|
zâ systemSettings.clear();
|
|||
|
|
pluginsSettings.clear();
|
|||
|
|
for (const auto& setting : getSettingsList()) {
|
|||
|
|
if (setting.key && std::string(setting.key) == "lockscreenMode") {
|
|||
|
|
pluginsSettings.push_back(setting);
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
zpluginsSettings.push_backz pluginsSettings.clear();
|
|||
|
|
zÈ pluginsSettings.clear();
|
|||
|
|
for (const auto& setting : getSettingsList()) {
|
|||
|
|
if (setting.key && std::string(setting.key) == "lockscreenMode") {
|
|||
|
|
pluginsSettings.push_back(setting);
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
z3"lockscreenMode") {
|
|||
|
|
pluginsSettings.push_backzß for (const auto& setting : getSettingsList()) {
|
|||
|
|
if (setting.key && std::string(setting.key) == "lockscreenMode") {
|
|||
|
|
pluginsSettings.push_back(setting);
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
for (const auto& setting : getSettingsList()) {z@( pluginsSettings\.clear\(\);(\n for.*?push_back.*?\n \}\n)*)c ó2 € V P ^ 4 R, # )r z for (const auto& setting : getSettingsList()) {
|
|||
|
|
if (setting.key && std::string(setting.key) == "lockscreenMode") {
|
|||
|
|
pluginsSettings.push_back(setting);
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
)Úgroup)Úms &r Ú<lambda>Ú$patch_settings_cpp.<locals>.<lambda>Ö s € ˜!Ÿ'™' !›*ð ö r )ÚcountÚflagszcase 4:zH case 3:
|
|||
|
|
currentSettings = &systemSettings;
|
|||
|
|
break;
|
|||
|
|
z‘ case 3:
|
|||
|
|
currentSettings = &systemSettings;
|
|||
|
|
break;
|
|||
|
|
case 4:
|
|||
|
|
currentSettings = &pluginsSettings;
|
|||
|
|
break;
|
|||
|
|
z "Plugins"zQ tabs.push_back({I18N.get(categoryNames[i]), selectedCategoryIndex == i});
|
|||
|
|
}z� const char* tabLabel = (i == 4) ? "Plugins" : I18N.get(categoryNames[i]);
|
|||
|
|
tabs.push_back({tabLabel, selectedCategoryIndex == i});
|
|||
|
|
}Ú
|
|||
|
|
nextCatIdxzÐ const auto confirmLabel = (selectedSettingIndex == 0)
|
|||
|
|
? I18N.get(categoryNames[(selectedCategoryIndex + 1) % categoryCount])
|
|||
|
|
: tr(STR_TOGGLE);a const int nextCatIdx = (selectedCategoryIndex + 1) % categoryCount;
|
|||
|
|
const char* nextCatLabel = (nextCatIdx == 4) ? "Plugins" : I18N.get(categoryNames[nextCatIdx]);
|
|||
|
|
const auto confirmLabel = (selectedSettingIndex == 0) ? nextCatLabel : tr(STR_TOGGLE);zselectedCategoryIndex == 4zU [&settings](int index) { return std::string(I18N.get(settings[index].nameId)); },a [&settings, this](int index) -> std::string {
|
|||
|
|
if (selectedCategoryIndex == 4) {
|
|||
|
|
const auto& s = settings[index];
|
|||
|
|
if (s.key && std::string(s.key) == "lockscreenMode") return "Lockscreen";
|
|||
|
|
}
|
|||
|
|
return std::string(I18N.get(settings[index].nameId));
|
|||
|
|
},zQ if (selectedCategoryIndex == 4) {
|
|||
|
|
const auto& s = settings[index];
|
|||
|
|
z£ if (selectedCategoryIndex == 4) {
|
|||
|
|
const auto& s = settings[index];
|
|||
|
|
if (s.key && std::string(s.key) == "lockscreenMode") return "Lockscreen";
|
|||
|
|
zLockscreenPlugin::modeNamez[ } else {
|
|||
|
|
valueText = I18N.get(setting.enumValues[value]);
|
|||
|
|
}a } else if (setting.key && std::string(setting.key) == "lockscreenMode") {
|
|||
|
|
valueText = LockscreenPlugin::modeName(static_cast<LockscreenMode>(value));
|
|||
|
|
} else {
|
|||
|
|
valueText = I18N.get(setting.enumValues[value]);
|
|||
|
|
}z9 SETTINGS.saveToFile();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
void SettingsActivity::rendera if (setting.key && std::string(setting.key) == "lockscreenMode") {
|
|||
|
|
if (SETTINGS.lockscreenMode == 0) {
|
|||
|
|
memset(SETTINGS.lockscreenPinHash, 0, sizeof(SETTINGS.lockscreenPinHash));
|
|||
|
|
} else if (SETTINGS.lockscreenPinHash[0] == '\0') {
|
|||
|
|
startActivityForResult(
|
|||
|
|
std::make_unique<LockscreenActivity>(renderer, mappedInput, LockscreenActivity::Purpose::CREATE),
|
|||
|
|
[](const ActivityResult&) { SETTINGS.saveToFile(); });
|
|||
|
|
return;
|
|||
|
|
}
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
SETTINGS.saveToFile();
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
void SettingsActivity::renderz SettingsActivity.cpp patched.)r r
|
|||
|
|
r- r8 ÚreÚsubÚDOTALLr )r r
|
|||
|
|
r ÚchangedrM s & r Úpatch_settings_cpprQ � so € ÜÐ/°Ó:€Dܘ‹o€Gà Ô(Ð-@ÀGÔ-KÐPwð |Cô QCÜ
|
|||
|
|
ÐAÔBÙà€Gà WÔ,Ø—/‘/Ø 'ð
|
|||
|
|
9ó
|
|||
|
|
ˆð ˆà˜wÔ&Ø—/‘/Ø >ð
|
|||
|
|
bó
|
|||
|
|
ˆð
|
|||
|
|
ˆà ¨Ô/Ø—/‘/Ø )ð
|
|||
|
|
ó
|
|||
|
|
ˆð ‰Ø $¨GÔ 3Ø—/‘/Ø *ð
|
|||
|
|
ó
|
|||
|
|
ˆð ‰Ø ?ÀwÔ NØ—/‘/ð
|
|||
|
|
@ð
|
|||
|
|
@ó
|
|||
|
|
ˆð$ BÈÔ PÛ Ø—f‘fØSñ ð ØØ—i‘ið ó ˆGð ˆà˜Ô Ø—/‘/ð
|
|||
|
|
ð
|
|||
|
|
ó
|
|||
|
|
|
|||
|
|
ˆð ˆà˜'Ô!Ø—/‘/ð
|
|||
|
|
ð
|
|||
|
|
ó
|
|||
|
|
ˆð ˆà˜7Ô"Ø—/‘/ð
|
|||
|
|
@ð
|
|||
|
|
gó
|
|||
|
|
ˆð ˆà#¨7Ô2Ø—/‘/Ø cð
|
|||
|
|
ó
|
|||
|
|
ˆð ‰Ø 0¸Ô ?Ø—/‘/ð
|
|||
|
|
9ð
|
|||
|
|
bó
|
|||
|
|
ˆð ˆà#¨7Ô2Ø—/‘/ð
|
|||
|
|
ð
|
|||
|
|
ó
|
|||
|
|
ˆð ˆà 'Ô)Ø—/‘/ð
|
|||
|
|
,ð
|
|||
|
|
,ó
|
|||
|
|
ˆð* ˆçÜ�4Ô!Ü
|
|||
|
|
Ð/Ö0ä
|
|||
|
|
ÐAÖBr c ó0 € \ R V 4 p\ V4 pRV9 d \ R4 R# RpW29 d+ VP VR4 p\ W4 \ R4 R# RpVP RR V, R
|
|||
|
|
, 4 p\ W4 \ R4 R# ) zCrossPointWebServer.cppzlockscreenMode") continuez4 CrossPointWebServer.cpp already patched, skipping.Nz„ if (s.key && strcmp(s.key, "lockscreenMode") == 0) {
|
|||
|
|
doc["name"] = "Lockscreen";
|
|||
|
|
doc["category"] = "Plugins";
|
|||
|
|
}
|
|||
|
|
zn if (s.key && (strcmp(s.key, "lockscreenMode") == 0 || strcmp(s.key, "lockscreenPinHash") == 0)) continue;
|
|||
|
|
z? CrossPointWebServer.cpp patched (lockscreen hidden from WUI).zo
|
|||
|
|
if (s.key && (strcmp(s.key, "lockscreenMode") == 0 || strcmp(s.key, "lockscreenPinHash") == 0)) continue;
|
|||
|
|
zB doc["category"] = I18N.get(s.category);
|
|||
|
|
|
|||
|
|
switch (s.type) {z, doc["category"] = I18N.get(s.category);
|
|||
|
|
z
|
|||
|
|
switch (s.type) {r7 )r r
|
|||
|
|
r ÚtargetÚ
|
|||
|
|
name_overrides & r Úpatch_web_serverrU F s² € ÜÐ2°HÓ=€Dܘ‹o€Gà" gÔ-Ü
|
|||
|
|
ÐDÔEÙð ð ð ÔØ—/‘/Ø Ø }ó
|
|||
|
|
ˆô �4Ô!Ü
|
|||
|
|
ÐOÔPÙð zð ð
|
|||
|
|
�o‰oð ð 8Ø
|
|||
|
|
õ ð õ ó €Gô ˆtÔ Ü Ð
|
|||
|
|
KÖLr c ón € \ R V 4 p\ V4 pRV9 dM RV9 g RV9 g RV9 d+ VP RR4 p\ W4 \ R4 R # \ R4 R # VP R
|
|||
|
|
R 4 pR pVP R
|
|||
|
|
RV, R, 4 p\ W4 \ R4 R # )zmain.cppÚLockscreenPluginÚshouldLockOnWakeÚshouldLockOnPowerÚ wasInReadera const bool wasInReader = APP_STATE.lastSleepFromReader;
|
|||
|
|
const bool shouldLock =
|
|||
|
|
hasPinSet &&
|
|||
|
|
((lsMode == LockscreenMode::ENABLED) ||
|
|||
|
|
(lsMode == LockscreenMode::ON_POWER && !wasInReader) ||
|
|||
|
|
(lsMode == LockscreenMode::ON_WAKE && wasInReader));
|
|||
|
|
zO const bool shouldLock = hasPinSet && LockscreenPlugin::shouldLock(lsMode);
|
|||
|
|
z- main.cpp patched (updated shouldLock call).z% main.cpp already patched, skipping.Nz #include "CrossPointSettings.h"z|#include "CrossPointSettings.h"
|
|||
|
|
#include "activities/settings/LockscreenPlugin.h"
|
|||
|
|
#include "activities/LockscreenActivity.h"aÑ
|
|||
|
|
{
|
|||
|
|
const auto lsMode = static_cast<LockscreenMode>(SETTINGS.lockscreenMode);
|
|||
|
|
const bool hasPinSet = SETTINGS.lockscreenPinHash[0] != '\0';
|
|||
|
|
const bool shouldLock = hasPinSet && LockscreenPlugin::shouldLock(lsMode);
|