flutter/GitJournal
1
0
Fork 0
mirror of https://github.com/GitJournal/GitJournal.git synced 2025-06-28 01:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Setup: Move generating ssh key + deploy key code out of widget

Browse Source 
It's strange, but this widget routinely gets constructed twice. So
performing a long async operation (generating the ssh key + adding it as
a deploy key) from initState, results in it being called twice. I'm not
sure where the state is initialized twice.

Even adding a unique key to the widget did not help. In the end, I've
just moved the code to its parent widget.
This commit is contained in:
Vishesh Handa
2020-05-18 18:19:26 +02:00
parent 5123938e53
commit b193b75254
2 changed files with 51 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
lib/setup/autoconfigure_complete.dart
View File

@ -1,90 +0,0 @@
import 'package:flutter/material.dart';
import 'package:function_types/function_types.dart';
import 'package:git_bindings/git_bindings.dart';
import 'package:gitjournal/analytics.dart';
import 'package:gitjournal/apis/githost_factory.dart';
import 'package:gitjournal/error_reporting.dart';
import 'package:gitjournal/utils/logger.dart';
import 'error.dart';
import 'loading.dart';
class GitHostSetupAutoConfigureComplete extends StatefulWidget {
final GitHost gitHost;
final GitHostRepo repo;
final Func1<String, void> onDone;
GitHostSetupAutoConfigureComplete({
@required this.gitHost,
@required this.repo,
@required this.onDone,
});
@override
GitHostSetupAutoConfigureCompleteState createState() {
return GitHostSetupAutoConfigureCompleteState();
}
}
class GitHostSetupAutoConfigureCompleteState
extends State<GitHostSetupAutoConfigureComplete> {
String errorMessage = "";
String _message = "...";
@override
void initState() {
super.initState();
_initAsync();
}
void _initAsync() async {
Log.d("Starting autoconfigure copletion");
try {
Log.i("Generating SSH Key");
setState(() {
_message = "Generating SSH Key";
});
var publicKey = await generateSSHKeys(comment: "GitJournal");
Log.i("Adding as a deploy key");
if (mounted) {
setState(() {
_message = "Adding as a Deploy Key";
});
}
await widget.gitHost.addDeployKey(publicKey, widget.repo.fullName);
} on Exception catch (e, stacktrace) {
_handleGitHostException(e, stacktrace);
return;
}
widget.onDone(widget.repo.cloneUrl);
}
void _handleGitHostException(Exception e, StackTrace stacktrace) {
Log.d("GitHostSetupAutoConfigureComplete: " + e.toString());
setState(() {
errorMessage = e.toString();
getAnalytics().logEvent(
name: "githostsetup_error",
parameters: <String, String>{
'errorMessage': errorMessage,
},
);
logException(e, stacktrace);
});
}
@override
Widget build(BuildContext context) {
if (errorMessage == null || errorMessage.isEmpty) {
return GitHostSetupLoadingPage(_message);
}
return GitHostSetupErrorPage(errorMessage);
}
}

65
lib/setup/screens.dart
View File

@ -9,7 +9,7 @@ import 'package:git_bindings/git_bindings.dart';
import 'package:gitjournal/analytics.dart';
import 'package:gitjournal/apis/githost_factory.dart';
import 'package:gitjournal/setup/autoconfigure_complete.dart';
import 'package:gitjournal/error_reporting.dart';
import 'package:gitjournal/setup/repo_selector.dart';
import 'package:gitjournal/state_container.dart';
import 'package:gitjournal/utils.dart';
@ -22,8 +22,8 @@ import 'package:url_launcher/url_launcher.dart';
import 'autoconfigure.dart';
import 'button.dart';
import 'clone.dart';
import 'clone_url.dart';
import 'loading_error.dart';
import 'sshkey.dart';
class GitHostSetupScreen extends StatefulWidget {
@ -53,6 +53,8 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
var _gitHostType = GitHostType.Unknown;
GitHost _gitHost;
GitHostRepo _gitHostRepo;
String _autoConfigureMessage = "";
String _autoConfigureErrorMessage = "";
var _gitCloneUrl = "";
var gitCloneErrorMessage = "";
@ -236,6 +238,7 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
_gitHostRepo = repo;
_pageCount = pos + 2;
_nextPage();
_completeAutoConfigure();
});
},
);
@ -288,18 +291,9 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
);
}
} else if (_pageChoice[1] == PageChoice1.Auto) {
return GitHostSetupAutoConfigureComplete(
gitHost: _gitHost,
repo: _gitHostRepo,
onDone: (String gitCloneUrl) {
setState(() {
_gitCloneUrl = gitCloneUrl;
_pageCount = pos + 2;
_nextPage();
_startGitClone(context);
});
},
return GitHostSetupLoadingErrorPage(
loadingMessage: _autoConfigureMessage,
errorMessage: _autoConfigureErrorMessage,
);
}
}
@ -530,6 +524,49 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
widget.onCompletedFunction();
}
Future<void> _completeAutoConfigure() async {
Log.d("Starting autoconfigure copletion");
try {
Log.i("Generating SSH Key");
setState(() {
_autoConfigureMessage = "Generating SSH Key";
});
var publicKey = await generateSSHKeys(comment: "GitJournal");
Log.i("Adding as a deploy key");
_autoConfigureMessage = "Adding as a Deploy Key";
await _gitHost.addDeployKey(publicKey, _gitHostRepo.fullName);
} on Exception catch (e, stacktrace) {
_handleGitHostException(e, stacktrace);
return;
}
setState(() {
_gitCloneUrl = _gitHostRepo.cloneUrl;
_pageCount += 1;
_nextPage();
_startGitClone(context);
});
}
void _handleGitHostException(Exception e, StackTrace stacktrace) {
Log.d("GitHostSetupAutoConfigureComplete: " + e.toString());
setState(() {
_autoConfigureErrorMessage = e.toString();
getAnalytics().logEvent(
name: "githostsetup_error",
parameters: <String, String>{
'errorMessage': _autoConfigureErrorMessage,
},
);
logException(e, stacktrace);
});
}
Map<String, String> _buildOnboardingAnalytics() {
var map = <String, String>{};