Skip to content

Commit d71af9a

Browse files
committed
Introduce constants for some Strings that indicate no data in Tab class
1 parent a163d54 commit d71af9a

1 file changed

Lines changed: 16 additions & 10 deletions

File tree

  • app/src/main/java/org/schabi/newpipe/settings/tabs

app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@
3636
public abstract class Tab {
3737
private static final String JSON_TAB_ID_KEY = "tab_id";
3838

39+
private static final String NO_NAME = "<no-name>";
40+
private static final String NO_ID = "<no-id>";
41+
private static final String NO_URL = "<no-url>";
42+
3943
Tab() {
4044
}
4145

@@ -185,7 +189,9 @@ public int getTabId() {
185189

186190
@Override
187191
public String getTabName(final Context context) {
188-
return "NewPipe"; //context.getString(R.string.blank_page_summary);
192+
// TODO: find a better name for the blank tab (maybe "blank_tab") or replace it with
193+
// context.getString(R.string.app_name);
194+
return "NewPipe"; // context.getString(R.string.blank_page_summary);
189195
}
190196

191197
@DrawableRes
@@ -309,7 +315,7 @@ public static class KioskTab extends Tab {
309315
private String kioskId;
310316

311317
private KioskTab() {
312-
this(-1, "<no-id>");
318+
this(-1, NO_ID);
313319
}
314320

315321
public KioskTab(final int kioskServiceId, final String kioskId) {
@@ -357,7 +363,7 @@ protected void writeDataToJson(final JsonSink writerSink) {
357363
@Override
358364
protected void readDataFromJson(final JsonObject jsonObject) {
359365
kioskServiceId = jsonObject.getInt(JSON_KIOSK_SERVICE_ID_KEY, -1);
360-
kioskId = jsonObject.getString(JSON_KIOSK_ID_KEY, "<no-id>");
366+
kioskId = jsonObject.getString(JSON_KIOSK_ID_KEY, NO_ID);
361367
}
362368

363369
@Override
@@ -395,7 +401,7 @@ public static class ChannelTab extends Tab {
395401
private String channelName;
396402

397403
private ChannelTab() {
398-
this(-1, "<no-url>", "<no-name>");
404+
this(-1, NO_URL, NO_NAME);
399405
}
400406

401407
public ChannelTab(final int channelServiceId, final String channelUrl,
@@ -440,8 +446,8 @@ protected void writeDataToJson(final JsonSink writerSink) {
440446
@Override
441447
protected void readDataFromJson(final JsonObject jsonObject) {
442448
channelServiceId = jsonObject.getInt(JSON_CHANNEL_SERVICE_ID_KEY, -1);
443-
channelUrl = jsonObject.getString(JSON_CHANNEL_URL_KEY, "<no-url>");
444-
channelName = jsonObject.getString(JSON_CHANNEL_NAME_KEY, "<no-name>");
449+
channelUrl = jsonObject.getString(JSON_CHANNEL_URL_KEY, NO_URL);
450+
channelName = jsonObject.getString(JSON_CHANNEL_NAME_KEY, NO_NAME);
445451
}
446452

447453
@Override
@@ -527,15 +533,15 @@ public static class PlaylistTab extends Tab {
527533
private LocalItemType playlistType;
528534

529535
private PlaylistTab() {
530-
this(-1, "<no-name>");
536+
this(-1, NO_NAME);
531537
}
532538

533539
public PlaylistTab(final long playlistId, final String playlistName) {
534540
this.playlistName = playlistName;
535541
this.playlistId = playlistId;
536542
this.playlistType = LocalItemType.PLAYLIST_LOCAL_ITEM;
537543
this.playlistServiceId = -1;
538-
this.playlistUrl = "<no-url>";
544+
this.playlistUrl = NO_URL;
539545
}
540546

541547
public PlaylistTab(final int playlistServiceId, final String playlistUrl,
@@ -589,8 +595,8 @@ protected void writeDataToJson(final JsonSink writerSink) {
589595
@Override
590596
protected void readDataFromJson(final JsonObject jsonObject) {
591597
playlistServiceId = jsonObject.getInt(JSON_PLAYLIST_SERVICE_ID_KEY, -1);
592-
playlistUrl = jsonObject.getString(JSON_PLAYLIST_URL_KEY, "<no-url>");
593-
playlistName = jsonObject.getString(JSON_PLAYLIST_NAME_KEY, "<no-name>");
598+
playlistUrl = jsonObject.getString(JSON_PLAYLIST_URL_KEY, NO_URL);
599+
playlistName = jsonObject.getString(JSON_PLAYLIST_NAME_KEY, NO_NAME);
594600
playlistId = jsonObject.getInt(JSON_PLAYLIST_ID_KEY, -1);
595601
playlistType = LocalItemType.valueOf(
596602
jsonObject.getString(JSON_PLAYLIST_TYPE_KEY,

0 commit comments

Comments
 (0)