From a398f7e19eb09f793603efc6efdabb3579ef5952 Mon Sep 17 00:00:00 2001 From: Neeraj Gupta <254676+ua741@users.noreply.github.com> Date: Thu, 17 Oct 2024 17:15:03 +0530 Subject: [PATCH] [mob] Switch to better pkg for user-agent --- mobile/ios/Podfile.lock | 12 ++++++------ mobile/ios/Runner.xcodeproj/project.pbxproj | 4 ++-- mobile/lib/core/network/network.dart | 8 ++++---- mobile/lib/extensions/stop_watch.dart | 2 +- mobile/pubspec.lock | 16 ++++++++-------- mobile/pubspec.yaml | 3 ++- 6 files changed, 23 insertions(+), 22 deletions(-) diff --git a/mobile/ios/Podfile.lock b/mobile/ios/Podfile.lock index 259d2f169e..19cdc95eaf 100644 --- a/mobile/ios/Podfile.lock +++ b/mobile/ios/Podfile.lock @@ -51,8 +51,6 @@ PODS: - GoogleUtilities/Reachability (~> 8.0) - GoogleUtilities/UserDefaults (~> 8.0) - nanopb (~> 3.30910.0) - - fk_user_agent (2.0.0): - - Flutter - Flutter (1.0.0) - flutter_email_sender (0.0.1): - Flutter @@ -228,6 +226,8 @@ PODS: - sqlite3/perf-threadsafe - sqlite3/rtree - Toast (4.1.1) + - ua_client_hints (1.4.0): + - Flutter - uni_links (0.0.1): - Flutter - url_launcher_ios (0.0.1): @@ -253,7 +253,6 @@ DEPENDENCIES: - file_saver (from `.symlinks/plugins/file_saver/ios`) - firebase_core (from `.symlinks/plugins/firebase_core/ios`) - firebase_messaging (from `.symlinks/plugins/firebase_messaging/ios`) - - fk_user_agent (from `.symlinks/plugins/fk_user_agent/ios`) - Flutter (from `Flutter`) - flutter_email_sender (from `.symlinks/plugins/flutter_email_sender/ios`) - flutter_image_compress (from `.symlinks/plugins/flutter_image_compress/ios`) @@ -294,6 +293,7 @@ DEPENDENCIES: - shared_preferences_foundation (from `.symlinks/plugins/shared_preferences_foundation/darwin`) - sqflite_darwin (from `.symlinks/plugins/sqflite_darwin/darwin`) - sqlite3_flutter_libs (from `.symlinks/plugins/sqlite3_flutter_libs/ios`) + - ua_client_hints (from `.symlinks/plugins/ua_client_hints/ios`) - uni_links (from `.symlinks/plugins/uni_links/ios`) - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`) - video_player_avfoundation (from `.symlinks/plugins/video_player_avfoundation/darwin`) @@ -343,8 +343,6 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/firebase_core/ios" firebase_messaging: :path: ".symlinks/plugins/firebase_messaging/ios" - fk_user_agent: - :path: ".symlinks/plugins/fk_user_agent/ios" Flutter: :path: Flutter flutter_email_sender: @@ -425,6 +423,8 @@ EXTERNAL SOURCES: :path: ".symlinks/plugins/sqflite_darwin/darwin" sqlite3_flutter_libs: :path: ".symlinks/plugins/sqlite3_flutter_libs/ios" + ua_client_hints: + :path: ".symlinks/plugins/ua_client_hints/ios" uni_links: :path: ".symlinks/plugins/uni_links/ios" url_launcher_ios: @@ -454,7 +454,6 @@ SPEC CHECKSUMS: FirebaseCoreInternal: ac26d09a70c730e497936430af4e60fb0c68ec4e FirebaseInstallations: 58cf94dabf1e2bb2fa87725a9be5c2249171cda0 FirebaseMessaging: c9ec7b90c399c7a6100297e9d16f8a27fc7f7152 - fk_user_agent: 1f47ec39291e8372b1d692b50084b0d54103c545 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 flutter_email_sender: 02d7443217d8c41483223627972bfdc09f74276b flutter_image_compress: 5a5e9aee05b6553048b8df1c3bc456d0afaac433 @@ -509,6 +508,7 @@ SPEC CHECKSUMS: sqlite3: 0bb0e6389d824e40296f531b858a2a0b71c0d2fb sqlite3_flutter_libs: c00457ebd31e59fa6bb830380ddba24d44fbcd3b Toast: 1f5ea13423a1e6674c4abdac5be53587ae481c4e + ua_client_hints: 46bb5817a868f9e397c0ba7e3f2f5c5d90c35156 uni_links: d97da20c7701486ba192624d99bffaaffcfc298a url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3 diff --git a/mobile/ios/Runner.xcodeproj/project.pbxproj b/mobile/ios/Runner.xcodeproj/project.pbxproj index 110131b69a..11f3101242 100644 --- a/mobile/ios/Runner.xcodeproj/project.pbxproj +++ b/mobile/ios/Runner.xcodeproj/project.pbxproj @@ -295,7 +295,6 @@ "${BUILT_PRODUCTS_DIR}/dart_ui_isolate/dart_ui_isolate.framework", "${BUILT_PRODUCTS_DIR}/device_info_plus/device_info_plus.framework", "${BUILT_PRODUCTS_DIR}/file_saver/file_saver.framework", - "${BUILT_PRODUCTS_DIR}/fk_user_agent/fk_user_agent.framework", "${BUILT_PRODUCTS_DIR}/flutter_email_sender/flutter_email_sender.framework", "${BUILT_PRODUCTS_DIR}/flutter_image_compress/flutter_image_compress.framework", "${BUILT_PRODUCTS_DIR}/flutter_inappwebview_ios/flutter_inappwebview_ios.framework", @@ -336,6 +335,7 @@ "${BUILT_PRODUCTS_DIR}/sqflite_darwin/sqflite_darwin.framework", "${BUILT_PRODUCTS_DIR}/sqlite3/sqlite3.framework", "${BUILT_PRODUCTS_DIR}/sqlite3_flutter_libs/sqlite3_flutter_libs.framework", + "${BUILT_PRODUCTS_DIR}/ua_client_hints/ua_client_hints.framework", "${BUILT_PRODUCTS_DIR}/uni_links/uni_links.framework", "${BUILT_PRODUCTS_DIR}/url_launcher_ios/url_launcher_ios.framework", "${BUILT_PRODUCTS_DIR}/video_player_avfoundation/video_player_avfoundation.framework", @@ -390,7 +390,6 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/dart_ui_isolate.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/device_info_plus.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/file_saver.framework", - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/fk_user_agent.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_email_sender.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_image_compress.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/flutter_inappwebview_ios.framework", @@ -431,6 +430,7 @@ "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqflite_darwin.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqlite3.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/sqlite3_flutter_libs.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ua_client_hints.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/uni_links.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/url_launcher_ios.framework", "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/video_player_avfoundation.framework", diff --git a/mobile/lib/core/network/network.dart b/mobile/lib/core/network/network.dart index ded98a12bc..a55a1a807e 100644 --- a/mobile/lib/core/network/network.dart +++ b/mobile/lib/core/network/network.dart @@ -1,12 +1,12 @@ import 'dart:io'; import 'package:dio/dio.dart'; -import 'package:fk_user_agent/fk_user_agent.dart'; import 'package:package_info_plus/package_info_plus.dart'; import "package:photos/core/configuration.dart"; import "package:photos/core/event_bus.dart"; import 'package:photos/core/network/ente_interceptor.dart'; import "package:photos/events/endpoint_updated_event.dart"; +import "package:ua_client_hints/ua_client_hints.dart"; int kConnectTimeout = 15000; @@ -15,13 +15,13 @@ class NetworkClient { late Dio _enteDio; Future init(PackageInfo packageInfo) async { - await FkUserAgent.init(); + final String ua = await userAgent(); final endpoint = Configuration.instance.getHttpEndpoint(); _dio = Dio( BaseOptions( connectTimeout: kConnectTimeout, headers: { - HttpHeaders.userAgentHeader: FkUserAgent.userAgent, + HttpHeaders.userAgentHeader: ua, 'X-Client-Version': packageInfo.version, 'X-Client-Package': packageInfo.packageName, }, @@ -32,7 +32,7 @@ class NetworkClient { baseUrl: endpoint, connectTimeout: kConnectTimeout, headers: { - HttpHeaders.userAgentHeader: FkUserAgent.userAgent, + HttpHeaders.userAgentHeader: ua, 'X-Client-Version': packageInfo.version, 'X-Client-Package': packageInfo.packageName, }, diff --git a/mobile/lib/extensions/stop_watch.dart b/mobile/lib/extensions/stop_watch.dart index f7d1ae44f3..d8c745a02e 100644 --- a/mobile/lib/extensions/stop_watch.dart +++ b/mobile/lib/extensions/stop_watch.dart @@ -50,7 +50,7 @@ class TimeLogger { if (diff > logThreshold) { res = "[$context: $diff ms]"; } else { - res = ""; + res = "[]"; } _start = DateTime.now(); return res; diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock index 8844ddd3fb..6985a7541f 100644 --- a/mobile/pubspec.lock +++ b/mobile/pubspec.lock @@ -679,14 +679,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" - fk_user_agent: - dependency: "direct main" - description: - name: fk_user_agent - sha256: fd6c94e120786985a292d12f61422a581f4e851148d5940af38b819357b8ad0d - url: "https://pub.dev" - source: hosted - version: "2.1.0" flutter: dependency: "direct main" description: flutter @@ -2563,6 +2555,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.2" + ua_client_hints: + dependency: "direct main" + description: + name: ua_client_hints + sha256: dfea54a1b4d259c057d0f33f198094cf4e09e1a21d347baadbe6dbd3d820c0d4 + url: "https://pub.dev" + source: hosted + version: "1.4.0" uni_links: dependency: "direct main" description: diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yaml index 994dbcd09c..5383150973 100644 --- a/mobile/pubspec.yaml +++ b/mobile/pubspec.yaml @@ -67,7 +67,6 @@ dependencies: git: https://github.com/jesims/file_saver.git firebase_core: ^3.6.0 firebase_messaging: ^15.1.3 - fk_user_agent: ^2.0.1 flutter: sdk: flutter flutter_animate: ^4.1.0 @@ -171,8 +170,10 @@ dependencies: syncfusion_flutter_sliders: ^25.2.5 synchronized: ^3.1.0 tuple: ^2.0.0 + ua_client_hints: ^1.4.0 uni_links: ^0.5.1 url_launcher: ^6.3.0 + uuid: ^4.5.0 video_editor: git: