Skip to content

Commit deb5425

Browse files
StypoxStypox
committed
Merge branch 'dev' into refactor
2 parents 2915ab6 + 9bc8139 commit deb5425

File tree

117 files changed

+830
-489
lines changed

Some content is hidden

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

117 files changed

+830
-489
lines changed

‎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/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/fragments/list/search/SearchFragment.java‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,15 +1095,25 @@ private void handleSearchSuggestion() {
10951095
public void handleNextItems(final ListExtractor.InfoItemsPage<?> result) {
10961096
showListFooter(false);
10971097
infoListAdapter.addInfoItemList(result.getItems());
1098-
nextPage = result.getNextPage();
10991098

1100-
if (!result.getErrors().isEmpty() && nextPage != null) {
1101-
showSnackBarError(new ErrorInfo(result.getErrors(), UserAction.SEARCHED,
1102-
"\"" + searchString + "\" → pageUrl: " + nextPage.getUrl() + ", "
1103-
+ "pageIds: " + nextPage.getIds() + ", "
1104-
+ "pageCookies: " + nextPage.getCookies(),
1105-
serviceId));
1099+
if (!result.getErrors().isEmpty()) {
1100+
// nextPage should be non-null at this point, because it refers to the page
1101+
// whose results are handled here, but let's check it anyway
1102+
if (nextPage == null) {
1103+
showSnackBarError(new ErrorInfo(result.getErrors(), UserAction.SEARCHED,
1104+
"\"" + searchString + "\" → nextPage == null", serviceId));
1105+
} else {
1106+
showSnackBarError(new ErrorInfo(result.getErrors(), UserAction.SEARCHED,
1107+
"\"" + searchString + "\" → pageUrl: " + nextPage.getUrl() + ", "
1108+
+ "pageIds: " + nextPage.getIds() + ", "
1109+
+ "pageCookies: " + nextPage.getCookies(),
1110+
serviceId));
1111+
}
11061112
}
1113+
1114+
// keep the reassignment of nextPage after the error handling to ensure that nextPage
1115+
// still holds the correct value during the error handling
1116+
nextPage = result.getNextPage();
11071117
super.handleNextItems(result);
11081118
}
11091119

‎app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java‎

Lines changed: 63 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,9 @@
3333
import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
3434
import com.google.android.exoplayer2.ui.AspectRatioFrameLayout.ResizeMode;
3535
import com.google.android.exoplayer2.ui.CaptionStyleCompat;
36-
import com.google.android.exoplayer2.util.MimeTypes;
3736

3837
import org.schabi.newpipe.R;
3938
import org.schabi.newpipe.extractor.InfoItem;
40-
import org.schabi.newpipe.extractor.MediaFormat;
4139
import org.schabi.newpipe.extractor.stream.StreamInfo;
4240
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
4341
import org.schabi.newpipe.extractor.stream.SubtitlesStream;
@@ -47,13 +45,14 @@
4745
import org.schabi.newpipe.player.playqueue.PlayQueueItem;
4846
import org.schabi.newpipe.player.playqueue.SinglePlayQueue;
4947
import org.schabi.newpipe.util.ListHelper;
48+
import org.schabi.newpipe.util.Localization;
5049

5150
import java.lang.annotation.Retention;
5251
import java.text.DecimalFormat;
52+
import java.text.DecimalFormatSymbols;
5353
import java.text.NumberFormat;
5454
import java.util.ArrayList;
5555
import java.util.Collections;
56-
import java.util.Formatter;
5756
import java.util.HashSet;
5857
import java.util.List;
5958
import java.util.Locale;
@@ -62,11 +61,7 @@
6261
import java.util.concurrent.TimeUnit;
6362

6463
public final class PlayerHelper {
65-
private static final StringBuilder STRING_BUILDER = new StringBuilder();
66-
private static final Formatter STRING_FORMATTER =
67-
new Formatter(STRING_BUILDER, Locale.getDefault());
68-
private static final NumberFormat SPEED_FORMATTER = new DecimalFormat("0.##x");
69-
private static final NumberFormat PITCH_FORMATTER = new DecimalFormat("##%");
64+
private static final FormattersProvider FORMATTERS_PROVIDER = new FormattersProvider();
7065

7166
@Retention(SOURCE)
7267
@IntDef({AUTOPLAY_TYPE_ALWAYS, AUTOPLAY_TYPE_WIFI,
@@ -89,9 +84,11 @@ public final class PlayerHelper {
8984
private PlayerHelper() {
9085
}
9186

92-
////////////////////////////////////////////////////////////////////////////
93-
// Exposed helpers
94-
////////////////////////////////////////////////////////////////////////////
87+
// region Exposed helpers
88+
89+
public static void resetFormat() {
90+
FORMATTERS_PROVIDER.reset();
91+
}
9592

9693
@NonNull
9794
public static String getTimeString(final int milliSeconds) {
@@ -100,35 +97,24 @@ public static String getTimeString(final int milliSeconds) {
10097
final int hours = (milliSeconds % 86400000) / 3600000;
10198
final int days = (milliSeconds % (86400000 * 7)) / 86400000;
10299

103-
STRING_BUILDER.setLength(0);
104-
return (days > 0
105-
? STRING_FORMATTER.format("%d:%02d:%02d:%02d", days, hours, minutes, seconds)
106-
: hours > 0
107-
? STRING_FORMATTER.format("%d:%02d:%02d", hours, minutes, seconds)
108-
: STRING_FORMATTER.format("%02d:%02d", minutes, seconds)
109-
).toString();
100+
final Formatters formatters = FORMATTERS_PROVIDER.formatters();
101+
if (days > 0) {
102+
return formatters.stringFormat("%d:%02d:%02d:%02d", days, hours, minutes, seconds);
103+
}
104+
105+
return hours > 0
106+
? formatters.stringFormat("%d:%02d:%02d", hours, minutes, seconds)
107+
: formatters.stringFormat("%02d:%02d", minutes, seconds);
110108
}
111109

112110
@NonNull
113111
public static String formatSpeed(final double speed) {
114-
return SPEED_FORMATTER.format(speed);
112+
return FORMATTERS_PROVIDER.formatters().speed().format(speed);
115113
}
116114

117115
@NonNull
118116
public static String formatPitch(final double pitch) {
119-
return PITCH_FORMATTER.format(pitch);
120-
}
121-
122-
@NonNull
123-
public static String subtitleMimeTypesOf(@NonNull final MediaFormat format) {
124-
switch (format) {
125-
case VTT:
126-
return MimeTypes.TEXT_VTT;
127-
case TTML:
128-
return MimeTypes.APPLICATION_TTML;
129-
default:
130-
throw new IllegalArgumentException("Unrecognized mime type: " + format.name());
131-
}
117+
return FORMATTERS_PROVIDER.formatters().pitch().format(pitch);
132118
}
133119

134120
@NonNull
@@ -219,9 +205,8 @@ public static PlayQueue autoQueueOf(@NonNull final StreamInfo info,
219205
? null : getAutoQueuedSinglePlayQueue(autoQueueItems.get(0));
220206
}
221207

222-
////////////////////////////////////////////////////////////////////////////
223-
// Settings Resolution
224-
////////////////////////////////////////////////////////////////////////////
208+
// endregion
209+
// region Resolution
225210

226211
public static boolean isResumeAfterAudioFocusGain(@NonNull final Context context) {
227212
return getPreferences(context)
@@ -405,9 +390,8 @@ public static int getProgressiveLoadIntervalBytes(@NonNull final Context context
405390
return Integer.parseInt(preferredIntervalBytes) * 1024;
406391
}
407392

408-
////////////////////////////////////////////////////////////////////////////
409-
// Private helpers
410-
////////////////////////////////////////////////////////////////////////////
393+
// endregion
394+
// region Private helpers
411395

412396
@NonNull
413397
private static SharedPreferences getPreferences(@NonNull final Context context) {
@@ -427,9 +411,8 @@ private static SinglePlayQueue getAutoQueuedSinglePlayQueue(
427411
}
428412

429413

430-
////////////////////////////////////////////////////////////////////////////
431-
// Utils used by player
432-
////////////////////////////////////////////////////////////////////////////
414+
// endregion
415+
// region Utils used by player
433416

434417
@RepeatMode
435418
public static int nextRepeatMode(@RepeatMode final int repeatMode) {
@@ -503,4 +486,43 @@ public static int retrieveSeekDurationFromPreferences(final Player player) {
503486
player.getContext().getString(R.string.seek_duration_key),
504487
player.getContext().getString(R.string.seek_duration_default_value))));
505488
}
489+
490+
// endregion
491+
// region Format
492+
493+
static class FormattersProvider {
494+
private Formatters formatters;
495+
496+
public Formatters formatters() {
497+
if (formatters == null) {
498+
formatters = Formatters.create();
499+
}
500+
return formatters;
501+
}
502+
503+
public void reset() {
504+
formatters = null;
505+
}
506+
}
507+
508+
record Formatters(
509+
Locale locale,
510+
NumberFormat speed,
511+
NumberFormat pitch) {
512+
513+
static Formatters create() {
514+
final Locale locale = Localization.getAppLocale();
515+
final DecimalFormatSymbols dfs = DecimalFormatSymbols.getInstance(locale);
516+
return new Formatters(
517+
locale,
518+
new DecimalFormat("0.##x", dfs),
519+
new DecimalFormat("##%", dfs));
520+
}
521+
522+
String stringFormat(final String format, final Object... args) {
523+
return String.format(locale, format, args);
524+
}
525+
}
526+
527+
// endregion
506528
}

‎app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.schabi.newpipe.DownloaderImpl;
1717
import org.schabi.newpipe.R;
1818
import org.schabi.newpipe.extractor.NewPipe;
19+
import org.schabi.newpipe.player.helper.PlayerHelper;
1920
import org.schabi.newpipe.util.Localization;
2021
import org.schabi.newpipe.util.image.ImageStrategy;
2122
import org.schabi.newpipe.util.image.PreferredImageQuality;
@@ -106,5 +107,6 @@ public void onDestroy() {
106107
NewPipe.setupLocalization(
107108
Localization.getPreferredLocalization(context),
108109
Localization.getPreferredContentCountry(context));
110+
PlayerHelper.resetFormat();
109111
}
110112
}

‎app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
import org.schabi.newpipe.App;
1515
import org.schabi.newpipe.R;
16+
import org.schabi.newpipe.settings.migration.MigrationManager;
1617
import org.schabi.newpipe.util.DeviceUtils;
1718

1819
import java.io.File;
@@ -46,7 +47,7 @@ private NewPipeSettings() { }
4647

4748
public static void initSettings(final Context context) {
4849
// first run migrations, then setDefaultValues, since the latter requires the correct types
49-
SettingMigrations.runMigrationsIfNeeded(context);
50+
MigrationManager.runMigrationsIfNeeded(context);
5051

5152
// readAgain is true so that if new settings are added their default value is set
5253
PreferenceManager.setDefaultValues(context, R.xml.main_settings, true);

0 commit comments

Comments
 (0)