twonly/twonly-app
1
0
Fork 0
mirror of https://github.com/twonlyapp/twonly-app.git synced 2026-03-03 20:16:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix #368

Browse source
This commit is contained in:
otsmr 2026-01-17 19:09:01 +01:00
parent 8ecae72d80
commit 5a7cc992a1
1 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
lib/src/views/settings/help/contact_us.view.dart
View file

@ -3,6 +3,7 @@ import 'package:device_info_plus/device_info_plus.dart';
import 'package:fixnum/fixnum.dart'; import 'package:fixnum/fixnum.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:font_awesome_flutter/font_awesome_flutter.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:package_info_plus/package_info_plus.dart'; import 'package:package_info_plus/package_info_plus.dart';
import 'package:twonly/globals.dart'; import 'package:twonly/globals.dart';
@ -81,10 +82,7 @@ class _ContactUsState extends State<ContactUsView> {
return null; return null;
} }
Future<String> _getFeedbackText() async { Future<String?> _getFeedbackText() async {
setState(() {
isLoading = true;
});
var osVersion = ''; var osVersion = '';
final locale = context.lang.localeName; final locale = context.lang.localeName;
final deviceInfo = DeviceInfoPlugin(); final deviceInfo = DeviceInfoPlugin();
@ -95,7 +93,11 @@ class _ContactUsState extends State<ContactUsView> {
final feedback = _controller.text; final feedback = _controller.text;
var debugLogToken = ''; var debugLogToken = '';
if (!mounted) return ''; if (!mounted) return null;
setState(() {
isLoading = true;
});
// Get device information // Get device information
if (Theme.of(context).platform == TargetPlatform.android) { if (Theme.of(context).platform == TargetPlatform.android) {
@ -109,18 +111,23 @@ class _ContactUsState extends State<ContactUsView> {
} }
if (includeDebugLog) { if (includeDebugLog) {
String? token;
try { try {
final token = await uploadDebugLog(); token = await uploadDebugLog();
if (token != null) {
debugLogToken =
'Debug Log: https://api.twonly.eu/api/download/$token';
}
} catch (e) { } catch (e) {
if (!mounted) return ''; Log.error(e);
}
if (token == null) {
if (!mounted) return null;
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Could not upload the debug log!')), const SnackBar(content: Text('Could not upload the debug log!')),
); );
setState(() {
isLoading = false;
});
return null;
} }
debugLogToken = 'Debug Log: https://api.twonly.eu/api/download/$token';
} }
setState(() { setState(() {
@ -238,12 +245,22 @@ $debugLogToken
), ),
), ),
), ),
ElevatedButton( ElevatedButton.icon(
icon: isLoading
? SizedBox(
height: 12,
width: 12,
child: CircularProgressIndicator(
strokeWidth: 2,
color: Theme.of(context).colorScheme.inversePrimary,
),
)
: const FaIcon(FontAwesomeIcons.angleRight),
onPressed: isLoading onPressed: isLoading
? null ? null
: () async { : () async {
final fullMessage = await _getFeedbackText(); final fullMessage = await _getFeedbackText();
if (!context.mounted) return; if (!context.mounted || fullMessage == null) return;
final feedbackSend = await Navigator.push( final feedbackSend = await Navigator.push(
context, context,
@ -260,7 +277,7 @@ $debugLogToken
Navigator.pop(context); Navigator.pop(context);
} }
}, },
child: Text(context.lang.next), label: Text(context.lang.next),
), ),
], ],
), ),