Skip to content

Commit 51dd120

Browse files
Merge pull request #323 from appwrite/feat-dependency-upgrades
2 parents b712cf6 + 0c7bfb6 commit 51dd120

File tree

2 files changed

+29
-23
lines changed

2 files changed

+29
-23
lines changed

templates/flutter/lib/src/client_io.dart.twig

Lines changed: 27 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import 'enums.dart';
1313
import 'exception.dart';
1414
import 'interceptor.dart';
1515
import 'response.dart';
16+
import 'package:flutter/foundation.dart';
1617

1718
ClientBase createClient({
1819
required String endPoint,
@@ -124,27 +125,32 @@ class ClientIO extends ClientBase with ClientMixin {
124125
//creating custom user agent
125126
DeviceInfoPlugin deviceInfoPlugin = DeviceInfoPlugin();
126127
var device = '';
127-
if (Platform.isAndroid) {
128-
final andinfo = await deviceInfoPlugin.androidInfo;
129-
device =
130-
'(Linux; U; Android ${andinfo.version.release}; ${andinfo.brand} ${andinfo.model})';
131-
}
132-
if (Platform.isIOS) {
133-
final iosinfo = await deviceInfoPlugin.iosInfo;
134-
device = '${iosinfo.utsname.machine} iOS/${iosinfo.systemVersion}';
135-
}
136-
if (Platform.isLinux) {
137-
final lininfo = await deviceInfoPlugin.linuxInfo;
138-
device = '(Linux; U; ${lininfo.id} ${lininfo.version})';
139-
}
140-
if (Platform.isWindows) {
141-
final wininfo = await deviceInfoPlugin.windowsInfo;
142-
device =
143-
'(Windows NT; ${wininfo.computerName})'; //can't seem to get much info here
144-
}
145-
if (Platform.isMacOS) {
146-
final macinfo = await deviceInfoPlugin.macOsInfo;
147-
device = '(Macintosh; ${macinfo.model})';
128+
try {
129+
if (Platform.isAndroid) {
130+
final andinfo = await deviceInfoPlugin.androidInfo;
131+
device =
132+
'(Linux; U; Android ${andinfo.version.release}; ${andinfo.brand} ${andinfo.model})';
133+
}
134+
if (Platform.isIOS) {
135+
final iosinfo = await deviceInfoPlugin.iosInfo;
136+
device = '${iosinfo.utsname.machine} iOS/${iosinfo.systemVersion}';
137+
}
138+
if (Platform.isLinux) {
139+
final lininfo = await deviceInfoPlugin.linuxInfo;
140+
device = '(Linux; U; ${lininfo.id} ${lininfo.version})';
141+
}
142+
if (Platform.isWindows) {
143+
final wininfo = await deviceInfoPlugin.windowsInfo;
144+
device =
145+
'(Windows NT; ${wininfo.computerName})'; //can't seem to get much info here
146+
}
147+
if (Platform.isMacOS) {
148+
final macinfo = await deviceInfoPlugin.macOsInfo;
149+
device = '(Macintosh; ${macinfo.model})';
150+
}
151+
} catch (e) {
152+
debugPrint('Error getting device info: $e');
153+
device = Platform.operatingSystem;
148154
}
149155
addHeader(
150156
'user-agent', '${packageInfo.packageName}/${packageInfo.version} $device');

templates/flutter/pubspec.yaml.twig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ dependencies:
1111
flutter:
1212
sdk: flutter
1313
cookie_jar: ^3.0.1
14-
device_info_plus: ^2.1.0
14+
device_info_plus: ^3.1.1
1515
flutter_web_auth: ^0.3.1
1616
http: ^0.13.4
1717
package_info_plus: ^1.3.0
18-
path_provider: ^2.0.6
18+
path_provider: ^2.0.7
1919
web_socket_channel: ^2.1.0
2020
2121
dev_dependencies:

0 commit comments

Comments
 (0)