sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-18 19:59:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #582 from TheHollidayInn/facebook-register-from-login-page-fix

Browse source 
Fixed issue with displaying onboarding when user registers with facebook from the login screen
This commit is contained in:
Phillip Thelen 2016-09-02 19:26:35 +02:00 committed by GitHub
commit be96d29c98
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java
View file

@ -363,7 +363,8 @@ public class LoginActivity extends BaseActivity
} catch (Exception e) {
e.printStackTrace();
}
if (this.isRegistering) {
if (this.isRegistering || userAuthResponse.getNewUser()) {
this.startSetupActivity();
} else {
JSONObject eventProperties = new JSONObject();

9
Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/UserAuthResponse.java
View file

@ -7,6 +7,7 @@ public class UserAuthResponse {
//we need apiToken and token, as both are possible returns
private String apiToken;
private String token;
private Boolean newUser = false;
private String id;
public String getToken() {
@ -36,4 +37,12 @@ public class UserAuthResponse {
public void setId(String id) {
this.id = id;
}
public Boolean getNewUser() {
return newUser;
}
public void setNewUser(Boolean newUser) {
this.newUser = newUser;
}
}