Skip to content

Commit 51e72d1

Browse files
authored
Removed the "(beta)"-tag from services (TeamNewPipe#8637)
1 parent 8f37015 commit 51e72d1

2 files changed

Lines changed: 4 additions & 14 deletions

File tree

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -374,26 +374,25 @@ private void toggleServices() {
374374

375375
private void showServices() {
376376
for (final StreamingService s : NewPipe.getServices()) {
377-
final String title = s.getServiceInfo().getName()
378-
+ (ServiceHelper.isBeta(s) ? " (beta)" : "");
377+
final String title = s.getServiceInfo().getName();
379378

380379
final MenuItem menuItem = drawerLayoutBinding.navigation.getMenu()
381380
.add(R.id.menu_services_group, s.getServiceId(), ORDER, title)
382381
.setIcon(ServiceHelper.getIcon(s.getServiceId()));
383382

384383
// peertube specifics
385384
if (s.getServiceId() == 3) {
386-
enhancePeertubeMenu(s, menuItem);
385+
enhancePeertubeMenu(menuItem);
387386
}
388387
}
389388
drawerLayoutBinding.navigation.getMenu()
390389
.getItem(ServiceHelper.getSelectedServiceId(this))
391390
.setChecked(true);
392391
}
393392

394-
private void enhancePeertubeMenu(final StreamingService s, final MenuItem menuItem) {
393+
private void enhancePeertubeMenu(final MenuItem menuItem) {
395394
final PeertubeInstance currentInstance = PeertubeHelper.getCurrentInstance();
396-
menuItem.setTitle(currentInstance.getName() + (ServiceHelper.isBeta(s) ? " (beta)" : ""));
395+
menuItem.setTitle(currentInstance.getName());
397396
final Spinner spinner = InstanceSpinnerLayoutBinding.inflate(LayoutInflater.from(this))
398397
.getRoot();
399398
final List<PeertubeInstance> instances = PeertubeHelper.getInstanceList(this);

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -169,15 +169,6 @@ public static long getCacheExpirationMillis(final int serviceId) {
169169
}
170170
}
171171

172-
public static boolean isBeta(final StreamingService s) {
173-
switch (s.getServiceInfo().getName()) {
174-
case "YouTube":
175-
return false;
176-
default:
177-
return true;
178-
}
179-
}
180-
181172
public static void initService(final Context context, final int serviceId) {
182173
if (serviceId == ServiceList.PeerTube.getServiceId()) {
183174
final SharedPreferences sharedPreferences = PreferenceManager

0 commit comments

Comments
 (0)