From 3de4dd946395b636337b4b8ddc8be58d9e19ae60 Mon Sep 17 00:00:00 2001 From: 6543 <6543@noreply.gitea.io> Date: Sun, 17 May 2020 16:14:06 +0000 Subject: [PATCH] Refactor Version Checks (#472) Merge branch 'master' into refactor-versionCheck Merge branch 'master' into refactor-versionCheck Revert "test CI" This reverts commit b56eff092020eedf20a4abaf7a0a9a3f3c5ffe9b. test CI Reformat LoginActivity.java cleanup migrate Working + Tests add first UnitTest wip ... enum2class Co-authored-by: 6543 <6543@obermui.de> Reviewed-on: https://gitea.com/gitnex/GitNex/pulls/472 Reviewed-by: M M Arif --- .../gitnex/activities/CommitsActivity.java | 4 +- .../activities/CreateMilestoneActivity.java | 4 +- .../mian/gitnex/activities/LoginActivity.java | 1156 ++++++++--------- .../activities/MergePullRequestActivity.java | 8 +- .../gitnex/activities/RepoDetailActivity.java | 4 +- .../mian/gitnex/fragments/IssuesFragment.java | 4 +- .../fragments/PullRequestsFragment.java | 4 +- .../java/org/mian/gitnex/helpers/Version.java | 222 ++++ .../org/mian/gitnex/helpers/VersionCheck.java | 151 --- app/src/main/res/values/gitea_version.xml | 4 +- .../org/mian/gitnex/helpers/VersionTest.java | 115 ++ 11 files changed, 915 insertions(+), 761 deletions(-) create mode 100644 app/src/main/java/org/mian/gitnex/helpers/Version.java delete mode 100644 app/src/main/java/org/mian/gitnex/helpers/VersionCheck.java create mode 100644 app/src/test/java/org/mian/gitnex/helpers/VersionTest.java diff --git a/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java b/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java index fc46f954..ee7042d2 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CommitsActivity.java @@ -24,7 +24,7 @@ import org.mian.gitnex.clients.AppApiService; import org.mian.gitnex.helpers.Authorization; import org.mian.gitnex.helpers.StaticGlobalVariables; import org.mian.gitnex.helpers.Toasty; -import org.mian.gitnex.helpers.VersionCheck; +import org.mian.gitnex.helpers.Version; import org.mian.gitnex.interfaces.ApiInterface; import org.mian.gitnex.models.Commits; import org.mian.gitnex.util.TinyDB; @@ -92,7 +92,7 @@ public class CommitsActivity extends BaseActivity { closeActivity.setOnClickListener(onClickListener); // if gitea is 1.12 or higher use the new limit (resultLimitNewGiteaInstances) - if(VersionCheck.compareVersion("1.12.0", tinyDb.getString("giteaVersion")) >= 1) { + if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12")) { resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances; } diff --git a/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java b/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java index dfada6b8..044223b9 100644 --- a/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/CreateMilestoneActivity.java @@ -18,7 +18,7 @@ import org.mian.gitnex.R; import org.mian.gitnex.clients.RetrofitClient; import org.mian.gitnex.helpers.AlertDialogs; import org.mian.gitnex.helpers.Authorization; -import org.mian.gitnex.helpers.VersionCheck; +import org.mian.gitnex.helpers.Version; import org.mian.gitnex.helpers.Toasty; import org.mian.gitnex.models.Milestones; import org.mian.gitnex.util.AppUtil; @@ -134,7 +134,7 @@ public class CreateMilestoneActivity extends BaseActivity implements View.OnClic String finalMilestoneDueDate = null; if(!newMilestoneDueDate.isEmpty()) { finalMilestoneDueDate = (AppUtil.customDateCombine(AppUtil.customDateFormat(newMilestoneDueDate))); - } else if (VersionCheck.compareVersion("1.10.0", tinyDb.getString("giteaVersion")) > 1) { + } else if (new Version(tinyDb.getString("giteaVersion")).less("1.10.0")) { // if Gitea version is less than 1.10.0 DueDate is required Toasty.info(ctx, getString(R.string.milestoneDateEmpty)); return; diff --git a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java index 30be44c5..b0d692a0 100644 --- a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java @@ -25,7 +25,7 @@ import org.mian.gitnex.R; import org.mian.gitnex.clients.RetrofitClient; import org.mian.gitnex.helpers.NetworkObserver; import org.mian.gitnex.helpers.SnackBar; -import org.mian.gitnex.helpers.VersionCheck; +import org.mian.gitnex.helpers.Version; import org.mian.gitnex.models.GiteaVersion; import org.mian.gitnex.models.UserInfo; import org.mian.gitnex.models.UserTokens; @@ -35,7 +35,6 @@ import java.net.URI; import java.net.URISyntaxException; import java.nio.charset.StandardCharsets; import java.util.List; -import java.util.Objects; import java.util.UUID; import okhttp3.Credentials; import retrofit2.Call; @@ -47,841 +46,810 @@ import retrofit2.Callback; public class LoginActivity extends BaseActivity implements View.OnClickListener { - private Button loginButton; - private EditText instanceUrlET, loginUidET, loginPassword, otpCode, loginTokenCode; - private Spinner protocolSpinner; - private TextView otpInfo; - private RadioGroup loginMethod; - final Context ctx = this; - private Context appCtx; - private String device_id = "token"; - private ScrollView layoutView; + private Button loginButton; + private EditText instanceUrlET, loginUidET, loginPassword, otpCode, loginTokenCode; + private Spinner protocolSpinner; + private TextView otpInfo; + private RadioGroup loginMethod; + final Context ctx = this; + private Context appCtx; + private String device_id = "token"; + private ScrollView layoutView; - @Override - protected int getLayoutResourceId(){ - return R.layout.activity_login; - } + @Override + protected int getLayoutResourceId() { - @Override - public void onCreate(Bundle savedInstanceState) { + return R.layout.activity_login; + } - super.onCreate(savedInstanceState); - appCtx = getApplicationContext(); + @Override + public void onCreate(Bundle savedInstanceState) { - TinyDB tinyDb = new TinyDB(appCtx); - NetworkObserver networkMonitor = new NetworkObserver(this); + super.onCreate(savedInstanceState); + appCtx = getApplicationContext(); - loginButton = findViewById(R.id.login_button); - instanceUrlET = findViewById(R.id.instance_url); - loginUidET = findViewById(R.id.login_uid); - loginPassword = findViewById(R.id.login_passwd); - otpCode = findViewById(R.id.otpCode); - otpInfo = findViewById(R.id.otpInfo); - ImageView info_button = findViewById(R.id.info); - final TextView viewTextAppVersion = findViewById(R.id.appVersion); - protocolSpinner = findViewById(R.id.httpsSpinner); - loginMethod = findViewById(R.id.loginMethod); - loginTokenCode = findViewById(R.id.loginTokenCode); - layoutView = findViewById(R.id.loginForm); + TinyDB tinyDb = new TinyDB(appCtx); + NetworkObserver networkMonitor = new NetworkObserver(this); - viewTextAppVersion.setText(AppUtil.getAppVersion(appCtx)); + loginButton = findViewById(R.id.login_button); + instanceUrlET = findViewById(R.id.instance_url); + loginUidET = findViewById(R.id.login_uid); + loginPassword = findViewById(R.id.login_passwd); + otpCode = findViewById(R.id.otpCode); + otpInfo = findViewById(R.id.otpInfo); + ImageView info_button = findViewById(R.id.info); + final TextView viewTextAppVersion = findViewById(R.id.appVersion); + protocolSpinner = findViewById(R.id.httpsSpinner); + loginMethod = findViewById(R.id.loginMethod); + loginTokenCode = findViewById(R.id.loginTokenCode); + layoutView = findViewById(R.id.loginForm); - Resources res = getResources(); - String[] allProtocols = res.getStringArray(R.array.protocolValues); + viewTextAppVersion.setText(AppUtil.getAppVersion(appCtx)); - final ArrayAdapter adapterProtocols = new ArrayAdapter(LoginActivity.this, - R.layout.spinner_item, allProtocols); + Resources res = getResources(); + String[] allProtocols = res.getStringArray(R.array.protocolValues); - adapterProtocols.setDropDownViewResource(R.layout.spinner_dropdown_item); - protocolSpinner.setAdapter(adapterProtocols); + final ArrayAdapter adapterProtocols = new ArrayAdapter(LoginActivity.this, R.layout.spinner_item, allProtocols); - protocolSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { + adapterProtocols.setDropDownViewResource(R.layout.spinner_dropdown_item); + protocolSpinner.setAdapter(adapterProtocols); - public void onItemSelected(AdapterView parent, View view, int pos, long id) { + protocolSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() { - String value = getResources().getStringArray(R.array.protocolValues)[pos]; - if(value.toLowerCase().equals("http")) { - SnackBar.warning(ctx, layoutView,getResources().getString(R.string.protocolError)); - } + public void onItemSelected(AdapterView parent, View view, int pos, long id) { - } + String value = getResources().getStringArray(R.array.protocolValues)[pos]; + if(value.toLowerCase().equals("http")) { + SnackBar.warning(ctx, layoutView, getResources().getString(R.string.protocolError)); + } - public void onNothingSelected(AdapterView parent) { - } + } - }); + public void onNothingSelected(AdapterView parent) { - info_button.setOnClickListener(infoListener); + } - if(tinyDb.getString("loginType").equals("basic")) { // username/password + }); - loginMethod.check(R.id.loginUsernamePassword); + info_button.setOnClickListener(infoListener); - loginUidET.setVisibility(View.VISIBLE); - loginPassword.setVisibility(View.VISIBLE); - otpCode.setVisibility(View.VISIBLE); - otpInfo.setVisibility(View.VISIBLE); - loginTokenCode.setVisibility(View.GONE); + if(tinyDb.getString("loginType").equals("basic")) { // username/password - } - else { + loginMethod.check(R.id.loginUsernamePassword); - loginMethod.check(R.id.loginToken); + loginUidET.setVisibility(View.VISIBLE); + loginPassword.setVisibility(View.VISIBLE); + otpCode.setVisibility(View.VISIBLE); + otpInfo.setVisibility(View.VISIBLE); + loginTokenCode.setVisibility(View.GONE); - loginUidET.setVisibility(View.GONE); - loginPassword.setVisibility(View.GONE); - otpCode.setVisibility(View.GONE); - otpInfo.setVisibility(View.GONE); - loginTokenCode.setVisibility(View.VISIBLE); + } + else { - } + loginMethod.check(R.id.loginToken); - loginMethod.setOnCheckedChangeListener((group, checkedId) -> { + loginUidET.setVisibility(View.GONE); + loginPassword.setVisibility(View.GONE); + otpCode.setVisibility(View.GONE); + otpInfo.setVisibility(View.GONE); + loginTokenCode.setVisibility(View.VISIBLE); - if(checkedId == R.id.loginToken) { + } - loginUidET.setVisibility(View.GONE); - loginPassword.setVisibility(View.GONE); - otpCode.setVisibility(View.GONE); - otpInfo.setVisibility(View.GONE); - loginTokenCode.setVisibility(View.VISIBLE); + loginMethod.setOnCheckedChangeListener((group, checkedId) -> { - } - else { + if(checkedId == R.id.loginToken) { - loginUidET.setVisibility(View.VISIBLE); - loginPassword.setVisibility(View.VISIBLE); - otpCode.setVisibility(View.VISIBLE); - otpInfo.setVisibility(View.VISIBLE); - loginTokenCode.setVisibility(View.GONE); + loginUidET.setVisibility(View.GONE); + loginPassword.setVisibility(View.GONE); + otpCode.setVisibility(View.GONE); + otpInfo.setVisibility(View.GONE); + loginTokenCode.setVisibility(View.VISIBLE); - } + } + else { - }); + loginUidET.setVisibility(View.VISIBLE); + loginPassword.setVisibility(View.VISIBLE); + otpCode.setVisibility(View.VISIBLE); + otpInfo.setVisibility(View.VISIBLE); + loginTokenCode.setVisibility(View.GONE); - networkMonitor.onInternetStateListener(isAvailable -> { + } - if(isAvailable) { - enableProcessButton(); - SnackBar.success(ctx, layoutView, getResources().getString(R.string.netConnectionIsBack)); - } - else { - disableProcessButton(); - SnackBar.error(ctx, layoutView, getResources().getString(R.string.checkNetConnection)); - } + }); - }); + networkMonitor.onInternetStateListener(isAvailable -> { - //login_button.setOnClickListener(this); - if(!tinyDb.getString("instanceUrlRaw").isEmpty()) { - instanceUrlET.setText(tinyDb.getString("instanceUrlRaw")); - } - if(!tinyDb.getString("loginUid").isEmpty()) { - loginUidET.setText(tinyDb.getString("loginUid")); - } + if(isAvailable) { + enableProcessButton(); + SnackBar.success(ctx, layoutView, getResources().getString(R.string.netConnectionIsBack)); + } + else { + disableProcessButton(); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.checkNetConnection)); + } - if(tinyDb.getBoolean("loggedInMode")) { + }); - startActivity(new Intent(LoginActivity.this, MainActivity.class)); - finish(); + //login_button.setOnClickListener(this); + if(!tinyDb.getString("instanceUrlRaw").isEmpty()) { + instanceUrlET.setText(tinyDb.getString("instanceUrlRaw")); + } + if(!tinyDb.getString("loginUid").isEmpty()) { + loginUidET.setText(tinyDb.getString("loginUid")); + } - } + if(tinyDb.getBoolean("loggedInMode")) { - loginButton.setOnClickListener(loginListener); + startActivity(new Intent(LoginActivity.this, MainActivity.class)); + finish(); - if(!tinyDb.getString("uniqueAppId").isEmpty()) { - device_id = tinyDb.getString("uniqueAppId"); - } - else { - device_id = UUID.randomUUID().toString(); - tinyDb.putString("uniqueAppId", device_id); - } + } - } + loginButton.setOnClickListener(loginListener); - @Override - public void onClick(View v) { + if(!tinyDb.getString("uniqueAppId").isEmpty()) { + device_id = tinyDb.getString("uniqueAppId"); + } + else { + device_id = UUID.randomUUID().toString(); + tinyDb.putString("uniqueAppId", device_id); + } - if (v.getId() == R.id.login_button) { - login(); - } + } - } + @Override + public void onClick(View v) { - private View.OnClickListener loginListener = new View.OnClickListener() { - public void onClick(View v) { + if(v.getId() == R.id.login_button) { + login(); + } - disableProcessButton(); - loginButton.setText(R.string.processingText); - login(); + } - } - }; + private View.OnClickListener loginListener = new View.OnClickListener() { - 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(); + public void onClick(View v) { - @SuppressLint("ResourceAsColor") - private void login() { + disableProcessButton(); + loginButton.setText(R.string.processingText); + login(); - TinyDB tinyDb = new TinyDB(appCtx); - AppUtil appUtil = new AppUtil(); - boolean connToInternet = AppUtil.haveNetworkConnection(LoginActivity.this); + } + }; - String instanceUrl = instanceUrlET.getText().toString().trim(); - String loginUid = loginUidET.getText().toString(); - String loginPass = loginPassword.getText().toString(); - String protocol = protocolSpinner.getSelectedItem().toString(); - String loginOTP_ = otpCode.getText().toString().trim(); - int loginMethodType = loginMethod.getCheckedRadioButtonId(); - String loginToken_ = loginTokenCode.getText().toString().trim(); + 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(); - if(loginMethodType == R.id.loginUsernamePassword) { + @SuppressLint("ResourceAsColor") + private void login() { - tinyDb.putString("loginType", "basic"); + TinyDB tinyDb = new TinyDB(appCtx); + AppUtil appUtil = new AppUtil(); + boolean connToInternet = AppUtil.haveNetworkConnection(LoginActivity.this); - if(instanceUrl.contains("@")) { + String instanceUrl = instanceUrlET.getText().toString().trim(); + String loginUid = loginUidET.getText().toString(); + String loginPass = loginPassword.getText().toString(); + String protocol = protocolSpinner.getSelectedItem().toString(); + String loginOTP_ = otpCode.getText().toString().trim(); + int loginMethodType = loginMethod.getCheckedRadioButtonId(); + String loginToken_ = loginTokenCode.getText().toString().trim(); - String[] urlForHttpAuth = instanceUrl.split("@"); + if(loginMethodType == R.id.loginUsernamePassword) { - tinyDb.putString("basicAuthPassword", loginPass); - tinyDb.putBoolean("basicAuthFlag", true); + tinyDb.putString("loginType", "basic"); - instanceUrl = urlForHttpAuth[1]; - loginUid = urlForHttpAuth[0]; + if(instanceUrl.contains("@")) { - } + String[] urlForHttpAuth = instanceUrl.split("@"); - String instanceHost; - if(AppUtil.httpCheck(instanceUrl)) { + tinyDb.putString("basicAuthPassword", loginPass); + tinyDb.putBoolean("basicAuthFlag", true); - URI uri = null; - try { - uri = new URI(instanceUrl); - } catch (URISyntaxException e) { - e.printStackTrace(); - } - assert uri != null; - instanceHost = uri.getHost(); + instanceUrl = urlForHttpAuth[1]; + loginUid = urlForHttpAuth[0]; - } - else { - instanceHost = instanceUrl; - } + } - String instanceUrlWithProtocol; - if(protocol.toLowerCase().equals("https")) { - instanceUrl = "https://" + instanceHost + "/api/v1/"; - instanceUrlWithProtocol = "https://" + instanceHost; - } - else { - instanceUrl = "http://" + instanceHost + "/api/v1/"; - instanceUrlWithProtocol = "http://" + instanceHost; - } + String instanceHost; + if(AppUtil.httpCheck(instanceUrl)) { - tinyDb.putString("instanceUrlRaw", instanceHost); - tinyDb.putString("loginUid", loginUid); - tinyDb.putString("instanceUrl", instanceUrl); - tinyDb.putString("instanceUrlWithProtocol", instanceUrlWithProtocol); + URI uri = null; + try { + uri = new URI(instanceUrl); + } + catch(URISyntaxException e) { + e.printStackTrace(); + } + assert uri != null; + instanceHost = uri.getHost(); - if(connToInternet) { + } + else { + instanceHost = instanceUrl; + } - if(instanceUrlET.getText().toString().equals("")) { + String instanceUrlWithProtocol; + if(protocol.toLowerCase().equals("https")) { + instanceUrl = "https://" + instanceHost + "/api/v1/"; + instanceUrlWithProtocol = "https://" + instanceHost; + } + else { + instanceUrl = "http://" + instanceHost + "/api/v1/"; + instanceUrlWithProtocol = "http://" + instanceHost; + } - SnackBar.warning(ctx, layoutView, getResources().getString(R.string.emptyFieldURL)); - enableProcessButton(); - loginButton.setText(R.string.btnLogin); - return; + tinyDb.putString("instanceUrlRaw", instanceHost); + tinyDb.putString("loginUid", loginUid); + tinyDb.putString("instanceUrl", instanceUrl); + tinyDb.putString("instanceUrlWithProtocol", instanceUrlWithProtocol); - } - if(loginUid.equals("")) { + if(connToInternet) { - SnackBar.warning(ctx, layoutView, getResources().getString(R.string.emptyFieldUsername)); - enableProcessButton(); - loginButton.setText(R.string.btnLogin); - return; + if(instanceUrlET.getText().toString().equals("")) { - } - if(loginPassword.getText().toString().equals("")) { + SnackBar.warning(ctx, layoutView, getResources().getString(R.string.emptyFieldURL)); + enableProcessButton(); + loginButton.setText(R.string.btnLogin); + return; - SnackBar.warning(ctx, layoutView, getResources().getString(R.string.emptyFieldPassword)); - enableProcessButton(); - loginButton.setText(R.string.btnLogin); - return; + } + if(loginUid.equals("")) { - } + SnackBar.warning(ctx, layoutView, getResources().getString(R.string.emptyFieldUsername)); + enableProcessButton(); + loginButton.setText(R.string.btnLogin); + return; - int loginOTP = 0; - if(loginOTP_.length() == 6) { + } + if(loginPassword.getText().toString().equals("")) { - if(appUtil.checkIntegers(loginOTP_)) { + SnackBar.warning(ctx, layoutView, getResources().getString(R.string.emptyFieldPassword)); + enableProcessButton(); + loginButton.setText(R.string.btnLogin); + return; - loginOTP = Integer.parseInt(loginOTP_); - } - else { + } - SnackBar.warning(ctx, layoutView, getResources().getString(R.string.loginOTPTypeError)); - enableProcessButton(); - loginButton.setText(R.string.btnLogin); - return; + int loginOTP = 0; + if(loginOTP_.length() == 6) { - } + if(appUtil.checkIntegers(loginOTP_)) { - } + loginOTP = Integer.parseInt(loginOTP_); + } + else { - versionCheck(instanceUrl, loginUid, loginPass, loginOTP, loginToken_, 1); + SnackBar.warning(ctx, layoutView, getResources().getString(R.string.loginOTPTypeError)); + enableProcessButton(); + loginButton.setText(R.string.btnLogin); + return; - } - else { + } - SnackBar.error(ctx, layoutView, getResources().getString(R.string.checkNetConnection)); + } - } + versionCheck(instanceUrl, loginUid, loginPass, loginOTP, loginToken_, 1); - } - else { + } + else { - tinyDb.putString("loginType", "token"); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.checkNetConnection)); - String instanceHost; - if(AppUtil.httpCheck(instanceUrl)) { + } - URI uri = null; - try { - uri = new URI(instanceUrl); - } catch (URISyntaxException e) { - e.printStackTrace(); - } - assert uri != null; - instanceHost = uri.getHost(); + } + else { - } - else { - instanceHost = instanceUrl; - } - - String instanceUrlWithProtocol; - if(protocol.toLowerCase().equals("https")) { - instanceUrl = "https://" + instanceHost + "/api/v1/"; - instanceUrlWithProtocol = "https://" + instanceHost; - } - else { - instanceUrl = "http://" + instanceHost + "/api/v1/"; - instanceUrlWithProtocol = "http://" + instanceHost; - } + tinyDb.putString("loginType", "token"); - tinyDb.putString("instanceUrlRaw", instanceHost); - tinyDb.putString("instanceUrl", instanceUrl); - tinyDb.putString("instanceUrlWithProtocol", instanceUrlWithProtocol); + String instanceHost; + if(AppUtil.httpCheck(instanceUrl)) { - if(connToInternet) { + URI uri = null; + try { + uri = new URI(instanceUrl); + } + catch(URISyntaxException e) { + e.printStackTrace(); + } + assert uri != null; + instanceHost = uri.getHost(); - if (instanceUrlET.getText().toString().equals("")) { + } + else { + instanceHost = instanceUrl; + } - SnackBar.warning(ctx, layoutView, getResources().getString(R.string.emptyFieldURL)); - enableProcessButton(); - loginButton.setText(R.string.btnLogin); - return; + String instanceUrlWithProtocol; + if(protocol.toLowerCase().equals("https")) { + instanceUrl = "https://" + instanceHost + "/api/v1/"; + instanceUrlWithProtocol = "https://" + instanceHost; + } + else { + instanceUrl = "http://" + instanceHost + "/api/v1/"; + instanceUrlWithProtocol = "http://" + instanceHost; + } - } - if (loginToken_.equals("")) { + tinyDb.putString("instanceUrlRaw", instanceHost); + tinyDb.putString("instanceUrl", instanceUrl); + tinyDb.putString("instanceUrlWithProtocol", instanceUrlWithProtocol); - SnackBar.warning(ctx, layoutView, getResources().getString(R.string.loginTokenError)); - enableProcessButton(); - loginButton.setText(R.string.btnLogin); - return; + if(connToInternet) { - } + if(instanceUrlET.getText().toString().equals("")) { - versionCheck(instanceUrl, loginUid, loginPass, 123, loginToken_, 2); - } - else { + SnackBar.warning(ctx, layoutView, getResources().getString(R.string.emptyFieldURL)); + enableProcessButton(); + loginButton.setText(R.string.btnLogin); + return; - SnackBar.error(ctx, layoutView, getResources().getString(R.string.checkNetConnection)); + } + if(loginToken_.equals("")) { - } + SnackBar.warning(ctx, layoutView, getResources().getString(R.string.loginTokenError)); + enableProcessButton(); + loginButton.setText(R.string.btnLogin); + return; - } + } - } + versionCheck(instanceUrl, loginUid, loginPass, 123, loginToken_, 2); + } + else { - private void versionCheck(final String instanceUrl, final String loginUid, final String loginPass, final int loginOTP, final String loginToken_, final int loginType) { + SnackBar.error(ctx, layoutView, getResources().getString(R.string.checkNetConnection)); - Call callVersion; - if (!loginToken_.isEmpty()) { - callVersion = RetrofitClient - .getInstance(instanceUrl, ctx) - .getApiInterface() - .getGiteaVersionWithToken(loginToken_); - } - else { - final String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8); - if (loginOTP != 0) { - callVersion = RetrofitClient - .getInstance(instanceUrl, ctx) - .getApiInterface() - .getGiteaVersionWithOTP(credential,loginOTP); - } - else { - callVersion = RetrofitClient - .getInstance(instanceUrl, ctx) - .getApiInterface() - .getGiteaVersionWithBasic(credential); - } - } + } - callVersion.enqueue(new Callback() { + } - @Override - public void onResponse(@NonNull final Call callVersion, @NonNull retrofit2.Response responseVersion) { + } - if (responseVersion.code() == 200) { + private void versionCheck(final String instanceUrl, final String loginUid, final String loginPass, final int loginOTP, final String loginToken_, final int loginType) { - GiteaVersion version = responseVersion.body(); - assert version != null; + Call callVersion; + if(!loginToken_.isEmpty()) { + callVersion = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithToken(loginToken_); + } + else { + final String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8); + if(loginOTP != 0) { + callVersion = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithOTP(credential, loginOTP); + } + else { + callVersion = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getGiteaVersionWithBasic(credential); + } + } - VersionCheck vt = VersionCheck.check(getString(R.string.versionLow), getString(R.string.versionHigh), version.getVersion()); + callVersion.enqueue(new Callback() { - switch (vt) { - case UNSUPPORTED_NEW: - //SnackBar.warning(ctx, layoutView, getResources().getString(R.string.versionUnsupportedNew)); - case SUPPORTED_LATEST: - case SUPPORTED_OLD: - case DEVELOPMENT: - login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_); - return; - case UNSUPPORTED_OLD: + @Override + public void onResponse(@NonNull final Call callVersion, @NonNull retrofit2.Response responseVersion) { - AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx); + if(responseVersion.code() == 200) { - 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) -> { + GiteaVersion version = responseVersion.body(); + assert version != null; - dialog.dismiss(); - enableProcessButton(); + // init + Version gitea_version = new Version(getString(R.string.versionLow)); + try { + gitea_version = new Version(version.getVersion()); + } + catch(Error e) { + SnackBar.error(ctx, layoutView, getResources().getString(R.string.versionUnknow)); + enableProcessButton(); + } + //(getString(R.string.versionLow), getString(), version.getVersion()); - }) - .setPositiveButton(getString(R.string.textContinue), (dialog, which) -> { + // UNSUPPORTED_OLD + if(gitea_version.less(getString(R.string.versionLow))) { - dialog.dismiss(); - login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_); + AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(ctx); - }); + 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) -> { - AlertDialog alertDialog = alertDialogBuilder.create(); + dialog.dismiss(); + enableProcessButton(); - alertDialog.show(); - return; - default: // UNKNOWN - SnackBar.error(ctx, layoutView, getResources().getString(R.string.versionUnknow)); - enableProcessButton(); + }).setPositiveButton(getString(R.string.textContinue), (dialog, which) -> { - } + dialog.dismiss(); + login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_); - } - else if (responseVersion.code() == 403) { + }); - login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_); + AlertDialog alertDialog = alertDialogBuilder.create(); - } - } + alertDialog.show(); + return; - private void login(int loginType, String instanceUrl, String loginUid, String loginPass, int loginOTP, String loginToken_) { + } + // SUPPORTED + else if(gitea_version.lessOrEqual(getString(R.string.versionHigh))) { + login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_); + return; + } + // UNSUPPORTED_NEW + else { + SnackBar.info(ctx, layoutView, getResources().getString(R.string.versionUnsupportedNew)); + login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_); + return; + } - if (loginType == 1) { - letTheUserIn(instanceUrl, loginUid, loginPass, loginOTP); - } - else if (loginType == 2) { // token - letTheUserInViaToken(instanceUrl, loginToken_); - } + } + else if(responseVersion.code() == 403) { - } + login(loginType, instanceUrl, loginUid, loginPass, loginOTP, loginToken_); - @Override - public void onFailure(@NonNull Call callVersion, Throwable t) { + } + } - Log.e("onFailure-version", t.toString()); - SnackBar.error(ctx, layoutView, getResources().getString(R.string.errorOnLogin)); - enableProcessButton(); - loginButton.setText(R.string.btnLogin); + 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 + public void onFailure(@NonNull Call callVersion, Throwable t) { - private void letTheUserInViaToken(String instanceUrl, final String loginToken_) { + Log.e("onFailure-version", t.toString()); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.errorOnLogin)); + enableProcessButton(); + loginButton.setText(R.string.btnLogin); - final TinyDB tinyDb = new TinyDB(appCtx); + } - Call call = RetrofitClient - .getInstance(instanceUrl, ctx) - .getApiInterface() - .getUserInfo("token " + loginToken_); + }); - call.enqueue(new Callback() { + } - @Override - public void onResponse(@NonNull Call call, @NonNull retrofit2.Response response) { + private void letTheUserInViaToken(String instanceUrl, final String loginToken_) { - UserInfo userDetails = response.body(); + final TinyDB tinyDb = new TinyDB(appCtx); - if (response.isSuccessful()) { + Call call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserInfo("token " + loginToken_); - if (response.code() == 200) { + call.enqueue(new Callback() { - tinyDb.putBoolean("loggedInMode", true); - assert userDetails != null; - tinyDb.putString(userDetails.getLogin() + "-token", loginToken_); - tinyDb.putString("loginUid", userDetails.getLogin()); - tinyDb.putString("userLogin", userDetails.getUsername()); + @Override + public void onResponse(@NonNull Call call, @NonNull retrofit2.Response response) { - enableProcessButton(); - loginButton.setText(R.string.btnLogin); - startActivity(new Intent(LoginActivity.this, MainActivity.class)); - finish(); + UserInfo userDetails = response.body(); - } + if(response.isSuccessful()) { - } - else if(response.code() == 401) { + if(response.code() == 200) { - SnackBar.error(ctx, layoutView, getResources().getString(R.string.unauthorizedApiError)); - enableProcessButton(); - loginButton.setText(R.string.btnLogin); + tinyDb.putBoolean("loggedInMode", true); + assert userDetails != null; + tinyDb.putString(userDetails.getLogin() + "-token", loginToken_); + tinyDb.putString("loginUid", userDetails.getLogin()); + tinyDb.putString("userLogin", userDetails.getUsername()); - } - else { + enableProcessButton(); + loginButton.setText(R.string.btnLogin); + startActivity(new Intent(LoginActivity.this, MainActivity.class)); + finish(); - SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code()); - enableProcessButton(); - loginButton.setText(R.string.btnLogin); + } - } + } + else if(response.code() == 401) { - } + SnackBar.error(ctx, layoutView, getResources().getString(R.string.unauthorizedApiError)); + enableProcessButton(); + loginButton.setText(R.string.btnLogin); - @Override - public void onFailure(@NonNull Call call, @NonNull Throwable t) { + } + else { - Log.e("onFailure", t.toString()); - SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericError)); - enableProcessButton(); - loginButton.setText(R.string.btnLogin); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code()); + enableProcessButton(); + loginButton.setText(R.string.btnLogin); - } - }); + } - } + } - private void letTheUserIn(final String instanceUrl, final String loginUid, final String loginPass, final int loginOTP) { + @Override + public void onFailure(@NonNull Call call, @NonNull Throwable t) { - final String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8); + Log.e("onFailure", t.toString()); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericError)); + enableProcessButton(); + loginButton.setText(R.string.btnLogin); - Call> call; - if(loginOTP != 0) { + } + }); - call = RetrofitClient - .getInstance(instanceUrl, ctx) - .getApiInterface() - .getUserTokensWithOTP(credential, loginOTP, loginUid); + } - } - else { + private void letTheUserIn(final String instanceUrl, final String loginUid, final String loginPass, final int loginOTP) { - call = RetrofitClient - .getInstance(instanceUrl, ctx) - .getApiInterface() - .getUserTokens(credential, loginUid); + final String credential = Credentials.basic(loginUid, loginPass, StandardCharsets.UTF_8); - } + Call> call; + if(loginOTP != 0) { - call.enqueue(new Callback>() { + call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserTokensWithOTP(credential, loginOTP, loginUid); - @Override - public void onResponse(@NonNull Call> call, @NonNull retrofit2.Response> response) { + } + else { - List userTokens = response.body(); - final TinyDB tinyDb = new TinyDB(appCtx); - final AppUtil appUtil = new AppUtil(); - //Headers responseHeaders = response.headers(); + call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserTokens(credential, loginUid); - if (response.isSuccessful()) { + } - if (response.code() == 200) { + call.enqueue(new Callback>() { - boolean setTokenFlag = false; + @Override + public void onResponse(@NonNull Call> call, @NonNull retrofit2.Response> response) { - assert userTokens != null; - if (userTokens.size() > 0) { + List userTokens = response.body(); + final TinyDB tinyDb = new TinyDB(appCtx); + final AppUtil appUtil = new AppUtil(); + //Headers responseHeaders = response.headers(); - if(userTokens.get(0).getToken_last_eight() != null) { + if(response.isSuccessful()) { - for (int i = 0; i < userTokens.size(); i++) { - if (userTokens.get(i).getToken_last_eight().equals(tinyDb.getString(loginUid + "-token-last-eight"))) { - setTokenFlag = true; - break; - } - //Log.i("Tokens: ", userTokens.get(i).getToken_last_eight()); - } + if(response.code() == 200) { - } - else { + boolean setTokenFlag = false; - for (int i = 0; i < userTokens.size(); i++) { - if (userTokens.get(i).getSha1().equals(tinyDb.getString(loginUid + "-token"))) { - setTokenFlag = true; - break; - } - //Log.i("Tokens: ", userTokens.get(i).getSha1()); - } + assert userTokens != null; + if(userTokens.size() > 0) { - } + if(userTokens.get(0).getToken_last_eight() != null) { - } + for(int i = 0; i < userTokens.size(); i++) { + if(userTokens.get(i).getToken_last_eight().equals(tinyDb.getString(loginUid + "-token-last-eight"))) { + setTokenFlag = true; + break; + } + //Log.i("Tokens: ", userTokens.get(i).getToken_last_eight()); + } - if(tinyDb.getString(loginUid + "-token").isEmpty() || !setTokenFlag) { + } + else { - UserTokens createUserToken = new UserTokens("gitnex-app-" + device_id); + for(int i = 0; i < userTokens.size(); i++) { + if(userTokens.get(i).getSha1().equals(tinyDb.getString(loginUid + "-token"))) { + setTokenFlag = true; + break; + } + //Log.i("Tokens: ", userTokens.get(i).getSha1()); + } - Call callCreateToken; - if(loginOTP != 0) { + } - callCreateToken = RetrofitClient - .getInstance(instanceUrl, ctx) - .getApiInterface() - .createNewTokenWithOTP(credential, loginOTP, loginUid, createUserToken); + } - } - else { + if(tinyDb.getString(loginUid + "-token").isEmpty() || !setTokenFlag) { - callCreateToken = RetrofitClient - .getInstance(instanceUrl, ctx) - .getApiInterface() - .createNewToken(credential, loginUid, createUserToken); + UserTokens createUserToken = new UserTokens("gitnex-app-" + device_id); - } + Call callCreateToken; + if(loginOTP != 0) { - callCreateToken.enqueue(new Callback() { + callCreateToken = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().createNewTokenWithOTP(credential, loginOTP, loginUid, createUserToken); - @Override - public void onResponse(@NonNull Call callCreateToken, @NonNull retrofit2.Response responseCreate) { + } + else { - if(responseCreate.isSuccessful()) { + callCreateToken = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().createNewToken(credential, loginUid, createUserToken); - if(responseCreate.code() == 201) { + } - UserTokens newToken = responseCreate.body(); - assert newToken != null; - //Log.i("Tokens-NEW", "new:" + newToken.getSha1()); + callCreateToken.enqueue(new Callback() { - if (!newToken.getSha1().equals("")) { + @Override + public void onResponse(@NonNull Call callCreateToken, @NonNull retrofit2.Response responseCreate) { - Call call = RetrofitClient - .getInstance(instanceUrl, ctx) - .getApiInterface() - .getUserInfo("token " + newToken.getSha1()); + if(responseCreate.isSuccessful()) { - call.enqueue(new Callback() { + if(responseCreate.code() == 201) { - @Override - public void onResponse(@NonNull Call call, @NonNull retrofit2.Response response) { + UserTokens newToken = responseCreate.body(); + assert newToken != null; + //Log.i("Tokens-NEW", "new:" + newToken.getSha1()); - UserInfo userDetails = response.body(); + if(!newToken.getSha1().equals("")) { - if (response.isSuccessful()) { + Call call = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserInfo("token " + newToken.getSha1()); - if (response.code() == 200) { + call.enqueue(new Callback() { - tinyDb.remove("loginPass"); - tinyDb.putBoolean("loggedInMode", true); - assert userDetails != null; - tinyDb.putString("userLogin", userDetails.getUsername()); - tinyDb.putString(loginUid + "-token", newToken.getSha1()); - tinyDb.putString(loginUid + "-token-last-eight", appUtil.getLastCharactersOfWord(newToken.getSha1(), 8)); + @Override + public void onResponse(@NonNull Call call, @NonNull retrofit2.Response response) { - startActivity(new Intent(LoginActivity.this, MainActivity.class)); - finish(); + UserInfo userDetails = response.body(); - } + if(response.isSuccessful()) { - } - else if(response.code() == 401) { + if(response.code() == 200) { - SnackBar.error(ctx, layoutView, getResources().getString(R.string.unauthorizedApiError)); - enableProcessButton(); - loginButton.setText(R.string.btnLogin); + tinyDb.remove("loginPass"); + tinyDb.putBoolean("loggedInMode", true); + assert userDetails != null; + tinyDb.putString("userLogin", userDetails.getUsername()); + tinyDb.putString(loginUid + "-token", newToken.getSha1()); + tinyDb.putString(loginUid + "-token-last-eight", appUtil.getLastCharactersOfWord(newToken.getSha1(), 8)); - } - else { + startActivity(new Intent(LoginActivity.this, MainActivity.class)); + finish(); - SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code()); - enableProcessButton(); - loginButton.setText(R.string.btnLogin); + } - } + } + else if(response.code() == 401) { - } + SnackBar.error(ctx, layoutView, getResources().getString(R.string.unauthorizedApiError)); + enableProcessButton(); + loginButton.setText(R.string.btnLogin); - @Override - public void onFailure(@NonNull Call call, @NonNull Throwable t) { + } + else { - Log.e("onFailure", t.toString()); - SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericError)); - enableProcessButton(); - loginButton.setText(R.string.btnLogin); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code()); + enableProcessButton(); + loginButton.setText(R.string.btnLogin); - } - }); + } - } + } - } + @Override + public void onFailure(@NonNull Call call, @NonNull Throwable t) { - } - else if(responseCreate.code() == 500) { + Log.e("onFailure", t.toString()); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericError)); + enableProcessButton(); + loginButton.setText(R.string.btnLogin); - SnackBar.error(ctx, layoutView,getResources().getString(R.string.genericApiStatusError) + responseCreate.code()); - enableProcessButton(); - loginButton.setText(R.string.btnLogin); + } + }); - } + } - } + } - @Override - public void onFailure(@NonNull Call createUserToken, @NonNull Throwable t) { + } + else if(responseCreate.code() == 500) { - Log.e("onFailure-token", t.toString()); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + responseCreate.code()); + enableProcessButton(); + loginButton.setText(R.string.btnLogin); - } + } - }); - } - else { + } - String instanceToken = "token " + tinyDb.getString(loginUid + "-token"); + @Override + public void onFailure(@NonNull Call createUserToken, @NonNull Throwable t) { - Call callGetUsername = RetrofitClient - .getInstance(instanceUrl, ctx) - .getApiInterface() - .getUserInfo(instanceToken); + Log.e("onFailure-token", t.toString()); - callGetUsername.enqueue(new Callback() { + } - @Override - public void onResponse(@NonNull Call call, @NonNull retrofit2.Response response) { + }); + } + else { - UserInfo userDetails = response.body(); + String instanceToken = "token " + tinyDb.getString(loginUid + "-token"); - if (response.isSuccessful()) { + Call callGetUsername = RetrofitClient.getInstance(instanceUrl, ctx).getApiInterface().getUserInfo(instanceToken); - if (response.code() == 200) { + callGetUsername.enqueue(new Callback() { - assert userDetails != null; - tinyDb.putString("userLogin", userDetails.getUsername()); + @Override + public void onResponse(@NonNull Call call, @NonNull retrofit2.Response response) { - tinyDb.putBoolean("loggedInMode", true); - startActivity(new Intent(LoginActivity.this, MainActivity.class)); - finish(); + UserInfo userDetails = response.body(); - } + if(response.isSuccessful()) { - } - else if(response.code() == 401) { + if(response.code() == 200) { - SnackBar.error(ctx, layoutView, getResources().getString(R.string.unauthorizedApiError)); - enableProcessButton(); - loginButton.setText(R.string.btnLogin); + assert userDetails != null; + tinyDb.putString("userLogin", userDetails.getUsername()); - } - else { + tinyDb.putBoolean("loggedInMode", true); + startActivity(new Intent(LoginActivity.this, MainActivity.class)); + finish(); - SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code()); - enableProcessButton(); - loginButton.setText(R.string.btnLogin); + } - } + } + else if(response.code() == 401) { - } + SnackBar.error(ctx, layoutView, getResources().getString(R.string.unauthorizedApiError)); + enableProcessButton(); + loginButton.setText(R.string.btnLogin); - @Override - public void onFailure(@NonNull Call call, @NonNull Throwable t) { + } + else { - Log.e("onFailure", t.toString()); - SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericError)); - enableProcessButton(); - loginButton.setText(R.string.btnLogin); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code()); + enableProcessButton(); + loginButton.setText(R.string.btnLogin); - } - }); + } - } + } - } + @Override + public void onFailure(@NonNull Call call, @NonNull Throwable t) { - } - else if(response.code() == 500) { + Log.e("onFailure", t.toString()); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericError)); + enableProcessButton(); + loginButton.setText(R.string.btnLogin); - SnackBar.error(ctx, layoutView,getResources().getString(R.string.genericApiStatusError) + response.code()); - enableProcessButton(); - loginButton.setText(R.string.btnLogin); + } + }); - } - else { + } - SnackBar.error(ctx, layoutView,getResources().getString(R.string.genericApiStatusError) + response.code()); - enableProcessButton(); - loginButton.setText(R.string.btnLogin); + } - } + } + else if(response.code() == 500) { - } + SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code()); + enableProcessButton(); + loginButton.setText(R.string.btnLogin); - @Override - public void onFailure(@NonNull Call> call, @NonNull Throwable t) { + } + else { - Log.e("onFailure-login", t.toString()); - SnackBar.error(ctx, layoutView,getResources().getString(R.string.malformedJson)); - enableProcessButton(); - loginButton.setText(R.string.btnLogin); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.genericApiStatusError) + response.code()); + enableProcessButton(); + loginButton.setText(R.string.btnLogin); - } - }); + } - } + } - private void disableProcessButton() { + @Override + public void onFailure(@NonNull Call> call, @NonNull Throwable t) { - loginButton.setEnabled(false); - GradientDrawable shape = new GradientDrawable(); - shape.setCornerRadius( 8 ); - shape.setColor(getResources().getColor(R.color.hintColor)); - loginButton.setBackground(shape); + Log.e("onFailure-login", t.toString()); + SnackBar.error(ctx, layoutView, getResources().getString(R.string.malformedJson)); + enableProcessButton(); + loginButton.setText(R.string.btnLogin); - } + } + }); - private void enableProcessButton() { + } - loginButton.setEnabled(true); - GradientDrawable shape = new GradientDrawable(); - shape.setCornerRadius( 8 ); - shape.setColor(getResources().getColor(R.color.btnBackground)); - loginButton.setBackground(shape); + private void disableProcessButton() { - } + loginButton.setEnabled(false); + GradientDrawable shape = new GradientDrawable(); + shape.setCornerRadius(8); + shape.setColor(getResources().getColor(R.color.hintColor)); + loginButton.setBackground(shape); + + } + + private void enableProcessButton() { + + loginButton.setEnabled(true); + GradientDrawable shape = new GradientDrawable(); + shape.setCornerRadius(8); + shape.setColor(getResources().getColor(R.color.btnBackground)); + loginButton.setBackground(shape); + + } } diff --git a/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java b/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java index 0505362c..ed8879ec 100644 --- a/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/MergePullRequestActivity.java @@ -23,7 +23,7 @@ import org.mian.gitnex.clients.RetrofitClient; import org.mian.gitnex.helpers.AlertDialogs; import org.mian.gitnex.helpers.Authorization; import org.mian.gitnex.helpers.Toasty; -import org.mian.gitnex.helpers.VersionCheck; +import org.mian.gitnex.helpers.Version; import org.mian.gitnex.models.Collaborators; import org.mian.gitnex.models.MergePullRequest; import org.mian.gitnex.models.MergePullRequestSpinner; @@ -110,7 +110,7 @@ public class MergePullRequestActivity extends BaseActivity { if(!tinyDb.getString("issueTitle").isEmpty()) { toolbar_title.setText(tinyDb.getString("issueTitle")); - mergeTitle.setText(tinyDb.getString("issueTitle") + " (#" + tinyDb.getString("issueNumber")+ ")"); + mergeTitle.setText(tinyDb.getString("issueTitle") + " (#" + tinyDb.getString("issueNumber") + ")"); } initCloseListener(); @@ -140,8 +140,8 @@ public class MergePullRequestActivity extends BaseActivity { mergeList.add(new MergePullRequestSpinner("merge", getResources().getString(R.string.mergeOptionMerge))); mergeList.add(new MergePullRequestSpinner("rebase", getResources().getString(R.string.mergeOptionRebase))); mergeList.add(new MergePullRequestSpinner("rebase-merge", getResources().getString(R.string.mergeOptionRebaseCommit))); - //squash merge works only on gitea v1.11.5 and higher due to a bug - if(VersionCheck.compareVersion("1.11.5", tinyDb.getString("giteaVersion")) < 1) { + //squash merge works only on gitea > v1.11.4 due to a bug + if(new Version(tinyDb.getString("giteaVersion")).higher("1.11.4")) { mergeList.add(new MergePullRequestSpinner("squash", getResources().getString(R.string.mergeOptionSquash))); } diff --git a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java index 8a8b7ddf..9214f721 100644 --- a/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/RepoDetailActivity.java @@ -38,7 +38,7 @@ import org.mian.gitnex.fragments.PullRequestsFragment; import org.mian.gitnex.fragments.ReleasesFragment; import org.mian.gitnex.fragments.RepoInfoFragment; import org.mian.gitnex.helpers.Authorization; -import org.mian.gitnex.helpers.VersionCheck; +import org.mian.gitnex.helpers.Version; import org.mian.gitnex.models.UserRepositories; import org.mian.gitnex.models.WatchRepository; import org.mian.gitnex.util.AppUtil; @@ -222,7 +222,7 @@ public class RepoDetailActivity extends BaseActivity implements BottomSheetRepoF } // release count - if(VersionCheck.compareVersion("1.11.5", tinyDb.getString("giteaVersion")) < 1) { + if(new Version("1.11.4").less(tinyDb.getString("giteaVersion"))) { if(textViewBadgeRelease.getText() != "") { // only show if API returned a number Objects.requireNonNull(tabLayout.getTabAt(5)).setCustomView(tabHeader6); TabLayout.Tab tabOpenRelease = tabLayout.getTabAt(5); diff --git a/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java b/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java index 22586172..2cfbee83 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/IssuesFragment.java @@ -26,7 +26,7 @@ import org.mian.gitnex.clients.AppApiService; import org.mian.gitnex.helpers.Authorization; import org.mian.gitnex.helpers.StaticGlobalVariables; import org.mian.gitnex.helpers.Toasty; -import org.mian.gitnex.helpers.VersionCheck; +import org.mian.gitnex.helpers.Version; import org.mian.gitnex.interfaces.ApiInterface; import org.mian.gitnex.models.Issues; import org.mian.gitnex.util.TinyDB; @@ -76,7 +76,7 @@ public class IssuesFragment extends Fragment { final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh); // if gitea is 1.12 or higher use the new limit - if(VersionCheck.compareVersion("1.12.0", tinyDb.getString("giteaVersion")) >= 1) { + if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) { resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances; } diff --git a/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java b/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java index 13479762..6a5a9bd6 100644 --- a/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java +++ b/app/src/main/java/org/mian/gitnex/fragments/PullRequestsFragment.java @@ -27,7 +27,7 @@ import org.mian.gitnex.clients.AppApiService; import org.mian.gitnex.helpers.Authorization; import org.mian.gitnex.helpers.StaticGlobalVariables; import org.mian.gitnex.helpers.Toasty; -import org.mian.gitnex.helpers.VersionCheck; +import org.mian.gitnex.helpers.Version; import org.mian.gitnex.interfaces.ApiInterface; import org.mian.gitnex.models.PullRequests; import org.mian.gitnex.util.TinyDB; @@ -76,7 +76,7 @@ public class PullRequestsFragment extends Fragment { final SwipeRefreshLayout swipeRefresh = v.findViewById(R.id.pullToRefresh); // if gitea is 1.12 or higher use the new limit - if(VersionCheck.compareVersion("1.12.0", tinyDb.getString("giteaVersion")) >= 1) { + if(new Version(tinyDb.getString("giteaVersion")).higherOrEqual("1.12.0")) { resultLimit = StaticGlobalVariables.resultLimitNewGiteaInstances; } diff --git a/app/src/main/java/org/mian/gitnex/helpers/Version.java b/app/src/main/java/org/mian/gitnex/helpers/Version.java new file mode 100644 index 00000000..c2d53f12 --- /dev/null +++ b/app/src/main/java/org/mian/gitnex/helpers/Version.java @@ -0,0 +1,222 @@ +package org.mian.gitnex.helpers; + +import org.jetbrains.annotations.NotNull; +import java.util.ArrayList; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Author 6543 + */ + +public class Version { + + // the raw String + private String raw; + // the version numbers in its order (dot separated) + private List values; + + public Version(String value) { + + raw = value; + this.init(); + + } + + /** + * init parse and store values for other functions of an Version instance + * it use the raw variable as base + * + * @return if parse was successfully + */ + private void init() { + + final Pattern pattern_valid = Pattern.compile("^[v,V]?(\\d+)+(\\.(\\d+))*([_,\\-,+][\\w,\\d,_,\\-,+]*)?$"); + final Pattern pattern_number_dot_number = Pattern.compile("^\\d+(\\.(\\d)+)*"); + + if(!pattern_valid.matcher(raw).find()) { + throw new IllegalArgumentException("Invalid version format"); + } + + if(raw.charAt(0) == 'v' || raw.charAt(0) == 'V') { + raw = raw.substring(1); + } + + values = new ArrayList(); + Matcher match = pattern_number_dot_number.matcher(raw); + match.find(); + for(String i : match.group().split("\\.")) { + values.add(Integer.parseInt(i)); + } + + } + + /** + * equal return true if version is the same + * + * @param value + * @return true/false + */ + public boolean equal(String value) { + + return this.equal(new Version(value)); + + } + + /** + * equal return true if version is the same + * + * @param v + * @return + */ + public boolean equal(@NotNull Version v) { + + int rounds = Math.min(this.values.size(), v.values.size()); + for(int i = 0; i < rounds; i++) { + if(this.values.get(i) != v.values.get(i)) { + return false; + } + } + return true; + + } + + + /** + * less return true if version is less + * + * @param value + * @return true/false + */ + public boolean less(String value) { + + return this.less(new Version(value)); + + } + + /** + * less return true if version is less + * + * @param v + * @return + */ + public boolean less(@NotNull Version v) { + + int rounds = Math.min(this.values.size(), v.values.size()); + for(int i = 0; i < rounds; i++) { + if(i + 1 == rounds) { + if(this.values.get(i) >= v.values.get(i)) { + return false; + } + } + else { + if(this.values.get(i) > v.values.get(i)) { + return false; + } + } + } + return true; + + } + + + /** + * higher return true if version is higher + * + * @param value + * @return true/false + */ + public boolean higher(String value) { + + return this.higher(new Version(value)); + + } + + /** + * higher return true if version is higher + * + * @param v + * @return + */ + public boolean higher(@NotNull Version v) { + + int rounds = Math.min(this.values.size(), v.values.size()); + for(int i = 0; i < rounds; i++) { + if(i + 1 == rounds) { + if(this.values.get(i) <= v.values.get(i)) { + return false; + } + } + else { + if(this.values.get(i) < v.values.get(i)) { + return false; + } + } + } + return true; + + } + + /** + * lessOrEqual return true if version is less or equal + * + * @param value + * @return true/false + */ + public boolean lessOrEqual(String value) { + + return this.lessOrEqual(new Version(value)); + + } + + /** + * lessOrEqual return true if version is less or equal + * + * @param v + * @return + */ + public boolean lessOrEqual(@NotNull Version v) { + + int rounds = Math.min(this.values.size(), v.values.size()); + for(int i = 0; i < rounds; i++) { + if(this.values.get(i) > v.values.get(i)) { + return false; + } + } + return true; + + } + + + /** + * higherOrEqual return true if version is higher or equal + * + * @param value + * @return true/false + */ + public boolean higherOrEqual(String value) { + + return this.higherOrEqual(new Version(value)); + + } + + /** + * higherOrEqual return true if version is higher or equal + * + * @param v + * @return + */ + public boolean higherOrEqual(@NotNull Version v) { + + int rounds = Math.min(this.values.size(), v.values.size()); + for(int i = 0; i < rounds; i++) { + if(this.values.get(i) < v.values.get(i)) { + return false; + } + } + return true; + + } + +} \ No newline at end of file diff --git a/app/src/main/java/org/mian/gitnex/helpers/VersionCheck.java b/app/src/main/java/org/mian/gitnex/helpers/VersionCheck.java deleted file mode 100644 index ae69c1e4..00000000 --- a/app/src/main/java/org/mian/gitnex/helpers/VersionCheck.java +++ /dev/null @@ -1,151 +0,0 @@ -package org.mian.gitnex.helpers; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -/** - * Author 6543 - */ - -public enum VersionCheck { - - UNKNOWN, - SUPPORTED_LATEST, - SUPPORTED_OLD, - DEVELOPMENT, - UNSUPPORTED_OLD, - UNSUPPORTED_NEW; - - public static VersionCheck check(String min, String last, String value) { - - final Pattern pattern_stable_release = Pattern.compile("^(\\d)\\.(\\d+)\\.(\\d+)$"); - final Pattern pattern_dev_release = Pattern.compile("^(\\d).(\\d+).(\\d+)(\\D)(.+)"); - Matcher match; - - if (!pattern_stable_release.matcher(min).find() || !pattern_stable_release.matcher(last).find()) { - throw new IllegalArgumentException("VersionCheck: wrong format for min or last version given"); - } - - match = pattern_stable_release.matcher(value); - if (match.find()) { - - switch (correlate(min, last, match.group())){ - case 0: - return UNSUPPORTED_OLD; - case 1: - return SUPPORTED_OLD; - case 2: - return SUPPORTED_LATEST; - default: - return UNSUPPORTED_NEW; - } - - } - - match = pattern_dev_release.matcher(value); - if (match.find()) { - - match = Pattern.compile("^(\\d)\\.(\\d+)\\.(\\d+)").matcher(value); - match.find(); - - if (correlate(min, last, match.group())>0) { - return DEVELOPMENT; - } - else { - return UNSUPPORTED_OLD; - } - - } - - return UNKNOWN; - - } - - //helper - // 0 to less - // 1 in range - // 2 at the top - // 3 above - private static int correlate(String min, String last, String value){ - int min_check = compareVersion(value,min); - int max_check = compareVersion(value,last); - int range_check = compareVersion(min,last); - - switch (range_check) { - case 2: - throw new IllegalArgumentException("Minimum Version higher than Last Version"); - case 1: //min == last - switch (min_check) { - case 0: - return 0; - case 1: - return 2; - default: - return 3; - } - default: - if (max_check >1) return 3; - if (max_check == 1) return 2; - if (min_check < 1) return 0; - return 1; - } - - } - - /** - * @description compare doted formatted Versions - * @param A doted formatted Versions - * @param B doted formatted Versions - * @return 0|1|2 - * 0 = less - * 1 = same - * 2 = more - */ - public static int compareVersion(String A, String B) { - final Pattern pattern_stable_release = Pattern.compile("^(\\d)\\.(\\d+)\\.(\\d+)"); - final Pattern pattern_dev_release = Pattern.compile("^(\\d).(\\d+).(\\d+)(\\D)(.+)"); - Matcher match; - match = pattern_dev_release.matcher(A); - if (match.find()) { - match = pattern_stable_release.matcher(A); - match.find(); - A = match.group(); - } - match = pattern_dev_release.matcher(B); - if (match.find()) { - match = pattern_stable_release.matcher(B); - match.find(); - B = match.group(); - } - - //throw new IllegalArgumentException - if((!A.matches("[0-9]+(\\.[0-9]+)*")) || (!B.matches("[0-9]+(\\.[0-9]+)*"))) throw new IllegalArgumentException("Invalid version format"); - - if (A.contains(".") || B.contains(".")) { - // example 2 vs 1.3 - if (!(A.contains(".") && B.contains("."))) { - if (A.contains(".")) { - return compareVersion(A,B + ".0"); - } - if (B.contains(".")) { - return compareVersion(A + ".0",B); - } - } - - //normal compare - int a = Integer.parseInt(A.substring(0,A.indexOf("."))); - int b = Integer.parseInt(B.substring(0,B.indexOf("."))); - if (a < b) return 0; - if (a == b) return compareVersion(A.substring(A.indexOf(".")+1),B.substring(B.indexOf(".")+1)); - return 2; //if (a > b) - } - else { - int a = Integer.parseInt(A); - int b = Integer.parseInt(B); - if (a < b) return 0; - if (a == b) return 1; - return 2; //if (a > b) - } - } - -} \ No newline at end of file diff --git a/app/src/main/res/values/gitea_version.xml b/app/src/main/res/values/gitea_version.xml index 72939a96..adf04723 100644 --- a/app/src/main/res/values/gitea_version.xml +++ b/app/src/main/res/values/gitea_version.xml @@ -1,7 +1,7 @@ - 1.10.0 - 1.11.15 + 1.10 + 1.12 \ No newline at end of file diff --git a/app/src/test/java/org/mian/gitnex/helpers/VersionTest.java b/app/src/test/java/org/mian/gitnex/helpers/VersionTest.java new file mode 100644 index 00000000..ce1b0511 --- /dev/null +++ b/app/src/test/java/org/mian/gitnex/helpers/VersionTest.java @@ -0,0 +1,115 @@ +package org.mian.gitnex.helpers; + +/** + * Author 6543 + */ + +import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +public class VersionTest { + + @Test + public void equal() { + + assertTrue(new Version("1.12.0").equal("1.12.0")); + assertTrue(new Version("1.12.0").equal(new Version("1.12.0"))); + assertTrue(new Version("1.12.0").equal("1.12")); + assertTrue(new Version("1.12.0").equal("1.12.0+dev-211-g316db0fe7")); + assertTrue(new Version("1.12.0").equal("v1.12")); + assertTrue(new Version("v1.12.0").equal("1.12.0")); + assertTrue(new Version("0").equal("0")); + + assertFalse(new Version("1.12.1").equal("1.12.0+dev-211-g316db0fe7")); + assertFalse(new Version("v1.12.0").equal("1.10.0")); + assertFalse(new Version("2.12.0").equal("v1.12")); + assertFalse(new Version("1.12").equal("2")); + assertFalse(new Version("2").equal("1")); + assertFalse(new Version("1.2").equal("2.1")); + assertFalse(new Version("2.2").equal("2.1.120")); + + } + + @Test + public void less() { + + assertTrue(new Version("1.11.0").less("1.12")); + assertTrue(new Version("v1.11").less("1.12.0+dev-211-g316db0fe7")); + assertTrue(new Version("1.12.0").less("v2")); + assertTrue(new Version("v1.12.0").less("1.12.1-wowowow")); + assertTrue(new Version("1.2.3").less("1.2.4")); + + assertFalse(new Version("1").less("1.1.10")); + assertFalse(new Version("1.12.1").less("1.12.0+dev-211-g316db0fe7")); + assertFalse(new Version("1.12.0").less("1.12.0")); + assertFalse(new Version("v1.12.0").less("1.10.0")); + assertFalse(new Version("2.12.0").less("v1.12")); + assertFalse(new Version("2").less("1")); + assertFalse(new Version("1.2").less("2.1")); + assertFalse(new Version("2.2").less("2.1.120")); + + } + + @Test + public void lessOrEqual() { + + assertTrue(new Version("1.11.0").lessOrEqual("1.12")); + assertTrue(new Version("v1.11").lessOrEqual("1.12.0+dev-211-g316db0fe7")); + assertTrue(new Version("1.12.0").lessOrEqual("v2")); + assertTrue(new Version("v1.12.0").lessOrEqual("1.12.1-wowowow")); + assertTrue(new Version("1.2.3").lessOrEqual("1.2.4")); + assertTrue(new Version("1").lessOrEqual("1.1.10")); + assertTrue(new Version("1.12.0").lessOrEqual("1.12.0")); + + assertFalse(new Version("1.12.1").lessOrEqual("1.12.0+dev-211-g316db0fe7")); + assertFalse(new Version("v1.12.0").lessOrEqual("1.10.0")); + assertFalse(new Version("2.12.0").lessOrEqual("v1.12")); + assertFalse(new Version("2").lessOrEqual("1")); + assertFalse(new Version("1.2").lessOrEqual("2.1")); + assertFalse(new Version("2.2").lessOrEqual("2.1.120")); + + } + + + @Test + public void higher() { + + assertTrue(new Version("1.12").higher("1.11.0")); + assertTrue(new Version("1.12.0+dev-211-g316db0fe7").higher("v1.11")); + assertTrue(new Version("v2").higher("1.12.0")); + assertTrue(new Version("1.12.1-wowowow").higher("v1.12.0")); + assertTrue(new Version("1.2.4").higher("1.2.3")); + + assertFalse(new Version("1").higher("1.1.10")); + assertFalse(new Version("1.12.0+dev-211-g316db0fe7").higher("1.12.1")); + assertFalse(new Version("1.12.0").higher("1.12.0")); + assertFalse(new Version("1.10.0").higher("v1.12.0")); + assertFalse(new Version("v1.12").higher("2.12.0")); + assertFalse(new Version("1").higher("2")); + assertFalse(new Version("2.1").higher("1.2")); + assertFalse(new Version("2.1.120").higher("2.2")); + + } + + @Test + public void higherOrEqual() { + + assertTrue(new Version("1.12").higherOrEqual("1.11.0")); + assertTrue(new Version("1.12.0+dev-211-g316db0fe7").higherOrEqual("v1.11")); + assertTrue(new Version("v2").higherOrEqual("1.12.0")); + assertTrue(new Version("1.12.1-wowowow").higherOrEqual("v1.12.0")); + assertTrue(new Version("1.2.4").higherOrEqual("1.2.3")); + assertTrue(new Version("1").higherOrEqual("1.1.10")); + assertTrue(new Version("1.12.0").higherOrEqual("1.12.0")); + + assertFalse(new Version("1.12.0+dev-211-g316db0fe7").higherOrEqual("1.12.1")); + assertFalse(new Version("1.10.0").higherOrEqual("v1.12.0")); + assertFalse(new Version("v1.12").higherOrEqual("2.12.0")); + assertFalse(new Version("1").higherOrEqual("2")); + assertFalse(new Version("2.1").higherOrEqual("1.2")); + assertFalse(new Version("2.1.120").higherOrEqual("2.2")); + + } + +}