ReVanced-Mirror/revanced-integrations
1
0
Fork 0
mirror of https://github.com/revanced/revanced-integrations.git synced 2025-02-01 06:37:32 +01:00
Code Issues Projects Releases Wiki Activity

fix(youtube): resolve duplicate preference keys (#307)

Browse Source
This commit is contained in:
LisoUseInAIKyrios 2023-01-28 20:20:57 +04:00 committed by oSumAtrIX
parent 49aedae3fc
commit 27d1392a73
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java
View File

@ -11,12 +11,12 @@ import java.util.List;
public enum SettingsEnum { public enum SettingsEnum {
//Download Settings //Download Settings
// TODO: DOWNLOAD_PATH("revanced_download_path", Environment.getExternalStorageDirectory().getPath() + "/Download", ReturnType.STRING), // TODO: DOWNLOAD_PATH("revanced_download_path", Environment.getExternalStorageDirectory().getPath() + "/Download", ReturnType.STRING),
DOWNLOADS_BUTTON_SHOWN("revanced_downloads", true, ReturnType.BOOLEAN, true), DOWNLOADS_BUTTON_SHOWN("revanced_downloads_enabled", true, ReturnType.BOOLEAN, true),
DOWNLOADS_PACKAGE_NAME("revanced_downloads_package_name", "org.schabi.newpipe" /* NewPipe */, ReturnType.STRING), DOWNLOADS_PACKAGE_NAME("revanced_downloads_package_name", "org.schabi.newpipe" /* NewPipe */, ReturnType.STRING),
// Copy video URL settings // Copy video URL settings
COPY_VIDEO_URL_BUTTON_SHOWN("revanced_copy_video_url", true, ReturnType.BOOLEAN, true), COPY_VIDEO_URL_BUTTON_SHOWN("revanced_copy_video_url_enabled", true, ReturnType.BOOLEAN, true),
COPY_VIDEO_URL_TIMESTAMP_BUTTON_SHOWN("revanced_copy_video_url_timestamp", true, ReturnType.BOOLEAN, true), COPY_VIDEO_URL_TIMESTAMP_BUTTON_SHOWN("revanced_copy_video_url_timestamp_enabled", true, ReturnType.BOOLEAN, true),
// Video settings // Video settings
OLD_STYLE_VIDEO_QUALITY_PLAYER_SETTINGS("revanced_use_old_style_quality_settings", true, ReturnType.BOOLEAN), OLD_STYLE_VIDEO_QUALITY_PLAYER_SETTINGS("revanced_use_old_style_quality_settings", true, ReturnType.BOOLEAN),
@ -179,7 +179,13 @@ public enum SettingsEnum {
@Deprecated @Deprecated
DEPRECATED_BRANDING_SHOWN("revanced_branding_watermark_enabled", false, ReturnType.BOOLEAN), DEPRECATED_BRANDING_SHOWN("revanced_branding_watermark_enabled", false, ReturnType.BOOLEAN),
@Deprecated @Deprecated
DEPRECATED_REMEMBER_VIDEO_QUALITY("revanced_remember_video_quality_selection", false, ReturnType.BOOLEAN); DEPRECATED_REMEMBER_VIDEO_QUALITY("revanced_remember_video_quality_selection", false, ReturnType.BOOLEAN),
@Deprecated
DEPRECATED_DOWNLOADS_BUTTON_SHOWN("revanced_downloads", true, ReturnType.BOOLEAN, true),
@Deprecated
DEPRECATED_COPY_VIDEO_URL_BUTTON_SHOWN("revanced_copy_video_url", true, ReturnType.BOOLEAN, true),
@Deprecated
DEPRECATED_COPY_VIDEO_URL_TIMESTAMP_BUTTON_SHOWN("revanced_copy_video_url_timestamp", true, ReturnType.BOOLEAN, true);
// //
// end deprecated settings // end deprecated settings
// //
@ -250,7 +256,7 @@ public enum SettingsEnum {
} }
// //
// migrate preference of prior 'default off' settings, into replacement setting with different path name but otherwise is identical // renamed settings with new path names, but otherwise the new and old settings are identical
// //
SettingsEnum[][] renamedSettings = { SettingsEnum[][] renamedSettings = {
{DEPRECATED_HIDE_MIX_PLAYLISTS, HIDE_MIX_PLAYLISTS}, {DEPRECATED_HIDE_MIX_PLAYLISTS, HIDE_MIX_PLAYLISTS},
@ -260,16 +266,19 @@ public enum SettingsEnum {
{DEPRECATED_HIDE_PLAYLIST_BUTTON, HIDE_PLAYLIST_BUTTON}, {DEPRECATED_HIDE_PLAYLIST_BUTTON, HIDE_PLAYLIST_BUTTON},
{DEPRECATED_HIDE_ACTION_BUTTON, HIDE_ACTION_BUTTON}, {DEPRECATED_HIDE_ACTION_BUTTON, HIDE_ACTION_BUTTON},
{DEPRECATED_HIDE_SHARE_BUTTON, HIDE_SHARE_BUTTON}, {DEPRECATED_HIDE_SHARE_BUTTON, HIDE_SHARE_BUTTON},
{DEPRECATED_DOWNLOADS_BUTTON_SHOWN, DOWNLOADS_BUTTON_SHOWN},
{DEPRECATED_COPY_VIDEO_URL_BUTTON_SHOWN, COPY_VIDEO_URL_BUTTON_SHOWN},
{DEPRECATED_COPY_VIDEO_URL_TIMESTAMP_BUTTON_SHOWN, COPY_VIDEO_URL_TIMESTAMP_BUTTON_SHOWN},
}; };
for (SettingsEnum[] oldNewSetting : renamedSettings) { for (SettingsEnum[] oldNewSetting : renamedSettings) {
SettingsEnum oldSetting = oldNewSetting[0]; SettingsEnum oldSetting = oldNewSetting[0];
SettingsEnum newSetting = oldNewSetting[1]; SettingsEnum newSetting = oldNewSetting[1];
if (oldSetting.getBoolean()) { if (!oldSetting.value.equals(oldSetting.defaultValue)) {
LogHelper.printInfo(() -> "Migrating enabled setting from: " + oldSetting LogHelper.printInfo(() -> "Migrating old setting of '" + oldSetting.value
+ " into replacement setting: " + newSetting); + "' from: " + oldSetting + " into replacement setting: " + newSetting);
newSetting.saveValue(true); newSetting.saveValue(oldSetting.value);
oldSetting.saveValue(false); oldSetting.saveValue(oldSetting.getDefaultValue()); // reset old value
} }
} }
// //