OrgGitea
/
GitNex
mirror of https://codeberg.org/gitnex/GitNex.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixing popup bug.

This commit is contained in:
anonTree1417 2020-04-02 19:11:23 +02:00
parent ae0009f553
commit 59e8f6f94a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -467,7 +467,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
Toasty.info(getApplicationContext(), getResources().getString(R.string.malformedUrl)); Toasty.info(getApplicationContext(), getResources().getString(R.string.malformedUrl));
} }
else { else {
Toasty.info(getApplicationContext(), getResources().getString(R.string.commentError)); Toasty.info(getApplicationContext(), getResources().getString(R.string.genericError));
} }
enableProcessButton(); enableProcessButton();

5
app/src/main/java/org/mian/gitnex/helpers/ssl/MemorizingTrustManager.java
View File

@ -598,15 +598,16 @@ public class MemorizingTrustManager implements X509TrustManager {
if(interact(certChainMessage(chain, cause), R.string.mtm_accept_cert) == MTMDecision.DECISION_ALWAYS) { if(interact(certChainMessage(chain, cause), R.string.mtm_accept_cert) == MTMDecision.DECISION_ALWAYS) {
storeCert(chain[0]); // only store the server cert, not the whole chain storeCert(chain[0]); // only store the server cert, not the whole chain
} else {
throw (cause);
} }
throw (cause);
} }
private boolean interactHostname(X509Certificate cert, String hostname) { private boolean interactHostname(X509Certificate cert, String hostname) {
if(interact(hostNameMessage(cert, hostname), R.string.mtm_accept_servername) == MTMDecision.DECISION_ALWAYS) { if(interact(hostNameMessage(cert, hostname), R.string.mtm_accept_servername) == MTMDecision.DECISION_ALWAYS) {
storeCert(hostname, cert); storeCert(hostname, cert);
return true;
} }
return false; return false;