commit 89b56a1c972a21099441f17c90b9866259b41e7a
author Captain Throwback <captainthrowback@hotmail.com> Wed Feb 10 18:25:07 2021 -0500
committer bigbiff <bigbiff@teamw.in> Wed Mar 03 20:04:48 2021 -0500
tree 0d917d0c1e9408a714009c704cccee45b39590d5
parent 05b5405fedb26cccede9a9d4a45efda03915c529

Remove duplicate Update_System_Details() function calls

Only run Update_System_Details on boot after decryption is
complete, if device is unencrypted, or if decryption prompt
is cancelled.

This significantly decreases the delay in reaching the
decryption prompt on devices with large used storage
capacity

Use refreshsizes action to update system details when
Cancel button is pressed at decryption prompt

Change-Id: I9e436b1c57664a5269f42dc1cda4f6097f7e3062

gui/theme/common/watch.xml

diff --git a/gui/theme/common/watch.xml b/gui/theme/common/watch.xml
index 50f3c2b..5520a35 100755
--- a/gui/theme/common/watch.xml
+++ b/gui/theme/common/watch.xml
@@ -5391,10 +5391,7 @@
 			<button style="main_button_half_height">
 				<placement x="%col1_x_right%" y="%row4_y%"/>
 				<text>{@cancel_btn=Cancel}</text>
-				<actions>
-					<action function="set">tw_page_done=1</action>
-					<action function="page">main</action>
-				</actions>
+				<action function="page">canceldecrypt</action>
 			</button>
 
 			<template name="keyboardtemplate"/>
@@ -5455,10 +5452,7 @@
 				<placement x="%back_button_x%" y="%navbar_btn_y%" placement="4"/>
 				<image resource="back"/>
 				<condition var1="tw_busy" var2="0"/>
-				<actions>
-					<action function="set">tw_page_done=1</action>
-					<action function="page">main</action>
-				</actions>
+				<action function="page">canceldecrypt</action>
 			</button>
 
 			<button>
@@ -5559,6 +5553,35 @@
 			</action>
 		</page>
 
+		<page name="canceldecrypt">
+			<template name="page"/>
+
+			<template name="statusbar"/>
+
+			<text style="text_m">
+				<placement x="%col1_x_left%" y="%row1_header_y%"/>
+				<text>{@cancel_btn=Cancel} &gt; {@refresh_sizes_btn=Refresh Sizes}</text>
+			</text>
+
+			<template name="console"/>
+
+			<template name="progress_bar"/>
+
+			<action>
+				<action function="refreshsizes"/>
+			</action>
+
+			<action>
+				<conditions>
+					<condition var1="tw_operation_state" var2="1"/>
+				</conditions>
+				<actions>
+					<action function="set">tw_page_done=1</action>
+					<action function="page">main</action>
+				</actions>
+			</action>
+		</page>
+
 		<page name="terminalcommand">
 			<terminal>
 				<condition var1="tw_hide_kb" var2="0"/>