Skip to content

Commit abc354f

Browse files
committed
Use reqireContext(), requireActivity() instead of getters
1 parent 79efffe commit abc354f

4 files changed

Lines changed: 7 additions & 6 deletions

File tree

app/src/main/java/org/schabi/newpipe/local/subscription/ImportConfirmationDialog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void setResultServiceIntent(final Intent resultServiceIntent) {
4040
@Override
4141
public Dialog onCreateDialog(@Nullable final Bundle savedInstanceState) {
4242
assureCorrectAppLanguage(getContext());
43-
return new AlertDialog.Builder(getContext())
43+
return new AlertDialog.Builder(requireContext())
4444
.setMessage(R.string.import_network_expensive_warning)
4545
.setCancelable(true)
4646
.setNegativeButton(R.string.cancel, null)

app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ public enum StreamDialogEntry {
2626

2727
show_channel_details(R.string.show_channel_details, (fragment, item) ->
2828
// For some reason `getParentFragmentManager()` doesn't work, but this does.
29-
NavigationHelper.openChannelFragment(fragment.getActivity().getSupportFragmentManager(),
29+
NavigationHelper.openChannelFragment(
30+
fragment.requireActivity().getSupportFragmentManager(),
3031
item.getServiceId(), item.getUploaderUrl(), item.getUploaderName())
3132
),
3233

@@ -80,7 +81,7 @@ public enum StreamDialogEntry {
8081
play_with_kodi(R.string.play_with_kodi_title, (fragment, item) -> {
8182
final Uri videoUrl = Uri.parse(item.getUrl());
8283
try {
83-
NavigationHelper.playWithKore(fragment.getContext(), videoUrl);
84+
NavigationHelper.playWithKore(fragment.requireContext(), videoUrl);
8485
} catch (final Exception e) {
8586
KoreUtil.showInstallKoreDialog(fragment.getActivity());
8687
}

app/src/main/java/us/shandian/giga/io/StoredFileHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ public boolean create() {
275275
if (!docTree.canRead() || !docTree.canWrite()) return false;
276276
try {
277277
docFile = createSAF(context, srcType, srcName);
278-
if (docFile == null || docFile.getName() == null) return false;
278+
if (docFile.getName() == null) return false;
279279
result = true;
280280
} catch (IOException e) {
281281
return false;

app/src/test/java/org/schabi/newpipe/local/subscription/services/ImportExportJsonHelperTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ private List<SubscriptionItem> readFromFile() throws Exception {
9191
final List<SubscriptionItem> itemsFromFile = ImportExportJsonHelper.readFrom(
9292
inputStream, null);
9393

94-
if (itemsFromFile == null || itemsFromFile.isEmpty()) {
94+
if (itemsFromFile.isEmpty()) {
9595
fail("ImportExportJsonHelper.readFrom(input) returned a null or empty list");
9696
}
9797

@@ -116,7 +116,7 @@ private List<SubscriptionItem> readFromWriteTo(final String jsonOut) throws Exce
116116
final List<SubscriptionItem> secondReadItems = ImportExportJsonHelper.readFrom(
117117
inputStream, null);
118118

119-
if (secondReadItems == null || secondReadItems.isEmpty()) {
119+
if (secondReadItems.isEmpty()) {
120120
fail("second call to readFrom returned an empty list");
121121
}
122122

0 commit comments

Comments
 (0)