Skip to content

Commit ef2a0a9

Browse files
committed
[duplicated subtitle] Fix compilation errors after moving from NewPipeExtractor to NewPipe repository.
- Changed `package` and `import` statements to adapt to NewPipe main repository. - Replace `javax.annotation.Nonnull` with `androidx.annotation.NonNull` for compatibility with `androidx`, replacing `javax`.
1 parent 4f827dd commit ef2a0a9

3 files changed

Lines changed: 20 additions & 20 deletions

File tree

app/src/main/java/org/schabi/newpipe/util/subtitle/SubtitleDeduplicator.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.schabi.newpipe.extractor.utils;
1+
package org.schabi.newpipe.util.subtitle;
22

33
import java.io.BufferedReader;
44
import java.io.File;
@@ -17,7 +17,7 @@
1717
import java.util.regex.Matcher;
1818
import java.util.regex.Pattern;
1919

20-
import javax.annotation.Nonnull;
20+
import androidx.annotation.NonNull;
2121

2222
import org.schabi.newpipe.extractor.services.youtube.YoutubeParsingHelper;
2323
import org.schabi.newpipe.extractor.MediaFormat;
@@ -430,13 +430,13 @@ public static SubtitleOrigin getSubtitleOrigin(final boolean autoGenerated,
430430
return SubtitleOrigin.HUMAN_PROVIDED;
431431
}
432432

433-
@Nonnull
433+
@NonNull
434434
private static String buildSubtitleCacheFilename(
435-
@Nonnull final String videoId,
436-
@Nonnull final String language,
437-
@Nonnull final SubtitleOrigin origin,
438-
@Nonnull final SubtitleState state,
439-
@Nonnull final String extension
435+
@NonNull final String videoId,
436+
@NonNull final String language,
437+
@NonNull final SubtitleOrigin origin,
438+
@NonNull final SubtitleState state,
439+
@NonNull final String extension
440440
) {
441441
final String filenamePartSeparator = "--";
442442

@@ -526,11 +526,11 @@ private static File findStoredCacheFile(
526526
return null;
527527
}
528528

529-
@Nonnull
529+
@NonNull
530530
private static String fallbackToStoredOrRemote(
531-
@Nonnull final String remoteSubtitleUrl,
532-
@Nonnull final MediaFormat format,
533-
@Nonnull final SubtitleOrigin origin
531+
@NonNull final String remoteSubtitleUrl,
532+
@NonNull final MediaFormat format,
533+
@NonNull final SubtitleOrigin origin
534534
) {
535535
final File storedFile = findStoredCacheFile(
536536
remoteSubtitleUrl,

app/src/main/java/org/schabi/newpipe/util/subtitle/SubtitleOrigin.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package org.schabi.newpipe.extractor.utils;
1+
package org.schabi.newpipe.util.subtitle;
22

3-
import javax.annotation.Nonnull;
3+
import androidx.annotation.NonNull;
44

55
/**
66
* Describes the origin of a subtitle -> how its content was produced.
@@ -27,11 +27,11 @@ public enum SubtitleOrigin {
2727

2828
private final String id;
2929

30-
SubtitleOrigin(@Nonnull final String id) {
30+
SubtitleOrigin(@NonNull final String id) {
3131
this.id = id;
3232
}
3333

34-
@Nonnull
34+
@NonNull
3535
public String getId() {
3636
return id;
3737
}

app/src/main/java/org/schabi/newpipe/util/subtitle/SubtitleState.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package org.schabi.newpipe.extractor.utils;
1+
package org.schabi.newpipe.util.subtitle;
22

3-
import javax.annotation.Nonnull;
3+
import androidx.annotation.NonNull;
44

55
/**
66
* Describes the processing state of a subtitle.
@@ -20,11 +20,11 @@ public enum SubtitleState {
2020

2121
private final String id;
2222

23-
SubtitleState(@Nonnull final String id) {
23+
SubtitleState(@NonNull final String id) {
2424
this.id = id;
2525
}
2626

27-
@Nonnull
27+
@NonNull
2828
public String getId() {
2929
return id;
3030
}

0 commit comments

Comments
 (0)