From fd5a4e7cf35c474037e706aea947229b364d3cf0 Mon Sep 17 00:00:00 2001 From: Florens Douwes Date: Tue, 3 Jun 2014 12:48:31 +0200 Subject: [PATCH] Java 1.7 updates --- .../floens/chan/core/loader/LoaderPool.java | 2 +- .../chan/core/manager/BoardManager.java | 8 +- .../chan/core/manager/PinnedManager.java | 4 +- .../chan/core/manager/ThreadManager.java | 8 +- .../java/org/floens/chan/core/model/Post.java | 6 +- .../floens/chan/core/net/BoardsRequest.java | 35 ++-- .../chan/core/net/ChanReaderRequest.java | 154 +++++++++--------- .../floens/chan/core/watch/PinWatcher.java | 2 +- .../floens/chan/core/watch/WatchNotifier.java | 6 +- .../ui/SwipeDismissListViewTouchListener.java | 2 +- .../chan/ui/activity/BoardActivity.java | 2 +- .../floens/chan/ui/activity/BoardEditor.java | 6 +- .../chan/ui/activity/ImageViewActivity.java | 4 +- .../chan/ui/adapter/ImageViewAdapter.java | 2 +- .../floens/chan/ui/adapter/PinnedAdapter.java | 2 +- .../floens/chan/ui/adapter/PostAdapter.java | 2 +- .../chan/ui/fragment/ImageViewFragment.java | 36 ++-- .../org/floens/chan/utils/ImageDecoder.java | 4 +- .../org/floens/chan/utils/ThemeHelper.java | 16 +- 19 files changed, 157 insertions(+), 144 deletions(-) diff --git a/Clover/app/src/main/java/org/floens/chan/core/loader/LoaderPool.java b/Clover/app/src/main/java/org/floens/chan/core/loader/LoaderPool.java index b580c12c..84e576de 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/loader/LoaderPool.java +++ b/Clover/app/src/main/java/org/floens/chan/core/loader/LoaderPool.java @@ -27,7 +27,7 @@ public class LoaderPool { private static LoaderPool instance; - private static Map loaders = new HashMap(); + private static Map loaders = new HashMap<>(); public static LoaderPool getInstance() { if (instance == null) { diff --git a/Clover/app/src/main/java/org/floens/chan/core/manager/BoardManager.java b/Clover/app/src/main/java/org/floens/chan/core/manager/BoardManager.java index 4624bba9..3ab8b709 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/manager/BoardManager.java +++ b/Clover/app/src/main/java/org/floens/chan/core/manager/BoardManager.java @@ -42,8 +42,8 @@ public class BoardManager { private List allBoards; - private final List savedKeys = new ArrayList(); - private final List savedValues = new ArrayList(); + private final List savedKeys = new ArrayList<>(); + private final List savedValues = new ArrayList<>(); public BoardManager() { loadBoards(); @@ -55,7 +55,7 @@ public class BoardManager { } public List getSavedBoards() { - List saved = new ArrayList(allBoards.size()); + List saved = new ArrayList<>(allBoards.size()); for (Board b : allBoards) { if (b.saved) @@ -178,7 +178,7 @@ public class BoardManager { } private List getDefaultBoards() { - List list = new ArrayList(); + List list = new ArrayList<>(); list.add(new Board("Technology", "g", true, true)); list.add(new Board("Video Games", "v", true, true)); list.add(new Board("Anime & Manga", "a", true, true)); diff --git a/Clover/app/src/main/java/org/floens/chan/core/manager/PinnedManager.java b/Clover/app/src/main/java/org/floens/chan/core/manager/PinnedManager.java index 132dea10..e5a5f7ef 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/manager/PinnedManager.java +++ b/Clover/app/src/main/java/org/floens/chan/core/manager/PinnedManager.java @@ -27,7 +27,7 @@ import java.util.ArrayList; import java.util.List; public class PinnedManager { - private final List listeners = new ArrayList(); + private final List listeners = new ArrayList<>(); private final List pins; public PinnedManager(Context context) { @@ -65,7 +65,7 @@ public class PinnedManager { } public List getWatchingPins() { - List l = new ArrayList(); + List l = new ArrayList<>(); for (Pin p : pins) { if (p.watching) diff --git a/Clover/app/src/main/java/org/floens/chan/core/manager/ThreadManager.java b/Clover/app/src/main/java/org/floens/chan/core/manager/ThreadManager.java index c009f2f9..a56fd9f9 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/manager/ThreadManager.java +++ b/Clover/app/src/main/java/org/floens/chan/core/manager/ThreadManager.java @@ -65,7 +65,7 @@ public class ThreadManager implements Loader.LoaderListener { private final Activity activity; private final ThreadManager.ThreadManagerListener threadManagerListener; - private final List> popupQueue = new ArrayList>(); + private final List> popupQueue = new ArrayList<>(); private PostRepliesFragment currentPopupFragment; private int highlightedPost = -1; private int lastSeenPost = -1; @@ -214,7 +214,7 @@ public class ThreadManager implements Loader.LoaderListener { public void onPostLongClicked(final Post post) { AlertDialog.Builder builder = new AlertDialog.Builder(activity); - List options = new ArrayList(Arrays.asList(activity.getResources().getStringArray(R.array.post_options))); + List options = new ArrayList<>(Arrays.asList(activity.getResources().getStringArray(R.array.post_options))); // Only add the delete option when the post is a saved reply boolean delete = false, saved = false; if (ChanApplication.getDatabaseManager().isSavedReply(post.board, post.no)) { @@ -380,7 +380,7 @@ public class ThreadManager implements Loader.LoaderListener { } public void showPostReplies(Post post) { - List p = new ArrayList(); + List p = new ArrayList<>(); for (int no : post.repliesFrom) { Post r = findPostById(no); if (r != null) { @@ -444,7 +444,7 @@ public class ThreadManager implements Loader.LoaderListener { post = findPostById(id); if (post != null) { - List l = new ArrayList(); + List l = new ArrayList<>(); l.add(post); showPostsRepliesFragment(l); } diff --git a/Clover/app/src/main/java/org/floens/chan/core/model/Post.java b/Clover/app/src/main/java/org/floens/chan/core/model/Post.java index 79809865..c707c4c0 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/model/Post.java +++ b/Clover/app/src/main/java/org/floens/chan/core/model/Post.java @@ -73,14 +73,14 @@ public class Post { /** * This post replies to the these ids */ - public List repliesTo = new ArrayList(); + public List repliesTo = new ArrayList<>(); /** * These ids replied to this post */ - public List repliesFrom = new ArrayList(); + public List repliesFrom = new ArrayList<>(); - public final ArrayList linkables = new ArrayList(); + public final ArrayList linkables = new ArrayList<>(); public boolean parsedSpans = false; public SpannableString subjectSpan; diff --git a/Clover/app/src/main/java/org/floens/chan/core/net/BoardsRequest.java b/Clover/app/src/main/java/org/floens/chan/core/net/BoardsRequest.java index db910057..4ee2bfa8 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/net/BoardsRequest.java +++ b/Clover/app/src/main/java/org/floens/chan/core/net/BoardsRequest.java @@ -39,7 +39,7 @@ public class BoardsRequest extends JsonReaderRequest> { } private List parseJson(JsonReader reader) { - List list = new ArrayList(); + List list = new ArrayList<>(); try { reader.beginObject(); @@ -59,11 +59,7 @@ public class BoardsRequest extends JsonReaderRequest> { } } reader.endObject(); - } catch (IOException e) { - e.printStackTrace(); - } catch (NumberFormatException e) { - e.printStackTrace(); - } catch (IllegalStateException e) { + } catch (IOException | IllegalStateException | NumberFormatException e) { e.printStackTrace(); } @@ -83,17 +79,22 @@ public class BoardsRequest extends JsonReaderRequest> { while (reader.hasNext()) { String key = reader.nextName(); - if (key.equals("title")) { - // Post number - board.key = reader.nextString(); - } else if (key.equals("board")) { - board.value = reader.nextString(); - } else if (key.equals("ws_board")) { - if (reader.nextInt() == 1) { - board.workSafe = true; - } - } else { - reader.skipValue(); + switch (key) { + case "title": + // Post number + board.key = reader.nextString(); + break; + case "board": + board.value = reader.nextString(); + break; + case "ws_board": + if (reader.nextInt() == 1) { + board.workSafe = true; + } + break; + default: + reader.skipValue(); + break; } } diff --git a/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java b/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java index 8e49bb0f..32fd3a3d 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java +++ b/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java @@ -68,7 +68,7 @@ public class ChanReaderRequest extends JsonReaderRequest> { @Override public List readJson(JsonReader reader) { - List list = new ArrayList(); + List list = new ArrayList<>(); if (loadable.isBoardMode()) { list = loadBoard(reader); @@ -100,7 +100,7 @@ public class ChanReaderRequest extends JsonReaderRequest> { } private List loadThread(JsonReader reader) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); try { reader.beginObject(); @@ -119,13 +119,7 @@ public class ChanReaderRequest extends JsonReaderRequest> { } } reader.endObject(); - } catch (IOException e) { - e.printStackTrace(); - setError(new ParseError(e)); - } catch (NumberFormatException e) { - e.printStackTrace(); - setError(new ParseError(e)); - } catch (IllegalStateException e) { + } catch (IOException | IllegalStateException | NumberFormatException e) { e.printStackTrace(); setError(new ParseError(e)); } @@ -134,7 +128,7 @@ public class ChanReaderRequest extends JsonReaderRequest> { } private List loadBoard(JsonReader reader) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); try { reader.beginObject(); // Threads array @@ -168,13 +162,7 @@ public class ChanReaderRequest extends JsonReaderRequest> { } reader.endObject(); - } catch (IOException e) { - e.printStackTrace(); - setError(new ParseError(e)); - } catch (NumberFormatException e) { - e.printStackTrace(); - setError(new ParseError(e)); - } catch (IllegalStateException e) { + } catch (IOException | IllegalStateException | NumberFormatException e) { e.printStackTrace(); setError(new ParseError(e)); } @@ -183,7 +171,7 @@ public class ChanReaderRequest extends JsonReaderRequest> { } private List loadCatalog(JsonReader reader) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); try { reader.beginArray(); // Array of pages @@ -209,13 +197,7 @@ public class ChanReaderRequest extends JsonReaderRequest> { } reader.endArray(); - } catch (IOException e) { - e.printStackTrace(); - setError(new ParseError(e)); - } catch (NumberFormatException e) { - e.printStackTrace(); - setError(new ParseError(e)); - } catch (IllegalStateException e) { + } catch (IOException | IllegalStateException | NumberFormatException e) { e.printStackTrace(); setError(new ParseError(e)); } @@ -231,59 +213,83 @@ public class ChanReaderRequest extends JsonReaderRequest> { while (reader.hasNext()) { String key = reader.nextName(); - if (key.equals("no")) { - // Post number - post.no = reader.nextInt(); + switch (key) { + case "no": + // Post number + post.no = reader.nextInt(); /*} else if (key.equals("time")) { // Time long time = reader.nextLong(); post.date = new Date(time * 1000);*/ - } else if (key.equals("now")) { - post.date = reader.nextString(); - } else if (key.equals("name")) { - post.name = reader.nextString(); - } else if (key.equals("com")) { - post.setComment(reader.nextString()); - } else if (key.equals("tim")) { - post.tim = reader.nextString(); - } else if (key.equals("time")) { - post.time = reader.nextLong(); - } else if (key.equals("email")) { - post.email = reader.nextString(); - } else if (key.equals("ext")) { - post.ext = reader.nextString().replace(".", ""); - } else if (key.equals("resto")) { - post.resto = reader.nextInt(); - } else if (key.equals("w")) { - post.imageWidth = reader.nextInt(); - } else if (key.equals("h")) { - post.imageHeight = reader.nextInt(); - } else if (key.equals("fsize")) { - post.fileSize = reader.nextInt(); - } else if (key.equals("sub")) { - post.subject = reader.nextString(); - } else if (key.equals("replies")) { - post.replies = reader.nextInt(); - } else if (key.equals("filename")) { - post.filename = reader.nextString(); - } else if (key.equals("sticky")) { - post.sticky = reader.nextInt() == 1; - } else if (key.equals("closed")) { - post.closed = reader.nextInt() == 1; - } else if (key.equals("trip")) { - post.tripcode = reader.nextString(); - } else if (key.equals("country")) { - post.country = reader.nextString(); - } else if (key.equals("country_name")) { - post.countryName = reader.nextString(); - } else if (key.equals("id")) { - post.id = reader.nextString(); - } else if (key.equals("capcode")) { - post.capcode = reader.nextString(); - } else { - // Unknown/ignored key - // log("Unknown/ignored key: " + key + "."); - reader.skipValue(); + break; + case "now": + post.date = reader.nextString(); + break; + case "name": + post.name = reader.nextString(); + break; + case "com": + post.setComment(reader.nextString()); + break; + case "tim": + post.tim = reader.nextString(); + break; + case "time": + post.time = reader.nextLong(); + break; + case "email": + post.email = reader.nextString(); + break; + case "ext": + post.ext = reader.nextString().replace(".", ""); + break; + case "resto": + post.resto = reader.nextInt(); + break; + case "w": + post.imageWidth = reader.nextInt(); + break; + case "h": + post.imageHeight = reader.nextInt(); + break; + case "fsize": + post.fileSize = reader.nextInt(); + break; + case "sub": + post.subject = reader.nextString(); + break; + case "replies": + post.replies = reader.nextInt(); + break; + case "filename": + post.filename = reader.nextString(); + break; + case "sticky": + post.sticky = reader.nextInt() == 1; + break; + case "closed": + post.closed = reader.nextInt() == 1; + break; + case "trip": + post.tripcode = reader.nextString(); + break; + case "country": + post.country = reader.nextString(); + break; + case "country_name": + post.countryName = reader.nextString(); + break; + case "id": + post.id = reader.nextString(); + break; + case "capcode": + post.capcode = reader.nextString(); + break; + default: + // Unknown/ignored key + // log("Unknown/ignored key: " + key + "."); + reader.skipValue(); + break; } } reader.endObject(); diff --git a/Clover/app/src/main/java/org/floens/chan/core/watch/PinWatcher.java b/Clover/app/src/main/java/org/floens/chan/core/watch/PinWatcher.java index e3c7ddba..d324ae35 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/watch/PinWatcher.java +++ b/Clover/app/src/main/java/org/floens/chan/core/watch/PinWatcher.java @@ -35,7 +35,7 @@ public class PinWatcher implements Loader.LoaderListener { private final Pin pin; private Loader loader; - private final List posts = new ArrayList(); + private final List posts = new ArrayList<>(); private boolean wereNewQuotes = false; public PinWatcher(Pin pin) { diff --git a/Clover/app/src/main/java/org/floens/chan/core/watch/WatchNotifier.java b/Clover/app/src/main/java/org/floens/chan/core/watch/WatchNotifier.java index 12d6dcd1..fbc187d7 100644 --- a/Clover/app/src/main/java/org/floens/chan/core/watch/WatchNotifier.java +++ b/Clover/app/src/main/java/org/floens/chan/core/watch/WatchNotifier.java @@ -84,10 +84,10 @@ public class WatchNotifier { private void prepareNotification() { List watchingPins = ChanApplication.getPinnedManager().getWatchingPins(); - List pins = new ArrayList(); + List pins = new ArrayList<>(); int newPostsCount = 0; int newQuotesCount = 0; - List posts = new ArrayList(); + List posts = new ArrayList<>(); boolean makeSound = false; boolean show = false; @@ -140,7 +140,7 @@ public class WatchNotifier { Collections.sort(posts, new PostAgeComparer()); - List lines = new ArrayList(); + List lines = new ArrayList<>(); for (Post post : posts) { CharSequence comment; if (post.comment.length() == 0) { diff --git a/Clover/app/src/main/java/org/floens/chan/ui/SwipeDismissListViewTouchListener.java b/Clover/app/src/main/java/org/floens/chan/ui/SwipeDismissListViewTouchListener.java index f23358fd..cb122ace 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/SwipeDismissListViewTouchListener.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/SwipeDismissListViewTouchListener.java @@ -85,7 +85,7 @@ public class SwipeDismissListViewTouchListener implements View.OnTouchListener { private int mViewWidth = 1; // 1 and not 0 to prevent dividing by zero // Transient properties - private final List mPendingDismisses = new ArrayList(); + private final List mPendingDismisses = new ArrayList<>(); private int mDismissAnimationRefCount = 0; private float mDownX; private boolean mSwiping; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/activity/BoardActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/BoardActivity.java index 00967525..3f85601e 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/activity/BoardActivity.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/activity/BoardActivity.java @@ -73,7 +73,7 @@ public class BoardActivity extends BaseActivity implements ActionBar.OnNavigatio final ActionBar actionBar = getActionBar(); actionBar.setListNavigationCallbacks( - new ArrayAdapter(actionBar.getThemedContext(), R.layout.board_select_spinner, + new ArrayAdapter<>(actionBar.getThemedContext(), R.layout.board_select_spinner, android.R.id.text1, ChanApplication.getBoardManager().getSavedKeys()), this ); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/activity/BoardEditor.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/BoardEditor.java index a53dc6c9..6a41f2e2 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/activity/BoardEditor.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/activity/BoardEditor.java @@ -245,7 +245,7 @@ public class BoardEditor extends Activity { private List currentlyEditing; private View autoCompleteView; private final Filter filter; - private final List filtered = new ArrayList(); + private final List filtered = new ArrayList<>(); public FillAdapter(Context context, int resource) { super(context, resource); @@ -334,7 +334,7 @@ public class BoardEditor extends Activity { private List getFiltered(String filter) { String lowered = filter.toLowerCase(Locale.ENGLISH); - List list = new ArrayList(); + List list = new ArrayList<>(); for (Board b : getBoards()) { if ((b.key.toLowerCase(Locale.ENGLISH).contains(lowered) || b.value.toLowerCase(Locale.ENGLISH) .contains(lowered))) { @@ -363,7 +363,7 @@ public class BoardEditor extends Activity { } } - List s = new ArrayList(); + List s = new ArrayList<>(); for (Board b : ChanApplication.getBoardManager().getAllBoards()) { if (!haveBoard(b.value) && (showUnsafe || b.workSafe)) s.add(b); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/activity/ImageViewActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/ImageViewActivity.java index 5063077c..6bea9441 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/activity/ImageViewActivity.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/activity/ImageViewActivity.java @@ -75,7 +75,7 @@ public class ImageViewActivity extends Activity implements ViewPager.OnPageChang if (postAdapter != null) { // Get the posts with images - ArrayList imagePosts = new ArrayList(); + ArrayList imagePosts = new ArrayList<>(); for (Post post : postAdapter.getList()) { if (post.hasImage) { imagePosts.add(post); @@ -166,7 +166,7 @@ public class ImageViewActivity extends Activity implements ViewPager.OnPageChang finish(); return true; } else if (item.getItemId() == R.id.action_download_album) { - List uris = new ArrayList(); + List uris = new ArrayList<>(); Post aPost = null; for (Post post : adapter.getList()) { uris.add(Uri.parse(post.imageUrl)); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/adapter/ImageViewAdapter.java b/Clover/app/src/main/java/org/floens/chan/ui/adapter/ImageViewAdapter.java index c8f2c51d..5a52ab4d 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/adapter/ImageViewAdapter.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/adapter/ImageViewAdapter.java @@ -32,7 +32,7 @@ import java.util.List; public class ImageViewAdapter extends FragmentStatePagerAdapter { private final ImageViewActivity activity; - private final ArrayList postList = new ArrayList(); + private final ArrayList postList = new ArrayList<>(); public ImageViewAdapter(FragmentManager fragmentManager, ImageViewActivity activity) { super(fragmentManager); diff --git a/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinnedAdapter.java b/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinnedAdapter.java index f833a2f1..e8fd4838 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinnedAdapter.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/adapter/PinnedAdapter.java @@ -41,7 +41,7 @@ public class PinnedAdapter extends ArrayAdapter { public PinnedAdapter(Context context, int resId) { super(context, resId, new ArrayList()); - idMap = new HashMap(); + idMap = new HashMap<>(); } @Override diff --git a/Clover/app/src/main/java/org/floens/chan/ui/adapter/PostAdapter.java b/Clover/app/src/main/java/org/floens/chan/ui/adapter/PostAdapter.java index ea77a237..458a74ac 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/adapter/PostAdapter.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/adapter/PostAdapter.java @@ -43,7 +43,7 @@ public class PostAdapter extends BaseAdapter { private final ThreadManager threadManager; private final ListView listView; private boolean endOfLine; - private final List postList = new ArrayList(); + private final List postList = new ArrayList<>(); private long lastViewedTime = 0; private String loadMessage = null; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/fragment/ImageViewFragment.java b/Clover/app/src/main/java/org/floens/chan/ui/fragment/ImageViewFragment.java index 3d48d476..e0582cad 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/fragment/ImageViewFragment.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/fragment/ImageViewFragment.java @@ -120,24 +120,28 @@ public class ImageViewFragment extends Fragment implements ThumbnailImageViewCal if (loaded) return; loaded = true; - if (post.ext.equals("gif")) { - imageView.setGif(post.imageUrl); - } else if (post.ext.equals("webm")) { - isVideo = true; - activity.invalidateActionBar(); - showProgressBar(false); - - if (tapToLoad) { - if (!videoVisible) { - startVideo(); - } else { - if (imageView.getVideoView() != null) { - imageView.getVideoView().start(); + switch (post.ext) { + case "gif": + imageView.setGif(post.imageUrl); + break; + case "webm": + isVideo = true; + activity.invalidateActionBar(); + showProgressBar(false); + + if (tapToLoad) { + if (!videoVisible) { + startVideo(); + } else { + if (imageView.getVideoView() != null) { + imageView.getVideoView().start(); + } } } - } - } else { - imageView.setBigImage(post.imageUrl); + break; + default: + imageView.setBigImage(post.imageUrl); + break; } } diff --git a/Clover/app/src/main/java/org/floens/chan/utils/ImageDecoder.java b/Clover/app/src/main/java/org/floens/chan/utils/ImageDecoder.java index 9b907c13..1e9b5a3f 100644 --- a/Clover/app/src/main/java/org/floens/chan/utils/ImageDecoder.java +++ b/Clover/app/src/main/java/org/floens/chan/utils/ImageDecoder.java @@ -51,9 +51,7 @@ public class ImageDecoder { IOUtils.copy(fis, baos); bitmap = decode(baos.toByteArray(), maxWidth, maxHeight); - } catch (IOException e) { - e.printStackTrace(); - } catch (OutOfMemoryError e) { + } catch (IOException | OutOfMemoryError e) { e.printStackTrace(); } finally { try { diff --git a/Clover/app/src/main/java/org/floens/chan/utils/ThemeHelper.java b/Clover/app/src/main/java/org/floens/chan/utils/ThemeHelper.java index 8cab15dc..73945fea 100644 --- a/Clover/app/src/main/java/org/floens/chan/utils/ThemeHelper.java +++ b/Clover/app/src/main/java/org/floens/chan/utils/ThemeHelper.java @@ -48,12 +48,16 @@ public class ThemeHelper { String themeName = ChanPreferences.getTheme(); Theme theme = null; - if (themeName.equals("light")) { - theme = Theme.LIGHT; - } else if (themeName.equals("dark")) { - theme = Theme.DARK; - } else if (themeName.equals("black")) { - theme = Theme.BLACK; + switch (themeName) { + case "light": + theme = Theme.LIGHT; + break; + case "dark": + theme = Theme.DARK; + break; + case "black": + theme = Theme.BLACK; + break; } return theme;