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

Commit 0ba21cff authored by Prashant Malani's avatar Prashant Malani
Browse files

recovery: Remove duplicate variables and functions 

The function that modifies rtl_locale exists only in the base class,
and so the variable should not have a duplicate in the derived class,
otherwise there may be incosistent values when it is read by the derived
class (the thinking being that invoking the function will modify the
base class version of the variable, and not the derived class version).

Remove the updateMutex variable, and instead re-use the one in the base
class.

Also remove LoadBitmap from WearUI since it is identical to the one in
ScreenRecoveryUI.

Bug: 27407422
Change-Id: Idd823fa93dfa16d7b2c9c7160f8d0c2559d28731
parent d345de66

screen_ui.cpp

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ ScreenRecoveryUI::ScreenRecoveryUI() : 
    currentIcon(NONE),

    installingFrame(0),

    locale(nullptr),

    rtl_locale(false),

    progressBarType(EMPTY),

    progressScopeStart(0),

    progressScopeSize(0),
@@ -76,7 +75,8 @@ ScreenRecoveryUI::ScreenRecoveryUI() : 
    animation_fps(-1),

    installing_frames(-1),

    stage(-1),

    max_stage(-1) {

    max_stage(-1),

    rtl_locale(false) {



    for (int i = 0; i < 5; i++) {

        backgroundIcon[i] = nullptr;

screen_ui.h

+4 −3
Original line number Diff line number Diff line
@@ -71,9 +71,7 @@ class ScreenRecoveryUI : public RecoveryUI { 
    Icon currentIcon;

    int installingFrame;

    const char* locale;

    bool rtl_locale;



    pthread_mutex_t updateMutex;

    GRSurface* backgroundIcon[5];

    GRSurface* backgroundText[5];

    GRSurface** installation;
@@ -136,9 +134,12 @@ class ScreenRecoveryUI : public RecoveryUI { 
    void DrawTextLine(int* y, const char* line, bool bold);

    void DrawTextLines(int* y, const char* const* lines);



    void LoadBitmap(const char* filename, GRSurface** surface);

    void LoadBitmapArray(const char* filename, int* frames, int* fps, GRSurface*** surface);

    void LoadLocalizedBitmap(const char* filename, GRSurface** surface);

  protected:

    pthread_mutex_t updateMutex;

    bool rtl_locale;

    void LoadBitmap(const char* filename, GRSurface** surface);

};



#endif  // RECOVERY_UI_H

wear_ui.cpp

+0 −9
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ WearRecoveryUI::WearRecoveryUI() : 
    currentIcon(NONE),

    intro_done(false),

    current_frame(0),

    rtl_locale(false),

    progressBarType(EMPTY),

    progressScopeStart(0),

    progressScopeSize(0),
@@ -81,7 +80,6 @@ WearRecoveryUI::WearRecoveryUI() : 
    for (size_t i = 0; i < 5; i++)

        backgroundIcon[i] = NULL;



    pthread_mutex_init(&updateMutex, NULL);

    self = this;

}
@@ -321,13 +319,6 @@ void WearRecoveryUI::progress_loop() { 
    }

}



void WearRecoveryUI::LoadBitmap(const char* filename, GRSurface** surface) {

    int result = res_create_display_surface(filename, surface);

    if (result < 0) {

        LOGE("missing bitmap %s\n(Code %d)\n", filename, result);

    }

}



void WearRecoveryUI::Init()

{

    gr_init();

wear_ui.h

+0 −4
Original line number Diff line number Diff line
@@ -84,9 +84,6 @@ class WearRecoveryUI : public ScreenRecoveryUI { 


    int current_frame;



    bool rtl_locale;



    pthread_mutex_t updateMutex;

    GRSurface* backgroundIcon[5];

    GRSurface* *introFrames;

    GRSurface* *loopFrames;
@@ -123,7 +120,6 @@ class WearRecoveryUI : public ScreenRecoveryUI { 
    void update_screen_locked();

    static void* progress_thread(void* cookie);

    void progress_loop();

    void LoadBitmap(const char* filename, GRSurface** surface);

    void PutChar(char);

    void ClearText();

    void DrawTextLine(int x, int* y, const char* line, bool bold);