diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java index 4e34287e14..777290e0fc 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java @@ -324,22 +324,20 @@ public final class SsaDecoder extends SimpleSubtitleDecoder { if (style.bold && style.italic) { spannableText.setSpan( new StyleSpan(Typeface.BOLD_ITALIC), - 0, - spannableText.length(), + /* start= */0, + /* end= */ spannableText.length(), SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE); - } - else if(style.bold){ + } else if (style.bold) { spannableText.setSpan( new StyleSpan(Typeface.BOLD), - 0, - spannableText.length(), + /* start= */0, + /* end= */ spannableText.length(), SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE); - } - else if(style.italic){ + } else if (style.italic) { spannableText.setSpan( new StyleSpan(Typeface.ITALIC), - 0, - spannableText.length(), + /* start= */0, + /* end= */ spannableText.length(), SpannableString.SPAN_EXCLUSIVE_EXCLUSIVE); } } diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java index a7d1f52990..3e0279fca0 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java @@ -218,10 +218,9 @@ import java.util.regex.Pattern; private static boolean parseBold(String bold) { try { int boldFlag = Integer.parseInt(bold); - if(boldFlag == 1 || boldFlag == -1){ + if (boldFlag == 1 || boldFlag == -1) { return true; - } - else{ + } else { return false; } } catch (NumberFormatException e) { @@ -233,10 +232,9 @@ import java.util.regex.Pattern; private static boolean parseItalic(String italic) { try { int italicFlag = Integer.parseInt(italic); - if(italicFlag == 1 || italicFlag == -1){ + if (italicFlag == 1 || italicFlag == -1) { return true; - } - else{ + } else { return false; } } catch (NumberFormatException e) { diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java index 542b11b980..3bdebdf82b 100644 --- a/library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java +++ b/library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java @@ -338,7 +338,7 @@ public final class SsaDecoderTest { } @Test - public void decodeBoldItalic() throws IOException{ + public void decodeBoldItalic() throws IOException { SsaDecoder decoder = new SsaDecoder(); byte[] bytes = TestUtil.getByteArray(ApplicationProvider.getApplicationContext(), STYLE_BOLD_ITALIC); Subtitle subtitle = decoder.decode(bytes, bytes.length, false);