shihaam/GitNex
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add saveUserName step on login

Browse Source
This commit is contained in:
6543 2020-04-02 17:17:00 +02:00
parent 8853b33c11
commit f53f122a15
No known key found for this signature in database
GPG Key ID: A1CA74D27FD13271
1 changed files with 47 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -410,7 +410,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
case SUPPORTED_LATEST: case SUPPORTED_LATEST:
case SUPPORTED_OLD: case SUPPORTED_OLD:
case DEVELOPMENT: case DEVELOPMENT:
login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_); saveUserName(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_);
return; return;
case UNSUPPORTED_OLD: case UNSUPPORTED_OLD:
@ -433,7 +433,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
dialog.dismiss(); dialog.dismiss();
login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_); saveUserName(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_);
} }
}); });
@ -450,16 +450,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
} }
else if (responseVersion.code() == 403) { else if (responseVersion.code() == 403) {
login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_); saveUserName(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_);
} }
} }
@ -474,6 +465,50 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
} }
private void saveUserName(int loginType, String instanceUrl, String loginUid, String loginPass, int loginOTP, String loginToken_) {
final TinyDB tinyDb = new TinyDB(getApplicationContext());
if (loginType == 1) { // basic auth
tinyDb.putString("loginUid", loginUid);
letTheUserIn(instanceUrl, loginUid, loginPass, loginOTP);
}
else if (loginType == 2) { // token
Call<UserInfo> callVersion = RetrofitClient
.getInstance(instanceUrl, getApplicationContext())
.getApiInterface()
.getUserInfo(loginToken_);
callVersion.enqueue(new Callback<UserInfo>() {
@Override
public void onResponse(@NonNull final Call<UserInfo> callVersion, @NonNull retrofit2.Response<UserInfo> response) {
if (response.code() == 200) {
UserInfo user = response.body();
tinyDb.putString("loginUid", user.getLogin());
letTheUserInViaToken(instanceUrl, loginToken_);
} else {
Toasty.info(getApplicationContext(),
getString(R.string.errorWrongStatus) + " " + String.valueOf(response.code()));
}
}
@Override
public void onFailure(@NonNull Call<UserInfo> callVersion, Throwable t) {
Log.e("onFailure-version", t.toString());
}
});
}
}
private void letTheUserInViaToken(String instanceUrl, final String loginToken_) { private void letTheUserInViaToken(String instanceUrl, final String loginToken_) {
final TinyDB tinyDb = new TinyDB(getApplicationContext()); final TinyDB tinyDb = new TinyDB(getApplicationContext());