Reformat LoginActivity.java

This commit is contained in:
6543
2020-05-09 01:03:46 +02:00
parent 0ec813a8d2
commit 01268f3f82

View File

@ -57,7 +57,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
private ScrollView layoutView; private ScrollView layoutView;
@Override @Override
protected int getLayoutResourceId(){ protected int getLayoutResourceId() {
return R.layout.activity_login; return R.layout.activity_login;
} }
@ -88,8 +89,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
Resources res = getResources(); Resources res = getResources();
String[] allProtocols = res.getStringArray(R.array.protocolValues); String[] allProtocols = res.getStringArray(R.array.protocolValues);
final ArrayAdapter<String> adapterProtocols = new ArrayAdapter<String>(LoginActivity.this, final ArrayAdapter<String> adapterProtocols = new ArrayAdapter<String>(LoginActivity.this, R.layout.spinner_item, allProtocols);
R.layout.spinner_item, allProtocols);
adapterProtocols.setDropDownViewResource(R.layout.spinner_dropdown_item); adapterProtocols.setDropDownViewResource(R.layout.spinner_dropdown_item);
protocolSpinner.setAdapter(adapterProtocols); protocolSpinner.setAdapter(adapterProtocols);
@ -100,12 +100,13 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
String value = getResources().getStringArray(R.array.protocolValues)[pos]; String value = getResources().getStringArray(R.array.protocolValues)[pos];
if(value.toLowerCase().equals("http")) { if(value.toLowerCase().equals("http")) {
SnackBar.warning(ctx, layoutView,getResources().getString(R.string.protocolError)); SnackBar.warning(ctx, layoutView, getResources().getString(R.string.protocolError));
} }
} }
public void onNothingSelected(AdapterView<?> parent) { public void onNothingSelected(AdapterView<?> parent) {
} }
}); });
@ -201,13 +202,14 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (v.getId() == R.id.login_button) { if(v.getId() == R.id.login_button) {
login(); login();
} }
} }
private View.OnClickListener loginListener = new View.OnClickListener() { private View.OnClickListener loginListener = new View.OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
disableProcessButton(); disableProcessButton();
@ -217,16 +219,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
} }
}; };
private View.OnClickListener infoListener = v -> new Tooltip.Builder(v) private View.OnClickListener infoListener = v -> new Tooltip.Builder(v).setText(R.string.urlInfoTooltip).setTextColor(getResources().getColor(R.color.white)).setBackgroundColor(getResources().getColor(R.color.tooltipBackground)).setCancelable(true).setDismissOnClick(true).setPadding(30).setCornerRadius(R.dimen.tooltipCornor).setGravity(Gravity.BOTTOM).show();
.setText(R.string.urlInfoTooltip)
.setTextColor(getResources().getColor(R.color.white))
.setBackgroundColor(getResources().getColor(R.color.tooltipBackground))
.setCancelable(true)
.setDismissOnClick(true)
.setPadding(30)
.setCornerRadius(R.dimen.tooltipCornor)
.setGravity(Gravity.BOTTOM)
.show();
@SuppressLint("ResourceAsColor") @SuppressLint("ResourceAsColor")
private void login() { private void login() {
@ -265,7 +258,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
URI uri = null; URI uri = null;
try { try {
uri = new URI(instanceUrl); uri = new URI(instanceUrl);
} catch (URISyntaxException e) { }
catch(URISyntaxException e) {
e.printStackTrace(); e.printStackTrace();
} }
assert uri != null; assert uri != null;
@ -356,7 +350,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
URI uri = null; URI uri = null;
try { try {
uri = new URI(instanceUrl); uri = new URI(instanceUrl);
} catch (URISyntaxException e) { }
catch(URISyntaxException e) {
e.printStackTrace(); e.printStackTrace();
} }
assert uri != null; assert uri != null;
@ -383,7 +378,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
if(connToInternet) { if(connToInternet) {
if (instanceUrlET.getText().toString().equals("")) { if(instanceUrlET.getText().toString().equals("")) {
SnackBar.warning(ctx, layoutView, getResources().getString(R.string.emptyFieldURL)); SnackBar.warning(ctx, layoutView, getResources().getString(R.string.emptyFieldURL));
enableProcessButton(); enableProcessButton();
@ -391,7 +386,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
return; return;
} }
if (loginToken_.equals("")) { if(loginToken_.equals("")) {
SnackBar.warning(ctx, layoutView, getResources().getString(R.string.loginTokenError)); SnackBar.warning(ctx, layoutView, getResources().getString(R.string.loginTokenError));
enableProcessButton(); enableProcessButton();
@ -415,25 +410,16 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
private void versionCheck(final String instanceUrl, final String loginUid, final String loginPass, final int loginOTP, final String loginToken_, final int loginType) { private void versionCheck(final String instanceUrl, final String loginUid, final String loginPass, final int loginOTP, final String loginToken_, final int loginType) {
Call<GiteaVersion> callVersion; Call<GiteaVersion> callVersion;
if (!loginToken_.isEmpty()) { if(!loginToken_.isEmpty()) {
callVersion = RetrofitClient callVersion = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithToken(loginToken_);
.getInstance(instanceUrl, ctx)
.getApiInterface()
.getGiteaVersionWithToken(loginToken_);
} }
else { else {
final String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8); final String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8);
if (loginOTP != 0) { if(loginOTP != 0) {
callVersion = RetrofitClient callVersion = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithOTP(credential, loginOTP);
.getInstance(instanceUrl, ctx)
.getApiInterface()
.getGiteaVersionWithOTP(credential,loginOTP);
} }
else { else {
callVersion = RetrofitClient callVersion = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithBasic(credential);
.getInstance(instanceUrl, ctx)
.getApiInterface()
.getGiteaVersionWithBasic(credential);
} }
} }
@ -442,7 +428,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
@Override @Override
public void onResponse(@NonNull final Call<GiteaVersion> callVersion, @NonNull retrofit2.Response<GiteaVersion> responseVersion) { public void onResponse(@NonNull final Call<GiteaVersion> callVersion, @NonNull retrofit2.Response<GiteaVersion> responseVersion) {
if (responseVersion.code() == 200) { if(responseVersion.code() == 200) {
GiteaVersion version = responseVersion.body(); GiteaVersion version = responseVersion.body();
assert version != null; assert version != null;
@ -451,29 +437,24 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
Version gitea_version = new Version(getString(R.string.versionLow)); Version gitea_version = new Version(getString(R.string.versionLow));
try { try {
gitea_version = new Version(version.getVersion()); gitea_version = new Version(version.getVersion());
} catch(Error e) { }
catch(Error e) {
SnackBar.error(ctx, layoutView, getResources().getString(R.string.versionUnknow)); SnackBar.error(ctx, layoutView, getResources().getString(R.string.versionUnknow));
enableProcessButton(); enableProcessButton();
} }
//(getString(R.string.versionLow), getString(), version.getVersion()); //(getString(R.string.versionLow), getString(), version.getVersion());
// UNSUPPORTED_OLD // UNSUPPORTED_OLD
if (gitea_version.less(getString(R.string.versionLow))) { if(gitea_version.less(getString(R.string.versionLow))) {
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx); AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx);
alertDialogBuilder alertDialogBuilder.setTitle(getString(R.string.versionAlertDialogHeader)).setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion())).setCancelable(true).setIcon(R.drawable.ic_warning).setNegativeButton(getString(R.string.cancelButton), (dialog, which) -> {
.setTitle(getString(R.string.versionAlertDialogHeader))
.setMessage(getResources().getString(R.string.versionUnsupportedOld, version.getVersion()))
.setCancelable(true)
.setIcon(R.drawable.ic_warning)
.setNegativeButton(getString(R.string.cancelButton), (dialog, which) -> {
dialog.dismiss(); dialog.dismiss();
enableProcessButton(); enableProcessButton();
}) }).setPositiveButton(getString(R.string.textContinue), (dialog, which) -> {
.setPositiveButton(getString(R.string.textContinue), (dialog, which) -> {
dialog.dismiss(); dialog.dismiss();
login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_); login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_);
@ -487,7 +468,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
} }
// SUPPORTED // SUPPORTED
else if (gitea_version.lessOrEqual(getString(R.string.versionHigh))) { else if(gitea_version.lessOrEqual(getString(R.string.versionHigh))) {
login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_); login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_);
return; return;
} }
@ -499,7 +480,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_); login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_);
@ -508,10 +489,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
private void login(int loginType, String instanceUrl, String loginUid, String loginPass, int loginOTP, String loginToken_) { private void login(int loginType, String instanceUrl, String loginUid, String loginPass, int loginOTP, String loginToken_) {
if (loginType == 1) { if(loginType == 1) {
letTheUserIn(instanceUrl, loginUid, loginPass, loginOTP); letTheUserIn(instanceUrl, loginUid, loginPass, loginOTP);
} }
else if (loginType == 2) { // token else if(loginType == 2) { // token
letTheUserInViaToken(instanceUrl, loginToken_); letTheUserInViaToken(instanceUrl, loginToken_);
} }
@ -535,10 +516,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
final TinyDB tinyDb = new TinyDB(appCtx); final TinyDB tinyDb = new TinyDB(appCtx);
Call<UserInfo> call = RetrofitClient Call<UserInfo> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserInfo("token " + loginToken_);
.getInstance(instanceUrl, ctx)
.getApiInterface()
.getUserInfo("token " + loginToken_);
call.enqueue(new Callback<UserInfo>() { call.enqueue(new Callback<UserInfo>() {
@ -547,9 +525,9 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
UserInfo userDetails = response.body(); UserInfo userDetails = response.body();
if (response.isSuccessful()) { if(response.isSuccessful()) {
if (response.code() == 200) { if(response.code() == 200) {
tinyDb.putBoolean("loggedInMode", true); tinyDb.putBoolean("loggedInMode", true);
assert userDetails != null; assert userDetails != null;
@ -602,18 +580,12 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
Call<List<UserTokens>> call; Call<List<UserTokens>> call;
if(loginOTP != 0) { if(loginOTP != 0) {
call = RetrofitClient call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserTokensWithOTP(credential, loginOTP, loginUid);
.getInstance(instanceUrl, ctx)
.getApiInterface()
.getUserTokensWithOTP(credential, loginOTP, loginUid);
} }
else { else {
call = RetrofitClient call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserTokens(credential, loginUid);
.getInstance(instanceUrl, ctx)
.getApiInterface()
.getUserTokens(credential, loginUid);
} }
@ -627,19 +599,19 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
final AppUtil appUtil = new AppUtil(); final AppUtil appUtil = new AppUtil();
//Headers responseHeaders = response.headers(); //Headers responseHeaders = response.headers();
if (response.isSuccessful()) { if(response.isSuccessful()) {
if (response.code() == 200) { if(response.code() == 200) {
boolean setTokenFlag = false; boolean setTokenFlag = false;
assert userTokens != null; assert userTokens != null;
if (userTokens.size() > 0) { if(userTokens.size() > 0) {
if(userTokens.get(0).getToken_last_eight() != null) { if(userTokens.get(0).getToken_last_eight() != null) {
for (int i = 0; i < userTokens.size(); i++) { for(int i = 0; i < userTokens.size(); i++) {
if (userTokens.get(i).getToken_last_eight().equals(tinyDb.getString(loginUid + "-token-last-eight"))) { if(userTokens.get(i).getToken_last_eight().equals(tinyDb.getString(loginUid + "-token-last-eight"))) {
setTokenFlag = true; setTokenFlag = true;
break; break;
} }
@ -649,8 +621,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
} }
else { else {
for (int i = 0; i < userTokens.size(); i++) { for(int i = 0; i < userTokens.size(); i++) {
if (userTokens.get(i).getSha1().equals(tinyDb.getString(loginUid + "-token"))) { if(userTokens.get(i).getSha1().equals(tinyDb.getString(loginUid + "-token"))) {
setTokenFlag = true; setTokenFlag = true;
break; break;
} }
@ -668,18 +640,12 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
Call<UserTokens> callCreateToken; Call<UserTokens> callCreateToken;
if(loginOTP != 0) { if(loginOTP != 0) {
callCreateToken = RetrofitClient callCreateToken = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().createNewTokenWithOTP(credential, loginOTP, loginUid, createUserToken);
.getInstance(instanceUrl, ctx)
.getApiInterface()
.createNewTokenWithOTP(credential, loginOTP, loginUid, createUserToken);
} }
else { else {
callCreateToken = RetrofitClient callCreateToken = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().createNewToken(credential, loginUid, createUserToken);
.getInstance(instanceUrl, ctx)
.getApiInterface()
.createNewToken(credential, loginUid, createUserToken);
} }
@ -696,12 +662,9 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
assert newToken != null; assert newToken != null;
//Log.i("Tokens-NEW", "new:" + newToken.getSha1()); //Log.i("Tokens-NEW", "new:" + newToken.getSha1());
if (!newToken.getSha1().equals("")) { if(!newToken.getSha1().equals("")) {
Call<UserInfo> call = RetrofitClient Call<UserInfo> call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserInfo("token " + newToken.getSha1());
.getInstance(instanceUrl, ctx)
.getApiInterface()
.getUserInfo("token " + newToken.getSha1());
call.enqueue(new Callback<UserInfo>() { call.enqueue(new Callback<UserInfo>() {
@ -710,9 +673,9 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
UserInfo userDetails = response.body(); UserInfo userDetails = response.body();
if (response.isSuccessful()) { if(response.isSuccessful()) {
if (response.code() == 200) { if(response.code() == 200) {
tinyDb.remove("loginPass"); tinyDb.remove("loginPass");
tinyDb.putBoolean("loggedInMode", true); tinyDb.putBoolean("loggedInMode", true);
@ -762,7 +725,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
} }
else if(responseCreate.code() == 500) { else if(responseCreate.code() == 500) {
SnackBar.error(ctx, layoutView,getResources().getString(R.string.genericApiStatusError) + responseCreate.code()); SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + responseCreate.code());
enableProcessButton(); enableProcessButton();
loginButton.setText(R.string.btnLogin); loginButton.setText(R.string.btnLogin);
@ -783,10 +746,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
String instanceToken = "token " + tinyDb.getString(loginUid + "-token"); String instanceToken = "token " + tinyDb.getString(loginUid + "-token");
Call<UserInfo> callGetUsername = RetrofitClient Call<UserInfo> callGetUsername = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserInfo(instanceToken);
.getInstance(instanceUrl, ctx)
.getApiInterface()
.getUserInfo(instanceToken);
callGetUsername.enqueue(new Callback<UserInfo>() { callGetUsername.enqueue(new Callback<UserInfo>() {
@ -795,9 +755,9 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
UserInfo userDetails = response.body(); UserInfo userDetails = response.body();
if (response.isSuccessful()) { if(response.isSuccessful()) {
if (response.code() == 200) { if(response.code() == 200) {
assert userDetails != null; assert userDetails != null;
tinyDb.putString("userLogin", userDetails.getUsername()); tinyDb.putString("userLogin", userDetails.getUsername());
@ -844,14 +804,14 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
} }
else if(response.code() == 500) { else if(response.code() == 500) {
SnackBar.error(ctx, layoutView,getResources().getString(R.string.genericApiStatusError) + response.code()); SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code());
enableProcessButton(); enableProcessButton();
loginButton.setText(R.string.btnLogin); loginButton.setText(R.string.btnLogin);
} }
else { else {
SnackBar.error(ctx, layoutView,getResources().getString(R.string.genericApiStatusError) + response.code()); SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code());
enableProcessButton(); enableProcessButton();
loginButton.setText(R.string.btnLogin); loginButton.setText(R.string.btnLogin);
@ -863,7 +823,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
public void onFailure(@NonNull Call<List<UserTokens>> call, @NonNull Throwable t) { public void onFailure(@NonNull Call<List<UserTokens>> call, @NonNull Throwable t) {
Log.e("onFailure-login", t.toString()); Log.e("onFailure-login", t.toString());
SnackBar.error(ctx, layoutView,getResources().getString(R.string.malformedJson)); SnackBar.error(ctx, layoutView, getResources().getString(R.string.malformedJson));
enableProcessButton(); enableProcessButton();
loginButton.setText(R.string.btnLogin); loginButton.setText(R.string.btnLogin);
@ -876,7 +836,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
loginButton.setEnabled(false); loginButton.setEnabled(false);
GradientDrawable shape = new GradientDrawable(); GradientDrawable shape = new GradientDrawable();
shape.setCornerRadius( 8 ); shape.setCornerRadius(8);
shape.setColor(getResources().getColor(R.color.hintColor)); shape.setColor(getResources().getColor(R.color.hintColor));
loginButton.setBackground(shape); loginButton.setBackground(shape);
@ -886,7 +846,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
loginButton.setEnabled(true); loginButton.setEnabled(true);
GradientDrawable shape = new GradientDrawable(); GradientDrawable shape = new GradientDrawable();
shape.setCornerRadius( 8 ); shape.setCornerRadius(8);
shape.setColor(getResources().getColor(R.color.btnBackground)); shape.setColor(getResources().getColor(R.color.btnBackground));
loginButton.setBackground(shape); loginButton.setBackground(shape);