diff --git a/lib/grpc/im.dart b/lib/grpc/im.dart index 9a0a47418..306d9495d 100644 --- a/lib/grpc/im.dart +++ b/lib/grpc/im.dart @@ -6,7 +6,7 @@ import 'package:PiliPlus/grpc/url.dart'; import 'package:PiliPlus/http/loading_state.dart'; import 'package:fixnum/fixnum.dart'; import 'package:protobuf/protobuf.dart' show PbMap; -import 'package:uuid/uuid.dart'; +import 'package:uuid/v4.dart'; abstract final class ImGrpc { static Future> sendMsg({ @@ -28,7 +28,7 @@ abstract final class ImGrpc { msgStatus: 0, newFaceVersion: 1, ), - devId: const Uuid().v4(), + devId: const UuidV4().generate(), ), RspSendMsg.fromBuffer, ); diff --git a/lib/http/msg.dart b/lib/http/msg.dart index aa3a217c1..6e155d22f 100644 --- a/lib/http/msg.dart +++ b/lib/http/msg.dart @@ -18,7 +18,7 @@ import 'package:PiliPlus/models_new/upload_bfs/data.dart'; import 'package:PiliPlus/utils/accounts.dart'; import 'package:PiliPlus/utils/wbi_sign.dart'; import 'package:dio/dio.dart'; -import 'package:uuid/uuid.dart'; +import 'package:uuid/v4.dart'; abstract final class MsgHttp { static Future> msgFeedReplyMe({ @@ -426,7 +426,7 @@ abstract final class MsgHttp { } static String getDevId() { - return const Uuid().v4(); + return const UuidV4().generate(); } static Future> msgSetNotice({ diff --git a/lib/pages/sponsor_block/view.dart b/lib/pages/sponsor_block/view.dart index eaddbbac8..09d94a56b 100644 --- a/lib/pages/sponsor_block/view.dart +++ b/lib/pages/sponsor_block/view.dart @@ -13,12 +13,13 @@ import 'package:PiliPlus/utils/page_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/storage_key.dart'; import 'package:PiliPlus/utils/storage_pref.dart'; +import 'package:PiliPlus/utils/utils.dart'; +import 'package:crypto/crypto.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart' show FilteringTextInputFormatter; import 'package:get/get.dart'; import 'package:hive/hive.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; -import 'package:uuid/uuid.dart'; class SponsorBlockPage extends StatefulWidget { const SponsorBlockPage({super.key}); @@ -179,7 +180,9 @@ class _SponsorBlockPageState extends State { TextButton( onPressed: () { Get.back(); - _userId = const Uuid().v4().replaceAll('-', ''); + _userId = Digest( + List.generate(16, (_) => Utils.random.nextInt(256)), + ).toString(); setting.put(SettingBoxKey.blockUserID, _userId); (context as Element).markNeedsBuild(); }, diff --git a/lib/utils/storage_pref.dart b/lib/utils/storage_pref.dart index 8a18670b3..cd8c3ebca 100644 --- a/lib/utils/storage_pref.dart +++ b/lib/utils/storage_pref.dart @@ -35,11 +35,12 @@ import 'package:PiliPlus/utils/login_utils.dart'; import 'package:PiliPlus/utils/platform_utils.dart'; import 'package:PiliPlus/utils/storage.dart'; import 'package:PiliPlus/utils/storage_key.dart'; +import 'package:PiliPlus/utils/utils.dart'; +import 'package:crypto/crypto.dart'; import 'package:flex_seed_scheme/flex_seed_scheme.dart' show FlexSchemeVariant; import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:hive/hive.dart'; -import 'package:uuid/uuid.dart'; abstract final class Pref { static final Box _setting = GStorage.setting; @@ -300,7 +301,9 @@ abstract final class Pref { static String get blockUserID { String? blockUserID = _setting.get(SettingBoxKey.blockUserID); if (blockUserID == null || blockUserID.isEmpty) { - blockUserID = const Uuid().v4().replaceAll('-', ''); + blockUserID = Digest( + List.generate(16, (_) => Utils.random.nextInt(256)), + ).toString(); _setting.put(SettingBoxKey.blockUserID, blockUserID); } return blockUserID;