Skip to content

Commit

Permalink
v1.1.7-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
wanghongenpin committed Jan 16, 2025
1 parent 4b16114 commit 7074183
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 53 deletions.
6 changes: 3 additions & 3 deletions lib/ui/configuration.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class AppConfiguration {
Locale? _language;

//是否显示更新内容公告
bool upgradeNoticeV16 = true;
bool upgradeNoticeV17 = true;

/// 是否启用画中画
ValueNotifier<bool> pipEnabled = ValueNotifier(Platform.isAndroid);
Expand Down Expand Up @@ -177,7 +177,7 @@ class AppConfiguration {
_theme = ThemeModel(mode: mode, useMaterial3: config['useMaterial3'] ?? true);
_theme.color = config['themeColor'] ?? "Blue";

upgradeNoticeV16 = config['upgradeNoticeV16'] ?? true;
upgradeNoticeV17 = config['upgradeNoticeV17'] ?? true;
_language = config['language'] == null ? null : Locale.fromSubtags(languageCode: config['language']);
pipEnabled.value = config['pipEnabled'] ?? true;
pipIcon.value = config['pipIcon'] ?? false;
Expand Down Expand Up @@ -222,7 +222,7 @@ class AppConfiguration {
'mode': _theme.mode.name,
'themeColor': _theme.color,
'useMaterial3': _theme.useMaterial3,
'upgradeNoticeV16': upgradeNoticeV16,
'upgradeNoticeV17': upgradeNoticeV17,
"language": _language?.languageCode,
"headerExpanded": headerExpanded,

Expand Down
40 changes: 19 additions & 21 deletions lib/ui/desktop/desktop.dart
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class _DesktopHomePagePageState extends State<DesktopHomePage> implements EventL
proxyServer.addListener(this);
panel = NetworkTabController(tabStyle: const TextStyle(fontSize: 16), proxyServer: proxyServer);

if (widget.appConfiguration.upgradeNoticeV16) {
if (widget.appConfiguration.upgradeNoticeV17) {
WidgetsBinding.instance.addPostFrameCallback((_) {
showUpgradeNotice();
});
Expand Down Expand Up @@ -142,39 +142,37 @@ class _DesktopHomePagePageState extends State<DesktopHomePage> implements EventL
actions: [
TextButton(
onPressed: () {
widget.appConfiguration.upgradeNoticeV16 = false;
widget.appConfiguration.upgradeNoticeV17 = false;
widget.appConfiguration.flushConfig();
Navigator.pop(context);
},
child: Text(localizations.cancel))
],
title: Text(isCN ? '更新内容V1.1.6' : "Update content V1.1.6", style: const TextStyle(fontSize: 18)),
title: Text(isCN ? '更新内容V1.1.7' : "Update content V1.1.7", style: const TextStyle(fontSize: 18)),
content: Container(
constraints: const BoxConstraints(maxWidth: 600),
child: SelectableText(
isCN
? '提示:默认不会开启HTTPS抓包,请安装证书后再开启HTTPS抓包。\n'
'点击HTTPS抓包(加锁图标),选择安装根证书,按照提示操作即可。\n\n'
'1. 新增Hosts设置, 支持域名映射;\n'
'2. 工具箱新增时间戳转换;\n'
'3. 编辑请求发送快捷键和发送loading;\n'
'4. 修复脚本编辑键盘弹出安全模式问题;\n'
'5. 修复脚本URL编码问题;\n'
'6. 修复请求屏蔽编辑多出空格问题;\n'
'7. 修复ipad分享点击无效问题;\n'
'9. 修复重写请求修改bug;\n'
'10. 应用黑白名单增加清除无效应用,添加过滤已存在应用;\n'
'1. 新增socks5代理支持, 可在设置中关闭;\n'
'2. 响应新增图片保存;\n'
'3. 请求重写新增json格式化;\n'
'4. 修复安卓首次在画中画开启VPN闪退;\n'
'5. 修复Illegal IPv6 address问题;\n'
'6. 修复Windows历史导入安卓har历史文件崩溃问题;\n'
'7. 修复复制python请求头不全问题;\n'
'8. 修复二维码保存的背景颜色问题;\n'
: 'Tips:By default, HTTPS packet capture will not be enabled. Please install the certificate before enabling HTTPS packet capture。\n'
'Click HTTPS Capture packets(Lock icon),Choose to install the root certificate and follow the prompts to proceed。\n\n'
'1. Added Hosts settings to support domain name mapping;\n'
'2. Toolbox adds timestamp conversion;\n'
'3. Edit request to send shortcut keys and send loading;\n'
'4. Fixed script editing keyboard pop-up safe mode issue;\n'
'5. Fixed script URL encoding issue;\n'
'6. Fixed the issue of extra spaces in request mask editing;\n'
'7. Fixed the issue that iPad share clicks are invalid;\n'
'9. Fixed the rewrite request modification bug;\n'
'10. Add and remove invalid applications in the application blacklist and whitelist;\n'
'1. Added support for socks5 proxy, which can be turned off in settings;\n'
'2. Response to saving newly added images;\n'
'3. Request rewriting to add json format;\n'
'4. Fixed the issue when opening VPN in Picture-in-Picture mode on Android for the first time;\n'
'5. Fix Illegal IPv6 address issue;\n'
'6. Fix Windows history import Android har history file crash issue;\n'
'7. Fix the problem of incomplete copy of python request header;\n'
'8. Fixed the background color issue when saving QR code;\n'
'',
style: const TextStyle(fontSize: 14))));
});
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/desktop/request/request_editor.dart
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ class _HttpState extends State<_HttpWidget> {
message = widget.message;
body = TextEditingController(text: widget.message?.bodyAsString);
if (widget.message?.headers == null && !widget.readOnly) {
initHeader["User-Agent"] = ["ProxyPin/1.1.6"];
initHeader["User-Agent"] = ["ProxyPin/1.1.7"];
initHeader["Accept"] = ["*/*"];
return;
}
Expand Down
42 changes: 19 additions & 23 deletions lib/ui/mobile/mobile.dart
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class MobileHomeState extends State<MobileHomePage> implements EventListener, Li
proxyServer.addListener(this);
proxyServer.start();

if (widget.appConfiguration.upgradeNoticeV16) {
if (widget.appConfiguration.upgradeNoticeV17) {
WidgetsBinding.instance.addPostFrameCallback((_) {
showUpgradeNotice();
});
Expand Down Expand Up @@ -260,31 +260,27 @@ class MobileHomeState extends State<MobileHomePage> implements EventListener, Li

String content = isCN
? '提示:默认不会开启HTTPS抓包,请安装证书后再开启HTTPS抓包。\n\n'
'1. 新增Hosts设置, 支持域名映射;\n'
'2. 工具箱新增时间戳转换;\n'
'3. 编辑请求发送快捷键和发送loading;\n'
'4. 修复脚本编辑键盘弹出安全模式问题;\n'
'5. 修复脚本URL编码问题;\n'
'6. 修复请求屏蔽编辑多出空格问题;\n'
'7. 修复ipad分享点击无效问题;\n'
'8. 修复高级重放次数过多不执行问题;\n'
'9. 修复重写请求修改bug;\n'
'10. 应用黑白名单增加清除无效应用,添加过滤已存在应用;\n'
'1. 新增socks5代理支持, 可在设置中关闭;\n'
'2. 响应新增图片保存;\n'
'3. 请求重写新增json格式化;\n'
'4. 修复安卓首次在画中画开启VPN闪退;\n'
'5. 修复Illegal IPv6 address问题;\n'
'6. 修复Windows历史导入安卓har历史文件崩溃问题;\n'
'7. 修复复制python请求头不全问题;\n'
'8. 修复二维码保存的背景颜色问题;\n'
: 'Tips:By default, HTTPS packet capture will not be enabled. Please install the certificate before enabling HTTPS packet capture。\n\n'
'Click HTTPS Capture packets(Lock icon),Choose to install the root certificate and follow the prompts to proceed。\n\n'
'1. Added Hosts settings to support domain name mapping;\n'
'2. Toolbox adds timestamp conversion;\n'
'3. Edit request to send shortcut keys and send loading;\n'
'4. Fixed script editing keyboard pop-up safe mode issue;\n'
'5. Fixed script URL encoding issue;\n'
'6. Fixed the issue of extra spaces in request mask editing;\n'
'7. Fixed the issue that iPad share clicks are invalid;\n'
'8. Fixed the issue that the advanced replay would not execute if there were too many times;\n'
'9. Fixed the rewrite request update bug;\n'
'10. Add and remove invalid applications in the application blacklist and whitelist;\n'
'1. Added support for socks5 proxy, which can be turned off in settings;\n'
'2. Response to saving newly added images;\n'
'3. Request rewriting to add json format;\n'
'4. Fixed the issue when opening VPN in Picture-in-Picture mode on Android for the first time;\n'
'5. Fix Illegal IPv6 address issue;\n'
'6. Fix Windows history import Android har history file crash issue;\n'
'7. Fix the problem of incomplete copy of python request header;\n'
'8. Fixed the background color issue when saving QR code;\n'
'';
showAlertDialog(isCN ? '更新内容V1.1.6' : "Update content V1.1.6", content, () {
widget.appConfiguration.upgradeNoticeV16 = false;
showAlertDialog(isCN ? '更新内容V1.1.7' : "Update content V1.1.7", content, () {
widget.appConfiguration.upgradeNoticeV17 = false;
widget.appConfiguration.flushConfig();
});
}
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/mobile/request/request_editor.dart
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ class _HttpState extends State<_HttpWidget> with AutomaticKeepAliveClientMixin {
message = widget.message;
body = widget.message?.bodyAsString;
if (widget.message?.headers == null && !widget.readOnly) {
initHeader["User-Agent"] = ["ProxyPin/1.1.6"];
initHeader["User-Agent"] = ["ProxyPin/1.1.7"];
initHeader["Accept"] = ["*/*"];
return;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/mobile/widgets/about.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class About extends StatelessWidget {
padding: const EdgeInsets.only(left: 10, right: 10),
child: Text(isCN ? "全平台开源免费抓包软件" : "Full platform open source free capture HTTP(S) traffic software")),
const SizedBox(height: 10),
const Text("V1.1.6"),
const Text("V1.1.7"),
ListTile(
title: const Text("GitHub"),
trailing: const Icon(Icons.arrow_right),
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/har.dart
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class Har {
title = title.contains("ProxyPin") ? title : "[ProxyPin]$title";
har["log"] = {
"version": "1.2",
"creator": {"name": "ProxyPin", "version": "1.1.6"},
"creator": {"name": "ProxyPin", "version": "1.1.7"},
"pages": [
{
"title": title,
Expand Down
2 changes: 1 addition & 1 deletion linux/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cd ../build/linux/x64/release
rm -rf package
mkdir -p package/DEBIAN
echo "Package: ProxyPin" >> package/DEBIAN/control
echo "Version: 1.1.6" >> package/DEBIAN/control
echo "Version: 1.1.7" >> package/DEBIAN/control
echo "Priority: optional" >> package/DEBIAN/control
echo "Architecture: amd64" >> package/DEBIAN/control
echo "Depends: ca-certificates" >> package/DEBIAN/control
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: proxypin
description: ProxyPin
publish_to: 'none' # Remove this line if you wish to publish to pub.dev

version: 1.1.6+16
version: 1.1.7+17

environment:
sdk: '>=3.0.2 <4.0.0'
Expand Down

0 comments on commit 7074183

Please sign in to comment.