From 10c1ee70e8b774f8b3e6c3864d28cec7742347be Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Sat, 27 Jan 2018 12:29:58 -0800 Subject: [PATCH] Make some inner classes static Closes #7370 --- src/org/thoughtcrime/securesms/components/AudioView.java | 2 +- .../securesms/components/emoji/parsing/EmojiParser.java | 4 ++-- .../securesms/scribbles/StickerSelectActivity.java | 2 +- src/org/thoughtcrime/securesms/video/VideoPlayer.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/org/thoughtcrime/securesms/components/AudioView.java b/src/org/thoughtcrime/securesms/components/AudioView.java index 527fa3ca9e..8d345cc1a1 100644 --- a/src/org/thoughtcrime/securesms/components/AudioView.java +++ b/src/org/thoughtcrime/securesms/components/AudioView.java @@ -316,7 +316,7 @@ public class AudioView extends FrameLayout implements AudioSlidePlayer.Listener } } - private class TouchIgnoringListener implements OnTouchListener { + private static class TouchIgnoringListener implements OnTouchListener { @Override public boolean onTouch(View v, MotionEvent event) { return true; diff --git a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java index 0fec9806e7..119e79725c 100644 --- a/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java +++ b/src/org/thoughtcrime/securesms/components/emoji/parsing/EmojiParser.java @@ -85,7 +85,7 @@ public class EmojiParser { return best; } - public class Candidate { + public static class Candidate { private final int startIndex; private final int endIndex; @@ -110,7 +110,7 @@ public class EmojiParser { } } - public class CandidateList implements Iterable { + public static class CandidateList implements Iterable { public final List list; public final boolean allEmojis; diff --git a/src/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java b/src/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java index 987e4c640c..bb37dcfa6c 100644 --- a/src/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java +++ b/src/org/thoughtcrime/securesms/scribbles/StickerSelectActivity.java @@ -82,7 +82,7 @@ public class StickerSelectActivity extends FragmentActivity implements StickerSe finish(); } - class StickerPagerAdapter extends FragmentStatePagerAdapter { + static class StickerPagerAdapter extends FragmentStatePagerAdapter { private final Fragment[] fragments; diff --git a/src/org/thoughtcrime/securesms/video/VideoPlayer.java b/src/org/thoughtcrime/securesms/video/VideoPlayer.java index 78159ed720..184188c06b 100644 --- a/src/org/thoughtcrime/securesms/video/VideoPlayer.java +++ b/src/org/thoughtcrime/securesms/video/VideoPlayer.java @@ -180,7 +180,7 @@ public class VideoPlayer extends FrameLayout { videoView.setMediaController(mediaController); } - private class ExoPlayerListener implements ExoPlayer.EventListener { + private static class ExoPlayerListener implements ExoPlayer.EventListener { private final Window window; ExoPlayerListener(Window window) {