From e13a6d9d2c63c64a82f5233891da60dc92f7e481 Mon Sep 17 00:00:00 2001 From: Floens Date: Thu, 23 Oct 2014 15:19:00 +0200 Subject: [PATCH] Add ssl error message --- .../org/floens/chan/ui/fragment/ThreadFragment.java | 12 ++++++++---- Clover/app/src/main/res/values/strings.xml | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Clover/app/src/main/java/org/floens/chan/ui/fragment/ThreadFragment.java b/Clover/app/src/main/java/org/floens/chan/ui/fragment/ThreadFragment.java index dce40b94..ce0af5e0 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/fragment/ThreadFragment.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/fragment/ThreadFragment.java @@ -59,6 +59,8 @@ import org.floens.chan.utils.Utils; import java.util.List; +import javax.net.ssl.SSLException; + public class ThreadFragment extends Fragment implements ThreadManager.ThreadManagerListener, PostAdapter.PostAdapterListener { private BaseActivity baseActivity; private ThreadManager threadManager; @@ -416,12 +418,14 @@ public class ThreadFragment extends Fragment implements ThreadManager.ThreadMana private String getLoadErrorText(VolleyError error) { String errorMessage; - if ((error instanceof NoConnectionError) || (error instanceof NetworkError)) { - errorMessage = getActivity().getString(R.string.thread_load_failed_network); + if (error.getCause() instanceof SSLException) { + errorMessage = getString(R.string.thread_load_failed_ssl); + } else if ((error instanceof NoConnectionError) || (error instanceof NetworkError)) { + errorMessage = getString(R.string.thread_load_failed_network); } else if (error instanceof ServerError) { - errorMessage = getActivity().getString(R.string.thread_load_failed_server); + errorMessage = getString(R.string.thread_load_failed_server); } else { - errorMessage = getActivity().getString(R.string.thread_load_failed_parsing); + errorMessage = getString(R.string.thread_load_failed_parsing); } return errorMessage; diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml index 3856aef3..f49c4344 100644 --- a/Clover/app/src/main/res/values/strings.xml +++ b/Clover/app/src/main/res/values/strings.xml @@ -66,6 +66,7 @@ along with this program. If not, see . Failed to open file + HTTPS error No network Server inaccessible 404 not found