br0kenpixel/ReZygisk
1
0
Fork 0
mirror of https://github.com/PerformanC/ReZygisk.git synced 2025-09-06 06:37:01 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

fix: infinity loading

Browse Source
This commit is contained in:
RainyXeon
2024-07-12 18:37:20 +07:00
committed by ThePedroo
parent 5352d4f0e6
commit ea2c8a5388
2 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webroot/index.html
View File

@@ -84,11 +84,11 @@
<div id="root_info_title" class="dimc" style="font-size: 1.1em">Root Implementation</div> <div id="root_info_title" class="dimc" style="font-size: 1.1em">Root Implementation</div>
<div class="dimc desc" id="root_impl" style="font-size: 0.9em; margin-top: 3px;">Unknown</div> <div class="dimc desc" id="root_impl" style="font-size: 0.9em; margin-top: 3px;">Unknown</div>
</div> </div>
<div class="dimc content"> <div id="zygote64" class="dimc content">
<div class="dimc" style="font-size: 1.1em">Zygote64</div> <div class="dimc" style="font-size: 1.1em">Zygote64</div>
<div class="dimc desc" id="zygote32_status" style="font-size: 0.9em; margin-top: 3px;">Unknown</div> <div class="dimc desc" id="zygote32_status" style="font-size: 0.9em; margin-top: 3px;">Unknown</div>
</div> </div>
<div class="dimc"> <div id="zygote32" class="dimc">
<div class="dimc" style="font-size: 1.1em">Zygote32</div> <div class="dimc" style="font-size: 1.1em">Zygote32</div>
<div class="dimc desc" id="zygote64_status" style="font-size: 0.9em; margin-top: 3px;">Unknown</div> <div class="dimc desc" id="zygote64_status" style="font-size: 0.9em; margin-top: 3px;">Unknown</div>
</div> </div>
@@ -108,7 +108,7 @@
<div id="panel_actions_header" class="header">Actions</div> <div id="panel_actions_header" class="header">Actions</div>
<div style="padding: 40px 0px;"></div> <div style="padding: 40px 0px;"></div>
<!-- INFO: Settings card body (Daemon32) --> <!-- INFO: Settings card body (Daemon32) -->
<div class="small_card" style="margin-left: 10px; margin-right: 10px;"> <div id="daemon32" class="small_card" style="margin-left: 10px; margin-right: 10px;">
<div class="small_card_bg content" style="font-size: 1.1em; padding-left: 5px; padding-top: 6px; padding-bottom: 14px;">Daemon (32 bit)</div> <div class="small_card_bg content" style="font-size: 1.1em; padding-left: 5px; padding-top: 6px; padding-bottom: 14px;">Daemon (32 bit)</div>
<div class="small_card_bg content button_list"> <div class="small_card_bg content button_list">
<div id="daemon32_stop_button" class="center button">Stop</div> <div id="daemon32_stop_button" class="center button">Stop</div>
@@ -117,7 +117,7 @@
</div> </div>
</div> </div>
<!-- INFO: Settings card body (Daemon64) --> <!-- INFO: Settings card body (Daemon64) -->
<div class="small_card" style="margin-top: 15px; margin-left: 10px; margin-right: 10px;"> <div id="daemon64" class="small_card" style="margin-top: 15px; margin-left: 10px; margin-right: 10px;">
<div class="small_card_bg content" style="font-size: 1.1em; padding-left: 5px; padding-top: 6px; padding-bottom: 14px;">Daemon (64 bit)</div> <div class="small_card_bg content" style="font-size: 1.1em; padding-left: 5px; padding-top: 6px; padding-bottom: 14px;">Daemon (64 bit)</div>
<div class="small_card_bg content button_list"> <div class="small_card_bg content button_list">
<div id="daemon64_stop_button" class="center button">Stop</div> <div id="daemon64_stop_button" class="center button">Stop</div>

29
webroot/js/main.js
View File

@@ -19,7 +19,6 @@ import { setNewLanguage, getTranslations } from './language.js'
const rootCss = document.querySelector(':root') const rootCss = document.querySelector(':root')
const rezygisk_state = document.getElementById('rezygisk_state') const rezygisk_state = document.getElementById('rezygisk_state')
const rezygisk_action = document.getElementById('rezygisk_action')
const rezygisk_icon_state = document.getElementById('rezygisk_icon_state') const rezygisk_icon_state = document.getElementById('rezygisk_icon_state')
const code_version = document.getElementById('version_code') const code_version = document.getElementById('version_code')
@@ -47,15 +46,15 @@ import { setNewLanguage, getTranslations } from './language.js'
root_impl.innerHTML = lines[4].split(': ')[1] root_impl.innerHTML = lines[4].split(': ')[1]
if (lines[5].split(': ')[1] === 'yes') { if (lines[5].split(': ')[1] === 'yes') {
zygote64_status_div.innerHTML = translations.infoCard.zygote.injected zygote64_status_div.innerHTML = translations.page.home.info.zygote.injected
} else { } else {
zygote64_status_div.innerHTML = translations.infoCard.zygote.notInjected zygote64_status_div.innerHTML = translations.page.home.info.zygote.notInjected
zygote64_status = UNEXPECTED_FAIL zygote64_status = UNEXPECTED_FAIL
} }
} else if (ptrace64Cmd.stderr.includes('cannot execute binary file: Exec format error')) { } else if (ptrace64Cmd.stderr.includes('cannot execute binary file: Exec format error')) {
zygote64_div.remove() zygote64_div.style.display = 'none'
daemon64_div.remove() daemon64_div.style.display = 'none'
} else { } else {
toast(`${translations.cmdErrors.ptrace64} (${ptrace64Cmd.errno}): ${ptrace64Cmd.stderr}`) toast(`${translations.cmdErrors.ptrace64} (${ptrace64Cmd.errno}): ${ptrace64Cmd.stderr}`)
@@ -72,15 +71,15 @@ import { setNewLanguage, getTranslations } from './language.js'
root_impl.innerHTML = lines[4].split(': ')[1] root_impl.innerHTML = lines[4].split(': ')[1]
if (lines[5].split(': ')[1] === 'yes') { if (lines[5].split(': ')[1] === 'yes') {
zygote32_status_div.innerHTML = translations.infoCard.zygote.injected zygote32_status_div.innerHTML = translations.page.home.info.zygote.injected
} else { } else {
zygote32_status_div.innerHTML = translations.infoCard.zygote.notInjected zygote32_status_div.innerHTML = translations.page.home.info.zygote.notInjected
zygote32_status = UNEXPECTED_FAIL zygote32_status = UNEXPECTED_FAIL
} }
} else if (ptrace32Cmd.stderr.includes('not executable: 32-bit ELF file')) { } else if (ptrace32Cmd.stderr.includes('not executable: 32-bit ELF file')) {
zygote32_div.remove() zygote32_div.style.display = 'none'
daemon32_div.remove() daemon32_div.style.display = 'none'
} else { } else {
toast(`${translations.cmdErrors.ptrace32} (${ptrace32Cmd.errno}): ${ptrace32Cmd.stderr}`) toast(`${translations.cmdErrors.ptrace32} (${ptrace32Cmd.errno}): ${ptrace32Cmd.stderr}`)
@@ -88,19 +87,17 @@ import { setNewLanguage, getTranslations } from './language.js'
} }
if (zygote32_status === EXPECTED && zygote64_status === EXPECTED) { if (zygote32_status === EXPECTED && zygote64_status === EXPECTED) {
rezygisk_state.innerHTML = translations.infoCard.status.ok rezygisk_state.innerHTML = translations.page.home.status.ok
rezygisk_action.removeAttribute('style')
rootCss.style.setProperty('--bright', '#3a4857') rootCss.style.setProperty('--bright', '#3a4857')
rezygisk_icon_state.innerHTML = '<img class="brightc" src="assets/tick.svg">' rezygisk_icon_state.innerHTML = '<img class="brightc" src="assets/tick.svg">'
} else if (zygote64_status === EXPECTED ^ zygote32_status.innerHTML === EXPECTED) { } else if (zygote64_status === EXPECTED ^ zygote32_status.innerHTML === EXPECTED) {
rezygisk_state.innerHTML = translations.infoCard.status.partially rezygisk_state.innerHTML = translations.page.home.status.partially
rezygisk_action.removeAttribute('style')
rootCss.style.setProperty('--bright', '#766000') rootCss.style.setProperty('--bright', '#766000')
rezygisk_icon_state.innerHTML = '<img class="brightc" src="assets/warn.svg">' rezygisk_icon_state.innerHTML = '<img class="brightc" src="assets/warn.svg">'
} else { } else {
rezygisk_state.innerHTML = translations.infoCard.status.notWorking rezygisk_state.innerHTML = translations.page.home.status.notWorking
} }
const modules_list = document.getElementById('modules_list') const modules_list = document.getElementById('modules_list')
@@ -142,7 +139,7 @@ import { setNewLanguage, getTranslations } from './language.js'
`<div class="${index !== modules.length ? 'spliter' : ''}" style="padding-top: 13px; padding-bottom: 13px; padding-left: 10px; padding-right: 10px"> `<div class="${index !== modules.length ? 'spliter' : ''}" style="padding-top: 13px; padding-bottom: 13px; padding-left: 10px; padding-right: 10px">
<div style="font-size: 1.1em;">${name}</div> <div style="font-size: 1.1em;">${name}</div>
<div class="desc" style="font-size: 0.9em; margin-top: 3px; white-space: nowrap; align-items: center; display: flex;"> <div class="desc" style="font-size: 0.9em; margin-top: 3px; white-space: nowrap; align-items: center; display: flex;">
<div class="arch_desc">${translations.moduleCard.arch}</div> <div class="arch_desc">${translations.page.modules.arch}</div>
<div style="margin-left: 5px;">${bitsUsed.join(' / ')}</div> <div style="margin-left: 5px;">${bitsUsed.join(' / ')}</div>
</div> </div>
</div>` </div>`
@@ -153,7 +150,7 @@ import { setNewLanguage, getTranslations } from './language.js'
} else { } else {
toast(`${translations.cmdErrors.find}: ${findModulesCmd.stderr}`) toast(`${translations.cmdErrors.find}: ${findModulesCmd.stderr}`)
} }
})() })().catch(err => toast(err.message))
function setLangData(mode) { function setLangData(mode) {
localStorage.setItem('/system/language', mode) localStorage.setItem('/system/language', mode)