Skip to content

Commit

Permalink
Rename LoginResult to BPMResult
Browse files Browse the repository at this point in the history
  • Loading branch information
Cryptically committed Aug 28, 2016
1 parent 79215c1 commit 3fd6cfb
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
22 changes: 11 additions & 11 deletions src/me/corriekay/pokegoutil/DATA/managers/AccountManager.java
Expand Up @@ -9,7 +9,7 @@
import com.pokegoapi.exceptions.RemoteServerException;
import me.corriekay.pokegoutil.DATA.enums.LoginType;
import me.corriekay.pokegoutil.DATA.models.LoginData;
import me.corriekay.pokegoutil.DATA.models.LoginResult;
import me.corriekay.pokegoutil.DATA.models.BPMResult;
import me.corriekay.pokegoutil.utils.ConfigKey;
import me.corriekay.pokegoutil.utils.ConfigNew;
import okhttp3.OkHttpClient;
Expand Down Expand Up @@ -84,7 +84,7 @@ private void initOtherControllers() {
ProfileManager.initialize(go);
}

public LoginResult login(LoginData loginData) throws Exception {
public BPMResult login(LoginData loginData) throws Exception {
switch (loginData.getLoginType()) {
case GOOGLE:
if (loginData.isValidGoogleLogin()) {
Expand All @@ -98,10 +98,10 @@ public LoginResult login(LoginData loginData) throws Exception {
break;
default:
}
return new LoginResult("Invalid Login Type");
return new BPMResult("Invalid Login Type");
}

private LoginResult logOnGoogleAuth(LoginData loginData) {
private BPMResult logOnGoogleAuth(LoginData loginData) {
OkHttpClient http;
CredentialProvider cp;
http = new OkHttpClient();
Expand Down Expand Up @@ -134,19 +134,19 @@ private LoginResult logOnGoogleAuth(LoginData loginData) {
}
} catch (Exception e) {
deleteLoginData(LoginType.GOOGLE);
return new LoginResult(e.getMessage());
return new BPMResult(e.getMessage());
}

try {
prepareLogin(cp, http);
return new LoginResult();
return new BPMResult();
} catch (LoginFailedException | RemoteServerException e) {
deleteLoginData(LoginType.BOTH);
return new LoginResult(e.getMessage());
return new BPMResult(e.getMessage());
}
}

private LoginResult logOnPTC(LoginData loginData) throws Exception {
private BPMResult logOnPTC(LoginData loginData) throws Exception {
OkHttpClient http;
CredentialProvider cp;
http = new OkHttpClient();
Expand All @@ -165,15 +165,15 @@ private LoginResult logOnPTC(LoginData loginData) throws Exception {
}
} catch (Exception e) {
deleteLoginData(LoginType.PTC);
return new LoginResult(e.getMessage());
return new BPMResult(e.getMessage());
}

try {
prepareLogin(cp, http);
return new LoginResult();
return new BPMResult();
} catch (LoginFailedException | RemoteServerException e) {
deleteLoginData(LoginType.BOTH);
return new LoginResult(e.getMessage());
return new BPMResult(e.getMessage());
}

}
Expand Down
@@ -1,14 +1,14 @@
package me.corriekay.pokegoutil.DATA.models;

public class LoginResult {
public class BPMResult {
private boolean success;
private String errorMessage;

public LoginResult() {
public BPMResult() {
success = true;
}

public LoginResult(String errorMessage) {
public BPMResult(String errorMessage) {
success = false;
this.errorMessage = errorMessage;
}
Expand Down
Expand Up @@ -17,7 +17,7 @@
import me.corriekay.pokegoutil.DATA.enums.LoginType;
import me.corriekay.pokegoutil.DATA.managers.AccountManager;
import me.corriekay.pokegoutil.DATA.models.LoginData;
import me.corriekay.pokegoutil.DATA.models.LoginResult;
import me.corriekay.pokegoutil.DATA.models.BPMResult;
import me.corriekay.pokegoutil.utils.helpers.Browser;

import java.io.IOException;
Expand Down Expand Up @@ -178,7 +178,7 @@ private void toggleFields(boolean save) {

private void tryLogin(LoginData loginData) {
try {
LoginResult loginResult = accountManager.login(loginData);
BPMResult loginResult = accountManager.login(loginData);

if (loginResult.isSuccess()) {
openMainWindow();
Expand Down

0 comments on commit 3fd6cfb

Please sign in to comment.