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

Merge pull request #2611 from Heap-Hop/master

Browse Source 
fix log out failure bug
This commit is contained in:
RustDesk 2022-12-21 09:48:30 +08:00 committed by GitHub
commit ff491ff06c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -982,6 +982,8 @@ class _FileManagerPageState extends State<FileManagerPage>
}, },
dismissOnClicked: true)); dismissOnClicked: true));
} }
} catch (e) {
debugPrint("buildBread fetchDirectory err=$e");
} finally { } finally {
if (!isLocal) { if (!isLocal) {
_ffi.dialogManager.dismissByTag(loadingTag); _ffi.dialogManager.dismissByTag(loadingTag);

4
flutter/lib/desktop/widgets/remote_menubar.dart
View File

@ -1032,7 +1032,9 @@ class _RemoteMenubarState extends State<RemoteMenubar> {
final h265 = codecsJson['h265'] ?? false; final h265 = codecsJson['h265'] ?? false;
codecs.add(h264); codecs.add(h264);
codecs.add(h265); codecs.add(h265);
} finally {} } catch (e) {
debugPrint("Show Codec Preference err=$e");
}
if (codecs.length == 2 && (codecs[0] || codecs[1])) { if (codecs.length == 2 && (codecs[0] || codecs[1])) {
displayMenu.add(MenuEntryRadios<String>( displayMenu.add(MenuEntryRadios<String>(
text: translate('Codec Preference'), text: translate('Codec Preference'),

6
flutter/lib/mobile/pages/remote_page.dart
View File

@ -696,7 +696,7 @@ class _RemotePageState extends State<RemotePage> {
gFFI.dialogManager.show((setState, close) { gFFI.dialogManager.show((setState, close) {
void setMode(String? v) async { void setMode(String? v) async {
await bind.sessionPeerOption( await bind.sessionPeerOption(
id: widget.id, name: "keyboard-mode", value: v ?? ""); id: widget.id, name: "keyboard-mode", value: v ?? "");
setState(() => current = v ?? ''); setState(() => current = v ?? '');
Future.delayed(Duration(milliseconds: 300), close); Future.delayed(Duration(milliseconds: 300), close);
} }
@ -978,7 +978,9 @@ void showOptions(
final h265 = codecsJson['h265'] ?? false; final h265 = codecsJson['h265'] ?? false;
codecs.add(h264); codecs.add(h264);
codecs.add(h265); codecs.add(h265);
} finally {} } catch (e) {
debugPrint("Show Codec Preference err=$e");
}
} }
dialogManager.show((setState, close) { dialogManager.show((setState, close) {

5
flutter/lib/models/file_model.dart
View File

@ -213,7 +213,6 @@ class FileModel extends ChangeNotifier {
} }
receiveFileDir(Map<String, dynamic> evt) { receiveFileDir(Map<String, dynamic> evt) {
// debugPrint("recv file dir:$evt");
if (evt['is_local'] == "false") { if (evt['is_local'] == "false") {
// init remote home, the connection will automatic read remote home when established, // init remote home, the connection will automatic read remote home when established,
try { try {
@ -237,7 +236,9 @@ class FileModel extends ChangeNotifier {
debugPrint("init remote home:${fd.path}"); debugPrint("init remote home:${fd.path}");
_currentRemoteDir = fd; _currentRemoteDir = fd;
} }
} finally {} } catch (e) {
debugPrint("receiveFileDir err=$e");
}
} }
_fileFetcher.tryCompleteTask(evt['value'], evt['is_local']); _fileFetcher.tryCompleteTask(evt['value'], evt['is_local']);
notifyListeners(); notifyListeners();

16
flutter/lib/models/user_model.dart
View File

@ -79,12 +79,16 @@ class UserModel {
final tag = gFFI.dialogManager.showLoading(translate('Waiting')); final tag = gFFI.dialogManager.showLoading(translate('Waiting'));
try { try {
final url = await bind.mainGetApiServer(); final url = await bind.mainGetApiServer();
final _ = await http.post(Uri.parse('$url/api/logout'), await http
body: { .post(Uri.parse('$url/api/logout'),
'id': await bind.mainGetMyId(), body: {
'uuid': await bind.mainGetUuid(), 'id': await bind.mainGetMyId(),
}, 'uuid': await bind.mainGetUuid(),
headers: await getHttpHeaders()); },
headers: await getHttpHeaders())
.timeout(Duration(seconds: 2));
} catch (e) {
print("request /api/logout failed: err=$e");
} finally { } finally {
await reset(); await reset();
gFFI.dialogManager.dismissByTag(tag); gFFI.dialogManager.dismissByTag(tag);