Skip to content
Merged
Changes from all commits
Commits
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
15 changes: 9 additions & 6 deletions app/src/main/java/org/schabi/newpipe/util/StateSaver.java
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@ public static void init(final Context context) {
}

/**
* @see #tryToRestore(SavedState, WriteRead)
* @param outState
* @param writeRead
* @return the saved state
* @see #tryToRestore(SavedState, WriteRead)
*/
public static SavedState tryToRestore(final Bundle outState, final WriteRead writeRead) {
if (outState == null || writeRead == null) {
Expand All @@ -93,6 +93,7 @@ public static SavedState tryToRestore(final Bundle outState, final WriteRead wri
/**
* Try to restore the state from memory and disk,
* using the {@link StateSaver.WriteRead#readFrom(Queue)} from the writeRead.
*
* @param savedState
* @param writeRead
* @return the saved state
Expand Down Expand Up @@ -143,19 +144,18 @@ private static SavedState tryToRestore(@NonNull final SavedState savedState,
}

/**
* @see #tryToSave(boolean, String, String, WriteRead)
* @param isChangingConfig
* @param savedState
* @param outState
* @param writeRead
* @return the saved state or {@code null}
* @see #tryToSave(boolean, String, String, WriteRead)
*/
@Nullable
public static SavedState tryToSave(final boolean isChangingConfig,
@Nullable final SavedState savedState, final Bundle outState,
final WriteRead writeRead) {
@NonNull
final String currentSavedPrefix;
@NonNull final String currentSavedPrefix;
if (savedState == null || TextUtils.isEmpty(savedState.getPrefixFileSaved())) {
// Generate unique prefix
currentSavedPrefix = System.nanoTime() - writeRead.hashCode() + "";
Expand Down Expand Up @@ -299,8 +299,11 @@ public static void clearStateFiles() {

cacheDir = new File(cacheDir, CACHE_DIR_NAME);
if (cacheDir.exists()) {
for (final File file : cacheDir.listFiles()) {
file.delete();
final File[] list = cacheDir.listFiles();
if (list != null) {
for (final File file : list) {
file.delete();
}
}
}
}
Expand Down