hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1530 from Kingtous/master

Browse Source 
fix: add null catch on address book request
This commit is contained in:
RustDesk 2022-09-15 11:18:48 +08:00 committed by GitHub
commit ab60db3e66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flutter/lib/desktop/pages/connection_page.dart
View File

@ -414,7 +414,7 @@ class _ConnectionPageState extends State<ConnectionPage> {
); );
} else { } else {
if (model.abLoading) { if (model.abLoading) {
return Center( return const Center(
child: CircularProgressIndicator(), child: CircularProgressIndicator(),
); );
} else if (model.abError.isNotEmpty) { } else if (model.abError.isNotEmpty) {

2
flutter/lib/desktop/widgets/peer_widget.dart
View File

@ -266,7 +266,7 @@ class AddressBookPeerWidget extends BasePeerWidget {
loadEvent: 'load_address_book_peers', loadEvent: 'load_address_book_peers',
offstageFunc: (Peer peer) => offstageFunc: (Peer peer) =>
!_hitTag(gFFI.abModel.selectedTags, peer.tags), !_hitTag(gFFI.abModel.selectedTags, peer.tags),
peerCardWidgetFunc: (Peer peer) => DiscoveredPeerCard( peerCardWidgetFunc: (Peer peer) => AddressBookPeerCard(
peer: peer, peer: peer,
), ),
initPeers: _loadPeers(), initPeers: _loadPeers(),

24
flutter/lib/models/ab_model.dart
View File

@ -28,21 +28,26 @@ class AbModel with ChangeNotifier {
try { try {
final resp = final resp =
await http.post(Uri.parse(api), headers: await _getHeaders()); await http.post(Uri.parse(api), headers: await _getHeaders());
Map<String, dynamic> json = jsonDecode(resp.body); if (resp.body.isNotEmpty && resp.body.toLowerCase() != "null") {
if (json.containsKey('error')) { Map<String, dynamic> json = jsonDecode(resp.body);
abError = json['error']; if (json.containsKey('error')) {
} else if (json.containsKey('data')) { abError = json['error'];
final data = jsonDecode(json['data']); } else if (json.containsKey('data')) {
tags.value = data['tags']; final data = jsonDecode(json['data']);
peers.value = data['peers']; tags.value = data['tags'];
peers.value = data['peers'];
}
notifyListeners();
return resp.body;
} else {
return "";
} }
return resp.body;
} catch (err) { } catch (err) {
abError = err.toString(); abError = err.toString();
} finally { } finally {
notifyListeners();
abLoading = false; abLoading = false;
} }
notifyListeners();
return null; return null;
} }
@ -60,7 +65,6 @@ class AbModel with ChangeNotifier {
return _ffi?.getHttpHeaders(); return _ffi?.getHttpHeaders();
} }
///
void addId(String id) async { void addId(String id) async {
if (idContainBy(id)) { if (idContainBy(id)) {
return; return;