Merge pull request #184 from MXCzkEVM/pre_main_qa

Pre main qa

Author: reasje

.fvmrc

@@ -0,0 +1,3 @@
+{
+  "flutter": "3.27.1"
+}

assets/js/bluetooth/bluetooth.js

@@ -337,7 +337,7 @@ class AXSBluetooth {
   }
 
   async requestDevice(options) {
-    console.log("AXSBluetooth:requestDevice ", options);
+    console.log("AXSBluetooth:requestDevice ", JSON.stringify(options, null, 4));
     const response = await window.axs?.callHandlerWrapper("requestDevice", options);
 
     const gatt = new BluetoothRemoteGATTServer(

lib/common/dialogs/network_details/network_details_dialog.dart

@@ -15,6 +15,7 @@ Future<bool?> showNetworkDetailsDialog(
     context: context,
     bottomSheetTitle: network.label ?? network.web3RpcHttpUrl,
     hasCloseButton: false,
+    closeButtonReturnValue: false,
     widgets: [
       // Column(
       //   crossAxisAlignment: CrossAxisAlignment.center,

lib/features/common/packages/bluetooth/blue_plus/bluetooth_use_case.dart

@@ -3,7 +3,9 @@ import 'dart:developer';
 import 'dart:io';
 
 import 'package:app_settings/app_settings.dart';
+import 'package:flutter/material.dart';
 import 'package:flutter_blue_plus/flutter_blue_plus.dart';
+import 'package:moonchain_wallet/common/common.dart';
 import 'package:mxc_logic/mxc_logic.dart';
 
 import 'package:moonchain_wallet/core/core.dart';
@@ -41,6 +43,7 @@ class BluetoothUseCase extends ReactiveUseCase {
   late final ValueStream<BluetoothAdapterState> bluetoothStatus =
       reactive(BluetoothAdapterState.off);
   late final ValueStream<List<ScanResult>> scanResults = reactive([]);
+  late final ValueStream<ScanResult> selectedScanResult = reactive();
 
   void initBluetoothUseCase() {
     initStateListener();
@@ -209,6 +212,27 @@ class BluetoothUseCase extends ReactiveUseCase {
     );
   }
 
+  Future<void> getScanResults(BuildContext context) async {
+    await Future.delayed(const Duration(seconds: 4), () async {
+      final currentScanResults = scanResults.value;
+      final showBottomSheet =
+          currentScanResults.length > 1 || currentScanResults.isEmpty;
+      if (showBottomSheet) {
+        // We need to let the user to choose If two or more devices of rings are available and even If empty maybe let the user to wait
+        final scanResult = await showBlueberryRingsBottomSheet(
+          context,
+        );
+        if (scanResult != null) {
+          update(selectedScanResult, scanResult);
+        }
+      } else {
+        // only one scan results
+        final scanResult = currentScanResults.first;
+        update(selectedScanResult, scanResult);
+      }
+    });
+  }
+
   void _cancelScannerListen() {
     // cleanup: cancel subscription when scanning stops
     if (scannerListener != null) {
@@ -225,6 +249,7 @@ class BluetoothUseCase extends ReactiveUseCase {
   }
 
   void stopScanner() {
+    update(scanResults, <ScanResult>[]);
     FlutterBluePlus.stopScan();
   }
 }

lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_use_case.dart

@@ -71,25 +71,14 @@ class BlueberryRingUseCase extends ReactiveUseCase {
   // Sets the selectedBlueberryRing
   Future<void> getBlueberryRingsNearby(BuildContext context) async {
     _bluetoothUseCase.startScanning(
-      withServices: [bluetoothServiceUUID],
+      // withServices: [bluetoothServiceUUID],
+      // withKeywords: ['Mi', ],
+      withKeywords: ['2301', 'BBRING'],
+      // withNames: ['Buds Pro'],
     );
 
-    await Future.delayed(const Duration(seconds: 3), () async {
-      final scanResults = _bluetoothUseCase.scanResults.value;
-      if (scanResults.length > 1 || scanResults.isEmpty) {
-        // We need to let the user to choose If two or more devices of rings are available and even If empty maybe let the user to wait
-        final scanResult = await showBlueberryRingsBottomSheet(
-          context,
-        );
-        if (scanResult != null) {
-          update(selectedBlueberryRing, scanResult);
-        }
-      } else {
-        // only one scan results
-        final scanResult = scanResults.first;
-        update(selectedBlueberryRing, scanResult);
-      }
-    });
+    await _bluetoothUseCase.getScanResults(context);
+    update(selectedBlueberryRing, _bluetoothUseCase.selectedScanResult.value);
 
     _bluetoothUseCase.stopScanner();
   }

lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/bluetooth_helper.dart

@@ -16,6 +16,7 @@ class BluetoothHelper {
     required this.translate,
     required this.collectLog,
     required this.bluetoothUseCase,
+    required this.blueberryRingUseCase,
     required this.navigator,
     required this.minerHooksHelper,
     required this.loading,
@@ -25,6 +26,7 @@ class BluetoothHelper {
 
   OpenDAppState state;
   BluetoothUseCase bluetoothUseCase;
+  BlueberryRingUseCase blueberryRingUseCase;
   void Function(String line) collectLog;
   NavigatorState? navigator;
   MinerHooksHelper minerHooksHelper;
@@ -37,7 +39,9 @@ class BluetoothHelper {
   Future<Map<String, dynamic>> handleBluetoothRequestDevice(
     Map<String, dynamic> channelData,
   ) async {
+    collectLog('handleBluetoothRequestDevice:channelData : $channelData');
     // final options = RequestDeviceOptions.fromJson(channelData['data']);
+
     final options = RequestDeviceOptions.fromMap(channelData);
     late BluetoothDevice responseDevice;
 
@@ -273,29 +277,15 @@ class BluetoothHelper {
 
   Future<BluetoothDevice?> getBlueberryRing() async {
     loading(true);
-    return Future.delayed(const Duration(seconds: 3), () async {
-      loading(false);
-      BluetoothDevice? responseDevice;
-      final scanResults = bluetoothUseCase.scanResults.value;
-      if (scanResults.length == 1) {
-        // only one scan results
-        final scanResult = scanResults.first;
-        state.selectedScanResult = scanResult;
-      } else {
-        // We need to let the user to choose If two or more devices of rings are available and even If empty maybe let the user to wait
-        final scanResult = await showBlueberryRingsBottomSheet(
-          context!,
-        );
-        if (scanResult != null) {
-          state.selectedScanResult = scanResult;
-        }
-      }
-      if (state.selectedScanResult != null) {
-        responseDevice = BluetoothDevice.getBluetoothDeviceFromScanResult(
-            state.selectedScanResult!);
-      }
-
-      return responseDevice;
-    });
+    await bluetoothUseCase.getScanResults(context!);
+    loading(false);
+    BluetoothDevice? responseDevice;
+    state.selectedScanResult = bluetoothUseCase.selectedScanResult.value;
+    if (state.selectedScanResult != null) { 
+      responseDevice = BluetoothDevice.getBluetoothDeviceFromScanResult(
+          state.selectedScanResult!);
+    }
+
+    return responseDevice;
   }
 }

lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/front_end_required_helper.dart

@@ -0,0 +1,49 @@
+import 'package:flutter_inappwebview/flutter_inappwebview.dart';
+import 'package:moonchain_wallet/app/logger.dart';
+import 'package:flutter/material.dart';
+import 'package:mxc_logic/mxc_logic.dart';
+
+import '../../../open_dapp.dart';
+
+class FrontEndRequiredHelper {
+  FrontEndRequiredHelper({
+    required this.state,
+    required this.context,
+    required this.jsChannelHandlerHelper,
+  });
+
+  OpenDAppState state;
+  BuildContext? context;
+  JsChannelHandlersHelper jsChannelHandlerHelper;
+
+  void injectFrontEndRequiredListeners() {
+    state.webviewController!.addJavaScriptHandler(
+        handlerName: JSChannelEvents.getCookies,
+        callback: (args) => jsChannelHandlerHelper.jsChannelErrorHandler(
+            args, handleGetCookies));
+  }
+
+  Future<Map<String, dynamic>> handleGetCookies(Map<String, dynamic> data) async {
+    collectLog('handleGetCookies : $data');
+
+    final host = data['url'];
+
+    CookieManager cookieManager = CookieManager.instance();
+    final allCookies =
+        await cookieManager.getCookies(url: WebUri('https://$host/'));
+
+    final cookies = 
+      allCookies
+          .where((e) {
+            collectLog("handleGetCookies:e.domain ${e.domain ?? ""}");
+            return (e.domain?.contains(host) ?? false) && e.isHttpOnly == true;
+          }) // Exclude HttpOnly cookies
+          .map((e) =>
+              e.toMap()) // Convert each cookie to a JSON-serializable map
+          .toList(); // Convert the iterable to a list
+
+    collectLog("handleGetCookies:cookies $cookies");
+
+    return {'cookies': cookies};
+  }
+}

lib/features/dapps/subfeatures/open_dapp/open_dapp_presenter.dart

@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:convert';
 import 'package:flutter/services.dart';
 
 import 'package:clipboard/clipboard.dart';
@@ -34,6 +35,7 @@ class OpenDAppPresenter extends CompletePresenter<OpenDAppState> {
   late final _backgroundFetchConfigUseCase =
       ref.read(backgroundFetchConfigUseCaseProvider);
   late final _bluetoothUseCase = ref.read(bluetoothUseCaseProvider);
+  late final _blueberryRingUseCase = ref.read(blueberryRingUseCaseProvider);
 
   Timer? characteristicListenerTimer;
   StreamSubscription<List<int>>? characteristicValueStreamSubscription;
@@ -73,6 +75,7 @@ class OpenDAppPresenter extends CompletePresenter<OpenDAppState> {
         state: state,
         loading: (bool value) => loading = value,
         bluetoothUseCase: _bluetoothUseCase,
+        blueberryRingUseCase: _blueberryRingUseCase,
         characteristicListenerTimer: characteristicListenerTimer,
         characteristicValueStreamSubscription:
             characteristicValueStreamSubscription,
@@ -273,7 +276,6 @@ class OpenDAppPresenter extends CompletePresenter<OpenDAppState> {
     injectDAppOrigin();
   }
 
-
   Future<void> injectHairyScript() async {
     const hairyScript = """
 const send = XMLHttpRequest.prototype.send
@@ -301,8 +303,8 @@ XMLHttpRequest.prototype.send = function (body) {
   // This is requested by Hairy on Xiaomi related feature
   void injectDAppOrigin() async {
     collectLog('Injecting origin $initialUrl to axs.origin object');
-    await state.webviewController!
-        .evaluateJavascript(source: "window.axs.origin = '${initialUrl!.origin}';");
+    await state.webviewController!.evaluateJavascript(
+        source: "window.axs.origin = '${initialUrl!.origin}';");
     await state.webviewController!.evaluateJavascript(
         source: "console.log(\"window.axs.origin \" + window.axs.origin)");
   }