Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix NPEs after OnSharedPreferenceChangeListener changes #9696

Merged
merged 3 commits into from
Jan 17, 2023
+20 −23
Merged

Fix NPEs after OnSharedPreferenceChangeListener changes #9696

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9378a7
Fix NPEs after OnSharedPreferenceChangeListener changes
Stypox Jan 16, 2023
640d4b0
Fix more NPEs after OnSharedPreferenceChangeListener changes
TobiGr Jan 16, 2023
e9fcad4
Fix SonarLint
TobiGr Jan 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix NPEs after OnSharedPreferenceChangeListener changes 
Apps targeting {@link android.os.Build.VERSION_CODES#R} on devices running OS versions {@link android.os.Build.VERSION_CODES#R Android R} or later, will receive a {@code null} value when preferences are cleared.
@Stypox
Stypox committed Jan 16, 2023
commit b9378a7c1fedee40ec0ba16a42aba113f0659cc7
6 changes: 3 additions & 3 deletions app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java
View file
Original file line number Diff line number Diff line change
@@ -172,13 +172,13 @@ public final class VideoDetailFragment

private final SharedPreferences.OnSharedPreferenceChangeListener preferenceChangeListener =
(sharedPreferences, key) -> {
if (key.equals(getString(R.string.show_comments_key))) {
if (getString(R.string.show_comments_key).equals(key)) {
showComments = sharedPreferences.getBoolean(key, true);
tabSettingsChanged = true;
} else if (key.equals(getString(R.string.show_next_video_key))) {
} else if (getString(R.string.show_next_video_key).equals(key)) {
showRelatedItems = sharedPreferences.getBoolean(key, true);
tabSettingsChanged = true;
} else if (key.equals(getString(R.string.show_description_key))) {
} else if (getString(R.string.show_description_key).equals(key)) {
showDescription = sharedPreferences.getBoolean(key, true);
tabSettingsChanged = true;
}
2 changes: 1 addition & 1 deletion app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java
View file
Original file line number Diff line number Diff line change
@@ -474,7 +474,7 @@ public void handleError() {
@Override
public void onSharedPreferenceChanged(final SharedPreferences sharedPreferences,
final String key) {
if (key.equals(getString(R.string.list_view_mode_key))) {
if (getString(R.string.list_view_mode_key).equals(key)) {
updateFlags |= LIST_MODE_UPDATE_FLAG;
}
}
8 changes: 3 additions & 5 deletions app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedItemsFragment.java
View file
Original file line number Diff line number Diff line change
@@ -159,11 +159,9 @@ protected void onRestoreInstanceState(@NonNull final Bundle savedState) {

@Override
public void onSharedPreferenceChanged(final SharedPreferences sharedPreferences,
final String s) {
if (headerBinding != null) {
headerBinding.autoplaySwitch.setChecked(
sharedPreferences.getBoolean(
getString(R.string.auto_queue_key), false));
final String key) {
if (headerBinding != null && getString(R.string.auto_queue_key).equals(key)) {
headerBinding.autoplaySwitch.setChecked(sharedPreferences.getBoolean(key, false));
}
}

2 changes: 1 addition & 1 deletion app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java
View file
Original file line number Diff line number Diff line change
@@ -261,7 +261,7 @@ public void handleError() {
@Override
public void onSharedPreferenceChanged(final SharedPreferences sharedPreferences,
final String key) {
if (key.equals(getString(R.string.list_view_mode_key))) {
if (getString(R.string.list_view_mode_key).equals(key)) {
updateFlags |= LIST_MODE_UPDATE_FLAG;
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/org/schabi/newpipe/settings/tabs/TabsManager.java
View file
Original file line number Diff line number Diff line change
@@ -73,7 +73,7 @@ public void unsetSavedTabsListener() {

private SharedPreferences.OnSharedPreferenceChangeListener getPreferenceChangeListener() {
return (sp, key) -> {
if (key.equals(savedTabsKey)) {
if (savedTabsKey.equals(key)) {
if (savedTabsChangeListener != null) {
savedTabsChangeListener.onTabsChanged();
}
10 changes: 5 additions & 5 deletions app/src/main/java/us/shandian/giga/service/DownloadManagerService.java
View file
Original file line number Diff line number Diff line change
@@ -310,21 +310,21 @@ private void handleConnectivityState(boolean updateOnly) {
}

private void handlePreferenceChange(SharedPreferences prefs, @NonNull String key) {
if (key.equals(getString(R.string.downloads_maximum_retry))) {
if (getString(R.string.downloads_maximum_retry).equals(key)) {
try {
String value = prefs.getString(key, getString(R.string.downloads_maximum_retry_default));
mManager.mPrefMaxRetry = value == null ? 0 : Integer.parseInt(value);
} catch (Exception e) {
mManager.mPrefMaxRetry = 0;
}
mManager.updateMaximumAttempts();
} else if (key.equals(getString(R.string.downloads_cross_network))) {
} else if (getString(R.string.downloads_cross_network).equals(key)) {
mManager.mPrefMeteredDownloads = prefs.getBoolean(key, false);
} else if (key.equals(getString(R.string.downloads_queue_limit))) {
} else if (getString(R.string.downloads_queue_limit).equals(key)) {
mManager.mPrefQueueLimit = prefs.getBoolean(key, true);
} else if (key.equals(getString(R.string.download_path_video_key))) {
} else if (getString(R.string.download_path_video_key).equals(key)) {
mManager.mMainStorageVideo = loadMainVideoStorage();
} else if (key.equals(getString(R.string.download_path_audio_key))) {
} else if (getString(R.string.download_path_audio_key).equals(key)) {
mManager.mMainStorageAudio = loadMainAudioStorage();
}
}