Skip to content

Commit 31f3515

Browse files
committed
wait for update data and auto login
1 parent d4001fc commit 31f3515

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

lib/login.dart

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,26 @@ class LoginScreenState extends State<LoginScreen> {
4040
SharedPreferences prefs;
4141

4242
bool isLoading = false;
43+
bool isLoggedIn = false;
4344
FirebaseUser currentUser;
4445

46+
@override
47+
void initState() {
48+
super.initState();
49+
isSignedIn();
50+
}
51+
52+
void isSignedIn() async {
53+
isLoggedIn = await googleSignIn.isSignedIn();
54+
prefs = await SharedPreferences.getInstance();
55+
if (isLoggedIn) {
56+
Navigator.push(
57+
context,
58+
MaterialPageRoute(builder: (context) => MainScreen(currentUserId: prefs.getString('id'))),
59+
);
60+
}
61+
}
62+
4563
Future<Null> handleSignIn() async {
4664
prefs = await SharedPreferences.getInstance();
4765

lib/settings.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class SettingsScreenState extends State<SettingsScreen> {
8888
Uri downloadUrl = (await uploadTask.future).downloadUrl;
8989
photoUrl = downloadUrl.toString();
9090

91-
Firestore.instance
91+
await Firestore.instance
9292
.collection('users')
9393
.document(id)
9494
.updateData({'nickname': nickname, 'aboutMe': aboutMe, 'photoUrl': photoUrl});
@@ -108,7 +108,7 @@ class SettingsScreenState extends State<SettingsScreen> {
108108
isLoading = true;
109109
});
110110

111-
Firestore.instance
111+
await Firestore.instance
112112
.collection('users')
113113
.document(id)
114114
.updateData({'nickname': nickname, 'aboutMe': aboutMe, 'photoUrl': photoUrl});

0 commit comments

Comments
 (0)