From 59e8f6f94a9206315f158baf7ca6a1eb42fbc5a6 Mon Sep 17 00:00:00 2001 From: anonTree1417 Date: Thu, 2 Apr 2020 19:11:23 +0200 Subject: [PATCH] Fixing popup bug. --- .../main/java/org/mian/gitnex/activities/LoginActivity.java | 2 +- .../org/mian/gitnex/helpers/ssl/MemorizingTrustManager.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) 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 c900602b..5f640399 100644 --- a/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java +++ b/app/src/main/java/org/mian/gitnex/activities/LoginActivity.java @@ -467,7 +467,7 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener Toasty.info(getApplicationContext(), getResources().getString(R.string.malformedUrl)); } else { - Toasty.info(getApplicationContext(), getResources().getString(R.string.commentError)); + Toasty.info(getApplicationContext(), getResources().getString(R.string.genericError)); } enableProcessButton(); diff --git a/app/src/main/java/org/mian/gitnex/helpers/ssl/MemorizingTrustManager.java b/app/src/main/java/org/mian/gitnex/helpers/ssl/MemorizingTrustManager.java index d79f1d6c..3ee8b045 100644 --- a/app/src/main/java/org/mian/gitnex/helpers/ssl/MemorizingTrustManager.java +++ b/app/src/main/java/org/mian/gitnex/helpers/ssl/MemorizingTrustManager.java @@ -598,15 +598,16 @@ public class MemorizingTrustManager implements X509TrustManager { 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 + } else { + throw (cause); } - - throw (cause); } private boolean interactHostname(X509Certificate cert, String hostname) { if(interact(hostNameMessage(cert, hostname), R.string.mtm_accept_servername) == MTMDecision.DECISION_ALWAYS) { storeCert(hostname, cert); + return true; } return false;