Skip to content

Commit a065e71

Browse files
committed
✨ bypass SNI
1 parent 48e1bef commit a065e71

6 files changed

Lines changed: 54 additions & 5 deletions

File tree

ci/version.code.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.0.8
1+
v0.0.9

ci/version.info.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
v0.0.9
2+
3+
- [x] SNI bypass
4+
15
v0.0.8
26

37
- [x] fix android login

lib/screens/hello_screen.dart

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import 'package:pansy/screens/settings_screen.dart';
77
import 'package:pansy/states/pixiv_login.dart';
88
import 'package:signals_flutter/signals_flutter.dart';
99
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
10+
import 'dart:io';
1011

1112
/// 主界面 - 仿照pixez的底部导航栏设计
1213
class HelloScreen extends StatefulWidget {
@@ -97,6 +98,26 @@ class _HelloScreenState extends State<HelloScreen> {
9798
],
9899
),
99100
),
101+
Align(
102+
alignment: Alignment.topLeft,
103+
child: Padding(
104+
padding: EdgeInsets.only(
105+
top: Platform.isWindows || Platform.isLinux || Platform.isMacOS ? 0 : 40,
106+
left: 8
107+
),
108+
child: IconButton(
109+
tooltip: AppLocalizations.of(context)!.settings,
110+
icon: const Icon(Icons.settings_outlined),
111+
onPressed: () {
112+
Navigator.of(context).push(
113+
MaterialPageRoute(
114+
builder: (BuildContext context) => const SettingsScreen(),
115+
),
116+
);
117+
},
118+
),
119+
),
120+
),
100121
],
101122
),
102123
);

lib/screens/login_screen.dart

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
22
import 'package:pansy/src/rust/api/api.dart';
33
import 'package:pansy/screens/hello_screen.dart';
44
import 'package:pansy/screens/components/content_builder.dart';
5+
import 'package:pansy/screens/settings_screen.dart';
56
import 'package:pansy/states/pixiv_login.dart';
67
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
78

@@ -27,9 +28,11 @@ class _LoginScreenState extends State<LoginScreen> {
2728
await clearPendingPixivLogin();
2829
setPixivLogin(true);
2930
if (!mounted) return;
31+
if (ModalRoute.of(context)?.isCurrent != true) return;
3032
Navigator.of(context).pushAndRemoveUntil(
31-
MaterialPageRoute(builder: (context) => const HelloScreen()),
32-
(route) => false);
33+
MaterialPageRoute(builder: (context) => const HelloScreen()),
34+
(route) => false,
35+
);
3336
}
3437

3538
@override
@@ -43,7 +46,26 @@ class _LoginScreenState extends State<LoginScreen> {
4346
});
4447
},
4548
successBuilder: (BuildContext context, AsyncSnapshot<void> snapshot) {
46-
return Container();
49+
return Center(
50+
child: Column(
51+
mainAxisAlignment: MainAxisAlignment.center,
52+
children: [
53+
Text(AppLocalizations.of(context)!.success),
54+
const SizedBox(height: 16),
55+
ElevatedButton(
56+
onPressed: () {
57+
Navigator.of(context).pushAndRemoveUntil(
58+
MaterialPageRoute(
59+
builder: (context) => const HelloScreen(),
60+
),
61+
(route) => false,
62+
);
63+
},
64+
child: Text(AppLocalizations.of(context)!.ok),
65+
),
66+
],
67+
),
68+
);
4769
},
4870
loadingLabel: AppLocalizations.of(context)!.logging,
4971
),

lib/screens/pc_login_screen.dart

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import 'package:flutter/material.dart';
22
import 'package:pansy/basic/cross.dart';
33
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
4+
import 'package:pansy/screens/settings_screen.dart';
45
import '../src/rust/pixirust/entities.dart';
56
import 'login_screen.dart';
67

@@ -14,6 +15,7 @@ class PcLoginScreen extends StatefulWidget {
1415
}
1516

1617
class _PcLoginScreenState extends State<PcLoginScreen> {
18+
1719
@override
1820
Widget build(BuildContext context) {
1921
return Scaffold(

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: A unoffical pixiv client.
33

44
publish_to: 'none'
55

6-
version: 0.0.8+8
6+
version: 0.0.9+9
77

88

99
environment:

0 commit comments

Comments
 (0)