Skip to content

Commit 6872e7c

Browse files
Isira-SeneviratneIsira-Seneviratne
committed
Merge branch 'refactor' into Video-description-compose
2 parents c3cf3d8 + b6bd87a commit 6872e7c

158 files changed

Lines changed: 1505 additions & 1078 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ android {
2828
if (System.properties.containsKey('versionCodeOverride')) {
2929
versionCode System.getProperty('versionCodeOverride') as Integer
3030
} else {
31-
versionCode 1004
31+
versionCode 1005
3232
}
33-
versionName "0.27.7"
33+
versionName "0.28.0"
3434
if (System.properties.containsKey('versionNameSuffix')) {
3535
versionNameSuffix System.getProperty('versionNameSuffix')
3636
}

‎app/src/androidTest/java/org/schabi/newpipe/error/ErrorInfoTest.java‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import org.schabi.newpipe.extractor.exceptions.ParsingException;
1313

1414
import java.util.Arrays;
15+
import java.util.Objects;
1516

1617
import static org.junit.Assert.assertEquals;
1718
import static org.junit.Assert.assertTrue;
@@ -23,8 +24,23 @@
2324
@LargeTest
2425
public class ErrorInfoTest {
2526

27+
/**
28+
* @param errorInfo the error info to access
29+
* @return the private field errorInfo.message.stringRes using reflection
30+
*/
31+
private int getMessageFromErrorInfo(final ErrorInfo errorInfo)
32+
throws NoSuchFieldException, IllegalAccessException {
33+
final var message = ErrorInfo.class.getDeclaredField("message");
34+
message.setAccessible(true);
35+
final var messageValue = (ErrorInfo.Companion.ErrorMessage) message.get(errorInfo);
36+
37+
final var stringRes = ErrorInfo.Companion.ErrorMessage.class.getDeclaredField("stringRes");
38+
stringRes.setAccessible(true);
39+
return (int) Objects.requireNonNull(stringRes.get(messageValue));
40+
}
41+
2642
@Test
27-
public void errorInfoTestParcelable() {
43+
public void errorInfoTestParcelable() throws NoSuchFieldException, IllegalAccessException {
2844
final ErrorInfo info = new ErrorInfo(new ParsingException("Hello"),
2945
UserAction.USER_REPORT, "request", ServiceList.YouTube.getServiceId());
3046
// Obtain a Parcel object and write the parcelable object to it:
@@ -39,7 +55,7 @@ public void errorInfoTestParcelable() {
3955
assertEquals(ServiceList.YouTube.getServiceInfo().getName(),
4056
infoFromParcel.getServiceName());
4157
assertEquals("request", infoFromParcel.getRequest());
42-
assertEquals(R.string.parsing_error, infoFromParcel.getMessageStringId());
58+
assertEquals(R.string.parsing_error, getMessageFromErrorInfo(infoFromParcel));
4359

4460
parcel.recycle();
4561
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,7 @@
435435
</activity>
436436
<service
437437
android:name=".RouterActivity$FetcherService"
438+
android:foregroundServiceType="dataSync"
438439
android:exported="false" />
439440

440441
<!-- opting out of sending metrics to Google in Android System WebView -->

‎app/src/main/java/org/schabi/newpipe/DownloaderImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
public final class DownloaderImpl extends Downloader {
3131
public static final String USER_AGENT =
32-
"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:128.0) Gecko/20100101 Firefox/128.0";
32+
"Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:140.0) Gecko/20100101 Firefox/140.0";
3333
public static final String YOUTUBE_RESTRICTED_MODE_COOKIE_KEY =
3434
"youtube_restricted_mode_key";
3535
public static final String YOUTUBE_RESTRICTED_MODE_COOKIE = "PREF=f2=8000000";

‎app/src/main/java/org/schabi/newpipe/MainActivity.java‎

Lines changed: 35 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
import org.schabi.newpipe.player.event.OnKeyDownListener;
7676
import org.schabi.newpipe.player.helper.PlayerHolder;
7777
import org.schabi.newpipe.player.playqueue.PlayQueue;
78-
import org.schabi.newpipe.settings.SettingMigrations;
7978
import org.schabi.newpipe.settings.UpdateSettingsFragment;
79+
import org.schabi.newpipe.settings.migration.MigrationManager;
8080
import org.schabi.newpipe.util.Constants;
8181
import org.schabi.newpipe.util.DeviceUtils;
8282
import org.schabi.newpipe.util.KioskTranslator;
@@ -192,7 +192,7 @@ protected void onCreate(final Bundle savedInstanceState) {
192192
UpdateSettingsFragment.askForConsentToUpdateChecks(this);
193193
}
194194

195-
SettingMigrations.showUserInfoIfPresent(this);
195+
MigrationManager.showUserInfoIfPresent(this);
196196
}
197197

198198
@Override
@@ -260,19 +260,6 @@ public void onDrawerClosed(final View drawerView) {
260260
*/
261261
private void addDrawerMenuForCurrentService() throws ExtractionException {
262262
//Tabs
263-
final int currentServiceId = ServiceHelper.getSelectedServiceId(this);
264-
final StreamingService service = NewPipe.getService(currentServiceId);
265-
266-
int kioskMenuItemId = 0;
267-
268-
for (final String ks : service.getKioskList().getAvailableKiosks()) {
269-
drawerLayoutBinding.navigation.getMenu()
270-
.add(R.id.menu_tabs_group, kioskMenuItemId, 0, KioskTranslator
271-
.getTranslatedKioskName(ks, this))
272-
.setIcon(KioskTranslator.getKioskIcon(ks));
273-
kioskMenuItemId++;
274-
}
275-
276263
drawerLayoutBinding.navigation.getMenu()
277264
.add(R.id.menu_tabs_group, ITEM_ID_SUBSCRIPTIONS, ORDER,
278265
R.string.tab_subscriptions)
@@ -290,6 +277,20 @@ private void addDrawerMenuForCurrentService() throws ExtractionException {
290277
.add(R.id.menu_tabs_group, ITEM_ID_HISTORY, ORDER, R.string.action_history)
291278
.setIcon(R.drawable.ic_history);
292279

280+
//Kiosks
281+
final int currentServiceId = ServiceHelper.getSelectedServiceId(this);
282+
final StreamingService service = NewPipe.getService(currentServiceId);
283+
284+
int kioskMenuItemId = 0;
285+
286+
for (final String ks : service.getKioskList().getAvailableKiosks()) {
287+
drawerLayoutBinding.navigation.getMenu()
288+
.add(R.id.menu_kiosks_group, kioskMenuItemId, 0, KioskTranslator
289+
.getTranslatedKioskName(ks, this))
290+
.setIcon(KioskTranslator.getKioskIcon(ks));
291+
kioskMenuItemId++;
292+
}
293+
293294
//Settings and About
294295
drawerLayoutBinding.navigation.getMenu()
295296
.add(R.id.menu_options_about_group, ITEM_ID_SETTINGS, ORDER, R.string.settings)
@@ -309,10 +310,13 @@ private boolean drawerItemSelected(final MenuItem item) {
309310
changeService(item);
310311
break;
311312
case R.id.menu_tabs_group:
313+
tabSelected(item);
314+
break;
315+
case R.id.menu_kiosks_group:
312316
try {
313-
tabSelected(item);
317+
kioskSelected(item);
314318
} catch (final Exception e) {
315-
ErrorUtil.showUiErrorSnackbar(this, "Selecting main page tab", e);
319+
ErrorUtil.showUiErrorSnackbar(this, "Selecting drawer kiosk", e);
316320
}
317321
break;
318322
case R.id.menu_options_about_group:
@@ -336,7 +340,7 @@ private void changeService(final MenuItem item) {
336340
.setChecked(true);
337341
}
338342

339-
private void tabSelected(final MenuItem item) throws ExtractionException {
343+
private void tabSelected(final MenuItem item) {
340344
switch (item.getItemId()) {
341345
case ITEM_ID_SUBSCRIPTIONS:
342346
NavigationHelper.openSubscriptionFragment(getSupportFragmentManager());
@@ -353,18 +357,19 @@ private void tabSelected(final MenuItem item) throws ExtractionException {
353357
case ITEM_ID_HISTORY:
354358
NavigationHelper.openStatisticFragment(getSupportFragmentManager());
355359
break;
356-
default:
357-
final StreamingService currentService = ServiceHelper.getSelectedService(this);
358-
int kioskMenuItemId = 0;
359-
for (final String kioskId : currentService.getKioskList().getAvailableKiosks()) {
360-
if (kioskMenuItemId == item.getItemId()) {
361-
NavigationHelper.openKioskFragment(getSupportFragmentManager(),
362-
currentService.getServiceId(), kioskId);
363-
break;
364-
}
365-
kioskMenuItemId++;
366-
}
360+
}
361+
}
362+
363+
private void kioskSelected(final MenuItem item) throws ExtractionException {
364+
final StreamingService currentService = ServiceHelper.getSelectedService(this);
365+
int kioskMenuItemId = 0;
366+
for (final String kioskId : currentService.getKioskList().getAvailableKiosks()) {
367+
if (kioskMenuItemId == item.getItemId()) {
368+
NavigationHelper.openKioskFragment(getSupportFragmentManager(),
369+
currentService.getServiceId(), kioskId);
367370
break;
371+
}
372+
kioskMenuItemId++;
368373
}
369374
}
370375

@@ -405,6 +410,7 @@ private void toggleServices() {
405410

406411
drawerLayoutBinding.navigation.getMenu().removeGroup(R.id.menu_services_group);
407412
drawerLayoutBinding.navigation.getMenu().removeGroup(R.id.menu_tabs_group);
413+
drawerLayoutBinding.navigation.getMenu().removeGroup(R.id.menu_kiosks_group);
408414
drawerLayoutBinding.navigation.getMenu().removeGroup(R.id.menu_options_about_group);
409415

410416
// Show up or down arrow

‎app/src/main/java/org/schabi/newpipe/RouterActivity.java‎

Lines changed: 15 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,10 @@
5858
import org.schabi.newpipe.extractor.StreamingService;
5959
import org.schabi.newpipe.extractor.StreamingService.LinkType;
6060
import org.schabi.newpipe.extractor.channel.ChannelInfo;
61-
import org.schabi.newpipe.extractor.exceptions.AgeRestrictedContentException;
62-
import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException;
63-
import org.schabi.newpipe.extractor.exceptions.ContentNotSupportedException;
6461
import org.schabi.newpipe.extractor.exceptions.ExtractionException;
65-
import org.schabi.newpipe.extractor.exceptions.GeographicRestrictionException;
66-
import org.schabi.newpipe.extractor.exceptions.PaidContentException;
67-
import org.schabi.newpipe.extractor.exceptions.PrivateContentException;
68-
import org.schabi.newpipe.extractor.exceptions.ReCaptchaException;
69-
import org.schabi.newpipe.extractor.exceptions.SoundCloudGoPlusContentException;
70-
import org.schabi.newpipe.extractor.exceptions.YoutubeMusicPremiumContentException;
7162
import org.schabi.newpipe.extractor.linkhandler.ListLinkHandler;
7263
import org.schabi.newpipe.extractor.playlist.PlaylistInfo;
7364
import org.schabi.newpipe.extractor.stream.StreamInfo;
74-
import org.schabi.newpipe.ktx.ExceptionUtils;
7565
import org.schabi.newpipe.local.dialog.PlaylistDialog;
7666
import org.schabi.newpipe.player.PlayerType;
7767
import org.schabi.newpipe.player.helper.PlayerHelper;
@@ -260,7 +250,8 @@ private void handleUrl(final String url) {
260250
showUnsupportedUrlDialog(url);
261251
}
262252
}, throwable -> handleError(this, new ErrorInfo(throwable,
263-
UserAction.SHARE_TO_NEWPIPE, "Getting service from url: " + url))));
253+
UserAction.SHARE_TO_NEWPIPE, "Getting service from url: " + url,
254+
null, url))));
264255
}
265256

266257
/**
@@ -269,40 +260,19 @@ private void handleUrl(final String url) {
269260
* @param errorInfo the error information
270261
*/
271262
private static void handleError(final Context context, final ErrorInfo errorInfo) {
272-
if (errorInfo.getThrowable() != null) {
273-
errorInfo.getThrowable().printStackTrace();
274-
}
275-
276-
if (errorInfo.getThrowable() instanceof ReCaptchaException) {
263+
if (errorInfo.getRecaptchaUrl() != null) {
277264
Toast.makeText(context, R.string.recaptcha_request_toast, Toast.LENGTH_LONG).show();
278265
// Starting ReCaptcha Challenge Activity
279266
final Intent intent = new Intent(context, ReCaptchaActivity.class);
280267
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
268+
intent.putExtra(ReCaptchaActivity.RECAPTCHA_URL_EXTRA, errorInfo.getRecaptchaUrl());
281269
context.startActivity(intent);
282-
} else if (errorInfo.getThrowable() != null
283-
&& ExceptionUtils.isNetworkRelated(errorInfo.getThrowable())) {
284-
Toast.makeText(context, R.string.network_error, Toast.LENGTH_LONG).show();
285-
} else if (errorInfo.getThrowable() instanceof AgeRestrictedContentException) {
286-
Toast.makeText(context, R.string.restricted_video_no_stream,
287-
Toast.LENGTH_LONG).show();
288-
} else if (errorInfo.getThrowable() instanceof GeographicRestrictionException) {
289-
Toast.makeText(context, R.string.georestricted_content, Toast.LENGTH_LONG).show();
290-
} else if (errorInfo.getThrowable() instanceof PaidContentException) {
291-
Toast.makeText(context, R.string.paid_content, Toast.LENGTH_LONG).show();
292-
} else if (errorInfo.getThrowable() instanceof PrivateContentException) {
293-
Toast.makeText(context, R.string.private_content, Toast.LENGTH_LONG).show();
294-
} else if (errorInfo.getThrowable() instanceof SoundCloudGoPlusContentException) {
295-
Toast.makeText(context, R.string.soundcloud_go_plus_content,
296-
Toast.LENGTH_LONG).show();
297-
} else if (errorInfo.getThrowable() instanceof YoutubeMusicPremiumContentException) {
298-
Toast.makeText(context, R.string.youtube_music_premium_content,
299-
Toast.LENGTH_LONG).show();
300-
} else if (errorInfo.getThrowable() instanceof ContentNotAvailableException) {
301-
Toast.makeText(context, R.string.content_not_available, Toast.LENGTH_LONG).show();
302-
} else if (errorInfo.getThrowable() instanceof ContentNotSupportedException) {
303-
Toast.makeText(context, R.string.content_not_supported, Toast.LENGTH_LONG).show();
304-
} else {
270+
} else if (errorInfo.isReportable()) {
305271
ErrorUtil.createNotification(context, errorInfo);
272+
} else {
273+
// this exception does not usually indicate a problem that should be reported,
274+
// so just show a toast instead of the notification
275+
Toast.makeText(context, errorInfo.getMessage(context), Toast.LENGTH_LONG).show();
306276
}
307277

308278
if (context instanceof RouterActivity) {
@@ -665,7 +635,8 @@ private void handleChoice(final String selectedChoiceKey) {
665635
startActivity(intent);
666636
finish();
667637
}, throwable -> handleError(this, new ErrorInfo(throwable,
668-
UserAction.SHARE_TO_NEWPIPE, "Starting info activity: " + currentUrl)))
638+
UserAction.SHARE_TO_NEWPIPE, "Starting info activity: " + currentUrl,
639+
null, currentUrl)))
669640
);
670641
return;
671642
}
@@ -852,10 +823,10 @@ private void openAddToPlaylistDialog(final int currentServiceId, final String cu
852823
})
853824
)),
854825
throwable -> runOnVisible(ctx -> handleError(ctx, new ErrorInfo(
855-
throwable,
856-
UserAction.REQUESTED_STREAM,
826+
throwable, UserAction.REQUESTED_STREAM,
857827
"Tried to add " + currentUrl + " to a playlist",
858-
((RouterActivity) ctx).currentService.getServiceId())
828+
((RouterActivity) ctx).currentService.getServiceId(),
829+
currentUrl)
859830
))
860831
)
861832
);
@@ -995,7 +966,7 @@ public void handleChoice(final Choice choice) {
995966
}
996967
}, throwable -> handleError(this, new ErrorInfo(throwable, finalUserAction,
997968
choice.url + " opened with " + choice.playerChoice,
998-
choice.serviceId)));
969+
choice.serviceId, choice.url)));
999970
}
1000971
}
1001972

‎app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -389,8 +389,7 @@ private void fetchStreamsSize() {
389389
}
390390
}, throwable -> ErrorUtil.showSnackbar(context,
391391
new ErrorInfo(throwable, UserAction.DOWNLOAD_OPEN_DIALOG,
392-
"Downloading video stream size",
393-
currentInfo.getServiceId()))));
392+
"Downloading video stream size", currentInfo))));
394393
disposables.add(StreamInfoWrapper.fetchMoreInfoForWrapper(getWrappedAudioStreams())
395394
.subscribe(result -> {
396395
if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId()
@@ -399,8 +398,7 @@ private void fetchStreamsSize() {
399398
}
400399
}, throwable -> ErrorUtil.showSnackbar(context,
401400
new ErrorInfo(throwable, UserAction.DOWNLOAD_OPEN_DIALOG,
402-
"Downloading audio stream size",
403-
currentInfo.getServiceId()))));
401+
"Downloading audio stream size", currentInfo))));
404402
disposables.add(StreamInfoWrapper.fetchMoreInfoForWrapper(wrappedSubtitleStreams)
405403
.subscribe(result -> {
406404
if (dialogBinding.videoAudioGroup.getCheckedRadioButtonId()
@@ -409,8 +407,7 @@ private void fetchStreamsSize() {
409407
}
410408
}, throwable -> ErrorUtil.showSnackbar(context,
411409
new ErrorInfo(throwable, UserAction.DOWNLOAD_OPEN_DIALOG,
412-
"Downloading subtitle stream size",
413-
currentInfo.getServiceId()))));
410+
"Downloading subtitle stream size", currentInfo))));
414411
}
415412

416413
private void setupAudioTrackSpinner() {

‎app/src/main/java/org/schabi/newpipe/error/AcraReportSender.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ public void send(@NonNull final Context context, @NonNull final CrashReportData
3636
ErrorUtil.openActivity(context, new ErrorInfo(
3737
new String[]{report.getString(ReportField.STACK_TRACE)},
3838
UserAction.UI_ERROR,
39-
ErrorInfo.SERVICE_NONE,
4039
"ACRA report",
40+
null,
4141
R.string.app_ui_crash));
4242
}
4343
}

‎app/src/main/java/org/schabi/newpipe/error/ErrorActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ protected void onCreate(final Bundle savedInstanceState) {
115115

116116
// normal bugreport
117117
buildInfo(errorInfo);
118-
activityErrorBinding.errorMessageView.setText(errorInfo.getMessageStringId());
118+
activityErrorBinding.errorMessageView.setText(errorInfo.getMessage(this));
119119
activityErrorBinding.errorView.setText(formErrorText(errorInfo.getStackTraces()));
120120

121121
// print stack trace once again for debugging:

0 commit comments

Comments
 (0)