gitnex/GitNex
gitnex/GitNex
Archived
14
58
Fork 14
Code Issues Pull Requests 2 Releases 22 Wiki Activity

Allow login if api is restricted via REQUIRE_SIGNIN_VIEW #215

Merged
mmarif merged 1 commits from Unpublished/GitNex:allowRestrictedApi into master 2019-11-27 20:06:32 +00:00
Conversation 3 Commits 1 Files Changed 1 +13 -12
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/org/mian/gitnex/activities/LoginActivity.java
View File

@ -396,12 +396,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
case SUPPORTED_LATEST:
case SUPPORTED_OLD:
case DEVELOPMENT:
if(loginType == 1) {
letTheUserIn(instanceUrl, loginUid, loginPass, loginOTP);
}
else if(loginType == 2) { // token
letTheUserInViaToken(instanceUrl, loginToken_);
}
login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_);
return;
case UNSUPPORTED_OLD:
@ -424,12 +419,7 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
if(loginType == 1) {
letTheUserIn(instanceUrl, loginUid, loginPass, loginOTP);
}
else if(loginType == 2) { // token
letTheUserInViaToken(instanceUrl, loginToken_);
}
login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_);
}
});
@ -445,7 +435,18 @@ public class LoginActivity extends AppCompatActivity implements View.OnClickList
}
}
else if (responseVersion.code() == 403) {
login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_);
}
}
private void login(int loginType, String instanceUrl, String loginUid, String loginPass, int loginOTP, String loginToken_) {
if (loginType == 1) {
letTheUserIn(instanceUrl, loginUid, loginPass, loginOTP);
}
else if (loginType == 2) { // token
letTheUserInViaToken(instanceUrl, loginToken_);
}
}
@Override