Panic webview fixes

Author: Manuito83

android/app/build.gradle

@@ -13,7 +13,7 @@ if (flutterRoot == null) {
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
-    flutterVersionCode = '373'
+    flutterVersionCode = '374'
 }
 
 def flutterVersionName = localProperties.getProperty('flutter.versionName')

ios/Runner.xcodeproj/project.pbxproj

@@ -536,7 +536,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 373;
+				CURRENT_PROJECT_VERSION = 374;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 53KVJRJS99;
 				ENABLE_BITCODE = NO;
@@ -680,7 +680,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 373;
+				CURRENT_PROJECT_VERSION = 374;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 53KVJRJS99;
 				ENABLE_BITCODE = NO;
@@ -718,7 +718,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 373;
+				CURRENT_PROJECT_VERSION = 374;
 				DEVELOPMENT_ASSET_PATHS = "";
 				DEVELOPMENT_TEAM = 53KVJRJS99;
 				ENABLE_BITCODE = NO;

lib/main.dart

@@ -55,8 +55,8 @@ import 'package:workmanager/workmanager.dart';
 
 // TODO: CONFIGURE FOR APP RELEASE, include exceptions in Drawer if applicable
 const String appVersion = '3.2.5';
-const String androidCompilation = '373';
-const String iosCompilation = '373';
+const String androidCompilation = '374';
+const String iosCompilation = '374';
 
 final FirebaseAnalytics analytics = FirebaseAnalytics.instance;
 

lib/utils/changelog.dart

@@ -39,7 +39,7 @@ class ChangeLogState extends State<ChangeLog> {
   void _createItems() {
     final itemList = <ChangeLogItem>[];
 
-    // v3.2.5 - Build 373 - 04/01/2024
+    // v3.2.5 - Build 374 - 04/01/2024
     itemList.add(
       ChangeLogItem()
         ..version = 'Torn PDA v3.2.5'

lib/widgets/webviews/webview_panic.dart

@@ -11,6 +11,7 @@ import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 import 'package:provider/provider.dart';
+import 'package:torn_pda/config/webview_config.dart';
 // Project imports:
 import 'package:torn_pda/models/chaining/target_model.dart';
 import 'package:torn_pda/providers/api_caller.dart';
@@ -170,6 +171,11 @@ class WebViewPanicState extends State<WebViewPanic> {
                         child: WebView(
                           initialUrl: _initialUrl,
                           javascriptMode: JavascriptMode.unrestricted,
+                          userAgent: Platform.isAndroid
+                              ? "Mozilla/5.0 (Linux; Android Torn PDA) AppleWebKit/537.36 "
+                                  "(KHTML, like Gecko) Version/4.0 Chrome/91.0.4472.114 Mobile Safari/537.36 ${WebviewConfig.agent}"
+                              : "Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) "
+                                  "CriOS/103.0.5060.54 Mobile/15E148 Safari/604.1 ${WebviewConfig.agent}",
                           javascriptChannels: {
                             JavascriptChannel(
                               name: 'loadoutChangeHandler',
@@ -490,8 +496,8 @@ class WebViewPanicState extends State<WebViewPanic> {
       bool reachedEnd = false;
       final skippedNames = [];
 
-      // We'll skip maximum of 3 targets
-      for (var i = 0; i < 3; i++) {
+      // We'll skip maximum of 10 targets
+      for (var i = 0; i < 10; i++) {
         // Get the status of our next target
         final nextTarget = await Get.find<ApiCallerController>().getTarget(playerId: widget.attackIdList[i]);
 

lib/widgets/webviews/webview_simple_dialog.dart

@@ -9,6 +9,7 @@ import 'package:flutter/material.dart';
 // Package imports:
 import 'package:flutter_inappwebview/flutter_inappwebview.dart';
 import 'package:provider/provider.dart';
+import 'package:torn_pda/config/webview_config.dart';
 import 'package:torn_pda/providers/settings_provider.dart';
 import 'package:torn_pda/providers/theme_provider.dart';
 
@@ -103,10 +104,10 @@ class WebViewSimpleDialogState extends State<WebViewSimpleDialog> {
       useOnLoadResource: true,
       //javaScriptCanOpenWindowsAutomatically: true,
       userAgent: Platform.isAndroid
-          ? "Mozilla/5.0 (Linux; Android 9; LG-H870 Build/PKQ1.190522.001) AppleWebKit/537.36 (KHTML, like Gecko) "
-              "Version/4.0 Chrome/83.0.4103.106 Mobile Safari/537.36 com.manuito.tornlite"
+          ? "Mozilla/5.0 (Linux; Android Torn PDA) AppleWebKit/537.36 "
+              "(KHTML, like Gecko) Version/4.0 Chrome/91.0.4472.114 Mobile Safari/537.36 ${WebviewConfig.agent}"
           : "Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) "
-              "CriOS/103.0.5060.54 Mobile/15E148 Safari/604.1 com.manuito.tornlite",
+              "CriOS/103.0.5060.54 Mobile/15E148 Safari/604.1 ${WebviewConfig.agent}",
       //supportMultipleWindows: true,
       initialScale: _settingsProvider.androidBrowserScale,
       useWideViewPort: false,