Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8929c1ef authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Revert "move "install zip from sideload" to installation submenu" 

This reverts commit 2b622032
parent 2b622032

default_recovery_ui.c

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ 
char* MENU_HEADERS[] = { NULL };



char* MENU_ITEMS[] = { "reboot system now",

                       "install zip",

                       "install zip from sdcard",

                       "install zip from sideload",

                       "wipe data/factory reset",

                       "wipe cache partition",

                       "backup and restore",

extendedcommands.c

+3 −9
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include "bmlutils/bmlutils.h"

#include "cutils/android_reboot.h"



#include "adb_install.h"



int signature_check_enabled = 1;

int script_assert_enabled = 1;
@@ -112,20 +111,18 @@ int install_zip(const char* packagefilepath) 


#define ITEM_CHOOSE_ZIP       0

#define ITEM_APPLY_SDCARD     1

#define ITEM_APPLY_SIDELOAD   2

#define ITEM_SIG_CHECK        3

#define ITEM_CHOOSE_ZIP_INT   4

#define ITEM_SIG_CHECK        2

#define ITEM_CHOOSE_ZIP_INT   3



void show_install_update_menu()

{

    static char* headers[] = {  "Apply update from .zip file",

    static char* headers[] = {  "Apply update from .zip file on SD card",

                                "",

                                NULL

    };

    

    char* install_menu_items[] = {  "choose zip from sdcard",

                                    "apply /sdcard/update.zip",

                                    "install zip from sideload",

                                    "toggle signature verification",

                                    NULL,

                                    NULL };
@@ -157,9 +154,6 @@ void show_install_update_menu() 
            case ITEM_CHOOSE_ZIP:

                show_choose_zip_menu("/sdcard/");

                break;

            case ITEM_APPLY_SIDELOAD:

                apply_from_adb();

                break;

            case ITEM_CHOOSE_ZIP_INT:

                if (other_sd != NULL)

                    show_choose_zip_menu(other_sd);

recovery.c

+5 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include "roots.h"

#include "recovery_ui.h"



#include "adb_install.h"

#include "minadbd/adb.h"



#include "extendedcommands.h"
@@ -722,6 +723,10 @@ prompt_and_wait() { 
                show_install_update_menu();

                break;



            case ITEM_APPLY_SIDELOAD:

                apply_from_adb();

                break;



            case ITEM_NANDROID:

                show_nandroid_menu();

                break;

recovery_ui.h

+7 −6
Original line number Diff line number Diff line
@@ -75,14 +75,15 @@ int device_wipe_data(); 
#define ITEM_REBOOT          0

#define ITEM_APPLY_EXT       1

#define ITEM_APPLY_SDCARD    1  // historical synonym for ITEM_APPLY_EXT

#define ITEM_WIPE_DATA       2

#define ITEM_WIPE_CACHE      3

#define ITEM_APPLY_SIDELOAD  2

#define ITEM_WIPE_DATA       3

#define ITEM_WIPE_CACHE      4

// unused in cwr

#define ITEM_APPLY_CACHE     4

#define ITEM_NANDROID        4

#define ITEM_PARTITION       5

#define ITEM_ADVANCED        6

#define ITEM_POWEROFF        7

#define ITEM_NANDROID        5

#define ITEM_PARTITION       6

#define ITEM_ADVANCED        7

#define ITEM_POWEROFF        8



// Header text to display above the main menu.

extern char* MENU_HEADERS[];