diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java index f783df85e..2339de53a 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java @@ -224,7 +224,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment { private void importDatabase(final String filePath) { // check if file is supported - if (!manager.isValidZipFile(filePath)) { + if (!ZipHelper.isValidZipFile(filePath)) { Toast.makeText(getContext(), R.string.no_valid_zip_file, Toast.LENGTH_SHORT) .show(); return; diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt index f278c6b24..3ab3dc8f3 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt +++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt @@ -36,16 +36,6 @@ class ContentSettingsManager(private val fileLocator: NewPipeFileLocator) { } } - fun isValidZipFile(filePath: String): Boolean { - try { - ZipFile(filePath).use { - return@isValidZipFile true - } - } catch (ioe: IOException) { - return false - } - } - /** * Tries to create database directory if it does not exist. * diff --git a/app/src/main/java/org/schabi/newpipe/util/ZipHelper.java b/app/src/main/java/org/schabi/newpipe/util/ZipHelper.java index f9a950d2b..e2b766bb0 100644 --- a/app/src/main/java/org/schabi/newpipe/util/ZipHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/ZipHelper.java @@ -4,7 +4,9 @@ import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.io.IOException; import java.util.zip.ZipEntry; +import java.util.zip.ZipFile; import java.util.zip.ZipInputStream; import java.util.zip.ZipOutputStream; @@ -99,4 +101,12 @@ public final class ZipHelper { return found; } } + + public static boolean isValidZipFile(final String filePath) { + try (ZipFile ignored = new ZipFile(filePath)) { + return true; + } catch (final IOException ioe) { + return false; + } + } }