Improve ORS sideload to display GUI with cancel button
diff --git a/gui/action.cpp b/gui/action.cpp
index 1f3647d..14ef716 100644
--- a/gui/action.cpp
+++ b/gui/action.cpp
@@ -253,9 +253,8 @@
LOGE("Error setting pthread_attr_setstacksize\n");
return -1;
}
- LOGI("creating thread\n");
+ LOGI("Creating thread\n");
int ret = pthread_create(&t, &tattr, thread_start, this);
- LOGI("after thread creation\n");
if (ret) {
LOGE("Unable to create more threads for actions... continuing in same thread! %i\n", ret);
thread_start(this);
@@ -1071,6 +1070,7 @@
string result, Sideload_File;
if (!PartitionManager.Mount_Current_Storage(true)) {
+ DataManager::SetValue("tw_page_done", "1"); // For OpenRecoveryScript support
operation_end(1, simulate);
return 0;
}
@@ -1101,6 +1101,7 @@
}
}
}
+ DataManager::SetValue("tw_page_done", "1"); // For OpenRecoveryScript support
operation_end(ret, simulate);
return 0;
}
@@ -1113,6 +1114,7 @@
DataManager::GetValue("tw_child_pid", child_pid);
ui_print("Cancelling ADB sideload...\n");
kill(child_pid, SIGTERM);
+ DataManager::SetValue("tw_page_done", "1"); // For OpenRecoveryScript support
return 0;
}
}
diff --git a/gui/gui.cpp b/gui/gui.cpp
index e128337..c431d8f 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -60,6 +60,7 @@
static int gGuiConsoleTerminate = 0;
static int gForceRender = 0;
static int gNoAnimation = 1;
+static int gGuiInputRunning = 0;
// Needed by pages.cpp too
int gGuiRunning = 0;
@@ -391,6 +392,56 @@
return 0;
}
+static int runPage(const char* page_name)
+{
+ gui_changePage(page_name);
+
+ // Raise the curtain
+ if (gCurtain != NULL)
+ {
+ gr_surface surface;
+
+ PageManager::Render();
+ gr_get_surface(&surface);
+ curtainRaise(surface);
+ gr_free_surface(surface);
+ }
+
+ gGuiRunning = 1;
+
+ DataManager::SetValue("tw_loaded", 1);
+
+ for (;;)
+ {
+ loopTimer();
+
+ if (!gForceRender)
+ {
+ int ret;
+
+ ret = PageManager::Update();
+ if (ret > 1)
+ PageManager::Render();
+
+ if (ret > 0)
+ flip();
+ }
+ else
+ {
+ gForceRender = 0;
+ PageManager::Render();
+ flip();
+ }
+ if (DataManager::GetIntValue("tw_page_done") != 0) {
+ gui_changePage("main");
+ break;
+ }
+ }
+
+ gGuiRunning = 0;
+ return 0;
+}
+
int gui_forceRender(void)
{
gForceRender = 1;
@@ -537,13 +588,36 @@
// Set the default package
PageManager::SelectPackage("TWRP");
- // Start by spinning off an input handler.
- pthread_t t;
- pthread_create(&t, NULL, input_thread, NULL);
+ if (!gGuiInputRunning) {
+ // Start by spinning off an input handler.
+ pthread_t t;
+ pthread_create(&t, NULL, input_thread, NULL);
+ gGuiInputRunning = 1;
+ }
return runPages();
}
+extern "C" int gui_startPage(const char* page_name)
+{
+ if (!gGuiInitialized) return -1;
+
+ gGuiConsoleTerminate = 1;
+ while (gGuiConsoleRunning) loopTimer();
+
+ // Set the default package
+ PageManager::SelectPackage("TWRP");
+
+ if (!gGuiInputRunning) {
+ // Start by spinning off an input handler.
+ pthread_t t;
+ pthread_create(&t, NULL, input_thread, NULL);
+ gGuiInputRunning = 1;
+ }
+
+ return runPage(page_name);
+}
+
static void *console_thread(void *cookie)
{
PageManager::SwitchToConsole();
diff --git a/gui/gui.h b/gui/gui.h
index 948e11b..ee3cc27 100644
--- a/gui/gui.h
+++ b/gui/gui.h
@@ -5,6 +5,7 @@
int gui_init();
int gui_loadResources();
int gui_start();
+int gui_startPage(const char* page_name);
void gui_print(const char *fmt, ...);
void gui_print_overwrite(const char *fmt, ...);