Reformat LoginActivity.java
This commit is contained in:
@ -58,6 +58,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
|
|||||||
|
|
||||||
@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);
|
||||||
@ -106,6 +106,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void onNothingSelected(AdapterView<?> parent) {
|
public void onNothingSelected(AdapterView<?> parent) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
@ -208,6 +209,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
|
|||||||
}
|
}
|
||||||
|
|
||||||
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;
|
||||||
@ -416,24 +411,15 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
|
|||||||
|
|
||||||
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);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -451,7 +437,8 @@ 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();
|
||||||
}
|
}
|
||||||
@ -462,18 +449,12 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
|
|||||||
|
|
||||||
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_);
|
||||||
@ -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>() {
|
||||||
|
|
||||||
@ -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);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -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);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -698,10 +664,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
|
|||||||
|
|
||||||
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>() {
|
||||||
|
|
||||||
@ -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>() {
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user