diff --git a/.gitmodules b/.gitmodules index be701c4fb..c6c6fbf87 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,6 +25,3 @@ [submodule "library/MemoryModule"] path = library/MemoryModule url = https://github.com/fancycode/MemoryModule.git -[submodule "library/clip"] - path = library/clip - url = https://github.com/dacap/clip.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 677e51956..c2531e676 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -244,8 +244,6 @@ if (PLATFORM_DESKTOP) "${CMAKE_CURRENT_SOURCE_DIR}/scripts/linux/${PACKAGE_NAME}.appdata.xml" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/linux/${PACKAGE_NAME}.desktop") endif () - - list(APPEND APP_PLATFORM_LIB clip) elseif (PLATFORM_IOS) ios_bundle( "${CMAKE_CURRENT_SOURCE_DIR}/library/borealis/demo/ios/tvos/Splash.storyboard" diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index ecd36d46b..3dd570b59 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -81,14 +81,6 @@ set(BUILD_SHARED_LIBS OFF) set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) add_subdirectory(lunasvg EXCLUDE_FROM_ALL) -# add dacap -if (PLATFORM_DESKTOP) - set(CLIP_EXAMPLES OFF) - set(CLIP_TESTS OFF) - add_subdirectory(clip EXCLUDE_FROM_ALL) - target_include_directories(clip PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -endif () - # add mongoose if (USE_SYSTEM_MONGOOSE) find_library(MONGOOSE_LIBRARY NAMES mongoose REQUIRED) diff --git a/library/borealis b/library/borealis index c2cd87dc1..d36d26a07 160000 --- a/library/borealis +++ b/library/borealis @@ -1 +1 @@ -Subproject commit c2cd87dc149fc16a6a949f8f9b4dc24c8739e2da +Subproject commit d36d26a076cc9a23e759d57d517482c592b0003f diff --git a/library/clip b/library/clip deleted file mode 160000 index 94693e241..000000000 --- a/library/clip +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 94693e2414a2c69a8ca16f065240c80a94cc6221 diff --git a/wiliwili/source/activity/setting_activity.cpp b/wiliwili/source/activity/setting_activity.cpp index eddd37d27..e12141a79 100644 --- a/wiliwili/source/activity/setting_activity.cpp +++ b/wiliwili/source/activity/setting_activity.cpp @@ -633,7 +633,7 @@ void SettingActivity::onContentAvailable() { ProgramConfig::instance().setSettingItem(SettingItem::HTTP_PROXY, httpProxy); ProgramConfig::instance().setProxy(httpProxy); }, - "http://127.0.0.1:7890", "wiliwili/setting/app/network/proxy_hint"_i18n, 64); + "wiliwili/setting/app/network/proxy_hint"_i18n, "wiliwili/setting/app/network/proxy_hint"_i18n, 64); /// Hardware decode #ifdef PS4 diff --git a/wiliwili/source/api/analytics.cpp b/wiliwili/source/api/analytics.cpp index c40990a6b..7b56f3a36 100644 --- a/wiliwili/source/api/analytics.cpp +++ b/wiliwili/source/api/analytics.cpp @@ -64,7 +64,7 @@ void Analytics::send() { cpr::PostCallback( [](const cpr::Response& r) { if (r.status_code != 204) { - brls::Logger::error("report event error: {}", r.status_code); + brls::Logger::error("report event error: {} {}", r.status_code, r.error.message); } }, cpr::Parameters{ diff --git a/wiliwili/source/fragment/share_dialog.cpp b/wiliwili/source/fragment/share_dialog.cpp index d2c404ce2..195dfb52c 100644 --- a/wiliwili/source/fragment/share_dialog.cpp +++ b/wiliwili/source/fragment/share_dialog.cpp @@ -6,10 +6,6 @@ #include #include -#if defined(__APPLE__) || defined(__linux__) || defined(_WIN32) -#include -#endif - #include "fragment/share_dialog.hpp" #include "view/qr_image.hpp" #include "view/button_close.hpp" @@ -26,7 +22,7 @@ ShareBox::ShareBox() { #if defined(__APPLE__) || defined(__linux__) || defined(_WIN32) this->registerClickAction([this](...) { if (this->action == "clipboard") { - clip::set_text(this->link); + brls::Application::getPlatform()->pasteToClipboard(this->link); this->eventClipboard.fire(); } else { brls::Application::getPlatform()->openBrowser(this->link); diff --git a/wiliwili/source/utils/gesture_helper.cpp b/wiliwili/source/utils/gesture_helper.cpp index 29dceec40..30da769b9 100644 --- a/wiliwili/source/utils/gesture_helper.cpp +++ b/wiliwili/source/utils/gesture_helper.cpp @@ -13,7 +13,7 @@ #define MAX_DELTA_MOVEMENT 24 // Time in ms to recognize long press -#define LONG_TIME_MS 200 // 200ms +#define LONG_TIME_MS 250 // 250ms #define LONG_TIME_US (LONG_TIME_MS * 1000) OsdGestureRecognizer::OsdGestureRecognizer(const OsdGestureEvent::Callback& respond) { diff --git a/wiliwili/source/utils/version_helper.cpp b/wiliwili/source/utils/version_helper.cpp index 7e0901610..24653b76b 100644 --- a/wiliwili/source/utils/version_helper.cpp +++ b/wiliwili/source/utils/version_helper.cpp @@ -97,7 +97,7 @@ void APPVersion::checkUpdate(int delay, bool showUpToDateDialog) { return; } if (r.status_code != 200 || r.text.empty()) { - brls::Logger::error("Cannot check update: {} {}", r.status_code, r.reason); + brls::Logger::error("Cannot check update: {} {}", r.status_code, r.error.message); if (showUpToDateDialog) { auto msg = r.reason; brls::sync([msg]() { brls::Application::notify(msg); });