From 2fccdf3d34d96723a812d5b45b2008510f4b9368 Mon Sep 17 00:00:00 2001 From: str4d Date: Sat, 1 Mar 2014 02:25:09 +0000 Subject: [PATCH] Remove unneeded GSE catching --- src/i2p/bote/EmailListFragment.java | 10 ---------- src/i2p/bote/FolderListAdapter.java | 4 ---- src/i2p/bote/util/BoteHelper.java | 3 +-- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/i2p/bote/EmailListFragment.java b/src/i2p/bote/EmailListFragment.java index c24987bd..5e8aa7a9 100644 --- a/src/i2p/bote/EmailListFragment.java +++ b/src/i2p/bote/EmailListFragment.java @@ -1,6 +1,5 @@ package i2p.bote; -import java.security.GeneralSecurityException; import java.util.List; import i2p.bote.email.Email; @@ -79,9 +78,6 @@ public class EmailListFragment extends ListFragment implements } catch (PasswordException e) { // TODO: Get password from user and retry getActivity().setTitle("ERROR: " + e.getMessage()); - } catch (GeneralSecurityException e) { - // TODO: Handle properly - getActivity().setTitle("ERROR: " + e.getMessage()); } getLoaderManager().initLoader(EMAIL_LIST_LOADER, null, this); } @@ -153,9 +149,6 @@ public class EmailListFragment extends ListFragment implements } catch (PasswordException e) { // TODO: Get password from user and retry getActivity().setTitle("ERROR: " + e.getMessage()); - } catch (GeneralSecurityException e) { - // TODO: Handle properly - getActivity().setTitle("ERROR: " + e.getMessage()); } if (isResumed()) { @@ -173,9 +166,6 @@ public class EmailListFragment extends ListFragment implements } catch (PasswordException e) { // TODO: Get password from user and retry getActivity().setTitle("ERROR: " + e.getMessage()); - } catch (GeneralSecurityException e) { - // TODO: Handle properly - getActivity().setTitle("ERROR: " + e.getMessage()); } } } diff --git a/src/i2p/bote/FolderListAdapter.java b/src/i2p/bote/FolderListAdapter.java index 528fb1ff..ee2b66e7 100644 --- a/src/i2p/bote/FolderListAdapter.java +++ b/src/i2p/bote/FolderListAdapter.java @@ -1,6 +1,5 @@ package i2p.bote; -import java.security.GeneralSecurityException; import java.util.List; import i2p.bote.fileencryption.PasswordException; @@ -42,9 +41,6 @@ public class FolderListAdapter extends ArrayAdapter { } catch (PasswordException e) { // TODO: Get password from user and retry name.setText("ERROR: " + e.getMessage()); - } catch (GeneralSecurityException e) { - // TODO: Handle properly - name.setText("ERROR: " + e.getMessage()); } return v; diff --git a/src/i2p/bote/util/BoteHelper.java b/src/i2p/bote/util/BoteHelper.java index 25cba140..8eec0eb5 100644 --- a/src/i2p/bote/util/BoteHelper.java +++ b/src/i2p/bote/util/BoteHelper.java @@ -21,9 +21,8 @@ public class BoteHelper extends GeneralHelper { * @param showNew Should the name contain the number of new messages? * @return The name of the folder. * @throws PasswordException - * @throws GeneralSecurityException */ - public static String getFolderDisplayName(Context ctx, EmailFolder folder, boolean showNew) throws PasswordException, GeneralSecurityException { + public static String getFolderDisplayName(Context ctx, EmailFolder folder, boolean showNew) throws PasswordException { String displayName = ""; String name = folder.getName();