Gitea
/
git-touch-android-ios-app
mirror of https://github.com/git-touch/git-touch
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: remove previous account if duplicated

This commit is contained in:
Rongjian Zhang 2019-09-26 22:28:40 +08:00
parent 2de9884756
commit f2e312079b
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/models/settings.dart
View File

@ -54,6 +54,23 @@ class SettingsModel with ChangeNotifier {
String get token => activeAccount.token;
_setAccounts(AccountModel account) async {
// Remove previous if duplicated
List<AccountModel> newAccounts = [];
for (var a in _accounts) {
if (!account.equals(a)) {
newAccounts.add(a);
}
}
newAccounts.add(account);
_accounts = newAccounts;
// Save
final prefs = await SharedPreferences.getInstance();
await prefs.setString(StorageKeys.accounts, json.encode(_accounts));
}
// https://developer.github.com/apps/building-oauth-apps/authorizing-oauth-apps/#web-application-flow
Future<void> _onSchemeDetected(Uri uri) async {
await closeWebView();
@ -90,22 +107,13 @@ class SettingsModel with ChangeNotifier {
}
''', token);
final account = AccountModel(
await _setAccounts(AccountModel(
platform: PlatformType.github,
domain: 'github.com',
token: token,
login: queryData['viewer']['login'] as String,
avatarUrl: queryData['viewer']['avatarUrl'] as String,
);
// TODO: duplicated
// if (_accounts.where(account.equals).isNotEmpty) {}
_accounts.add(account);
// Write to perfs
final prefs = await SharedPreferences.getInstance();
await prefs.setString(StorageKeys.accounts, json.encode(_accounts));
));
loading = false;
notifyListeners();
@ -124,18 +132,13 @@ class SettingsModel with ChangeNotifier {
throw info['message'];
}
final account = AccountModel(
await _setAccounts(AccountModel(
platform: PlatformType.gitlab,
domain: domain,
token: token,
login: info['username'] as String,
avatarUrl: info['avatar_url'] as String,
);
_accounts.add(account);
final prefs = await SharedPreferences.getInstance();
await prefs.setString(StorageKeys.accounts, json.encode(_accounts));
));
} catch (err) {
print(err);
// TODO: show errors