From 3dad7a548751b43b0e06e3bd6e869feec4c500f0 Mon Sep 17 00:00:00 2001
From: dec05eba <dec05eba@protonmail.com>
Date: Wed, 4 Nov 2020 17:40:18 +0100
Subject: Matrix: do not post filter on first sync, show loading animation if
 sync cache is removed without login

---
 src/QuickMedia.cpp | 63 ++++--------------------------------------------------
 1 file changed, 4 insertions(+), 59 deletions(-)

(limited to 'src/QuickMedia.cpp')

diff --git a/src/QuickMedia.cpp b/src/QuickMedia.cpp
index 1ef6025..7ff05cf 100644
--- a/src/QuickMedia.cpp
+++ b/src/QuickMedia.cpp
@@ -840,21 +840,6 @@ namespace QuickMedia {
         body_size = sf::Vector2f(body_width, window_size.y - search_bottom - body_padding_vertical - tab_h);
     }
 
-    static const float RELATED_MEDIA_WINDOW_WIDTH = 1.0f;
-    static void get_related_media_body_dimensions(const sf::Vector2f &window_size, sf::Vector2f &body_pos, sf::Vector2f &body_size, float related_videos_text_height) {
-        float body_padding_horizontal = 25.0f;
-        float body_padding_vertical = 25.0f;
-        float body_width = (window_size.x * RELATED_MEDIA_WINDOW_WIDTH) - body_padding_horizontal * 2.0f;
-        if(body_width <= 480.0f) {
-            body_width = (window_size.x * RELATED_MEDIA_WINDOW_WIDTH);
-            body_padding_horizontal = 0.0f;
-            body_padding_vertical = 10.0f;
-        }
-
-        body_pos = sf::Vector2f(body_padding_horizontal, body_padding_vertical + related_videos_text_height);
-        body_size = sf::Vector2f(body_width, window_size.y - body_padding_vertical - related_videos_text_height);
-    }
-
     bool Program::is_tor_enabled() {
         return use_tor;
     }
@@ -3010,8 +2995,6 @@ namespace QuickMedia {
             window.draw(status_text);
             window.display();
         }
-
-        is_login_sync = true;
     }
 
     struct ChatTab {
@@ -4335,57 +4318,19 @@ namespace QuickMedia {
         auto matrix_invites_page = std::make_unique<MatrixInvitesPage>(this, matrix, invites_body.get());
 
         MatrixQuickMedia matrix_handler(this, matrix, matrix_rooms_page.get(), matrix_rooms_tag_page.get(), matrix_invites_page.get());
-        matrix->start_sync(&matrix_handler);
+        bool sync_cached = false;
+        matrix->start_sync(&matrix_handler, sync_cached);
+        is_login_sync = !sync_cached;
 
         std::vector<Tab> tabs;
         tabs.push_back(Tab{std::move(rooms_body), std::move(matrix_rooms_page), std::move(matrix_rooms_page_search_bar)});
         tabs.push_back(Tab{std::move(rooms_tags_body), std::move(matrix_rooms_tag_page), create_search_bar("Search...", SEARCH_DELAY_FILTER)});
         tabs.push_back(Tab{std::move(invites_body), std::move(matrix_invites_page), create_search_bar("Search...", SEARCH_DELAY_FILTER)});
 
-        sf::Event event;
-        std::string sync_err_msg;
-#if 0
-        while(window.isOpen()) {
-            if(matrix->is_initial_sync_finished())
-                break;
-            else if(matrix->did_initial_sync_fail(sync_err_msg)) {
-                show_notification("QuickMedia", "Initial sync failed, reason: " + sync_err_msg, Urgency::CRITICAL);
-                matrix->stop_sync();
-                matrix->logout();
-                // TODO: Instead of doing this, exit this current function and navigate to chat login page instead.
-                //delete current_plugin;
-                //current_plugin = new Matrix();
-                current_page = PageType::CHAT_LOGIN;
-                chat_login_page();
-                if(current_page == PageType::CHAT)
-                    after_matrix_login_page();
-                exit(0);
-                break;
-            }
-
-            while(window.pollEvent(event)) {
-                if(event.type == sf::Event::Closed)
-                    window.close();
-                else if(event.type == sf::Event::Resized) {
-                    window_size.x = event.size.width;
-                    window_size.y = event.size.height;
-                    sf::FloatRect visible_area(0, 0, window_size.x, window_size.y);
-                    window.setView(sf::View(visible_area));
-                } else if(event.type == sf::Event::KeyPressed && event.key.code == sf::Keyboard::Escape) {
-                    window.close();
-                }
-            }
-
-            window.clear(back_color);
-            load_sprite.setPosition(window_size.x * 0.5f, window_size.y * 0.5f);
-            load_sprite.setRotation(load_sprite_timer.getElapsedTime().asSeconds() * 400.0);
-            window.draw(load_sprite);
-            window.display();
-        }
-#endif
         while(window.isOpen()) {
             page_loop(tabs);
         }
+
         matrix->stop_sync();
     }
 }
-- 
cgit v1.2.3