Skip to content

Commit

Permalink
update messages
Browse files Browse the repository at this point in the history
  • Loading branch information
infinitepower18 committed Mar 15, 2023
1 parent ba7d6d4 commit 35e54d2
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions sideloader.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,11 +220,11 @@ def main():
window["_ERROR2_"].Update(visible=False)
window["_ERROR1_"].Update(visible=False)
elif check.startswith("failed to authenticate"):
window["_ERROR2_"].Update("Please allow the ADB connection (with the always allow\ncheckbox selected) and try again.")
window["_ERROR2_"].Update("Please allow the ADB connection and try again.")
window["_ERROR2_"].Update(visible=True)
window["_ERROR1_"].Update(visible=False)
else:
window['_ERROR2_'].Update("Please check that WSA is running and the correct ADB address\nhas been entered.")
window['_ERROR2_'].Update("Please check that WSA is running, you allowed the ADB\nconnection and the correct ADB address has been entered.\nIf you denied the ADB connection, close and reopen WSA\nSideloader.")
window["_ERROR2_"].Update(visible=True)
window["_ERROR1_"].Update(visible=False)
except IndexError:
Expand Down Expand Up @@ -370,7 +370,7 @@ def main():
os.popen('cmd /c "cd platform-tools & adb kill-server"')
sys.exit(0)
elif outLine.startswith("failed to authenticate"):
layout = [[gui.Text('Please allow the ADB connection (with the always allow checkbox selected)\nand run the installation again.',font=("Calibri",11))],
layout = [[gui.Text('Please allow the ADB connection and run the installation again.',font=("Calibri",11))],
[RoundedButton("OK",0.3,font="Calibri 11")]]
window = gui.Window('Message', layout,icon="icon.ico",debugger_enabled=False)

Expand All @@ -389,7 +389,7 @@ def main():
errInfo = '\n'.join(map(str,textwrap.wrap(errLine,80)))
else:
errInfo = '\n'.join(map(str,textwrap.wrap(outLine,80)))+'\n'+'\n'.join(map(str,textwrap.wrap(errLine,80)))
layout = [[gui.Text('Unable to install application. Please check that:\nThe APK file is valid\nWSA is running\nDev mode is enabled in WSA settings and the correct address has been entered\n\n[Error Info]\n'+errInfo,font=("Calibri",11))],
layout = [[gui.Text('Unable to install the application. Please check that:\nThe APK file is valid\nWSA is running\nDev mode is enabled in WSA settings and the correct address has been entered\nYou allowed the ADB connection. If you denied by mistake, close and reopen WSA Sideloader.\n\n[Error Info]\n'+errInfo,font=("Calibri",11))],
[RoundedButton("OK",0.3,font="Calibri 11"),RoundedButton("WSA Settings",0.3,font="Calibri 11"),RoundedButton("Report bug",0.3,font="Calibri 11")]]
window = gui.Window('Error', layout,icon="icon.ico",debugger_enabled=False)

Expand Down

0 comments on commit 35e54d2

Please sign in to comment.