From 0bdf8de38e38924d7b9f0d862821306a829e7c74 Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Sun, 20 Jun 2021 09:22:43 +0200
Subject: [PATCH] Resolve sonar issues in ContentSettingsFragment

https://sonarcloud.io/organizations/teamnewpipe/rules?open=java%3AS2885&rule_key=java%3AS2885

https://sonarcloud.io/organizations/teamnewpipe/rules?open=java%3AS112&rule_key=java%3AS112
---
 .../newpipe/settings/ContentSettingsFragment.java     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

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 0d67c9a48..ce462982a 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
@@ -33,6 +33,7 @@ import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.ZipHelper;
 
 import java.io.File;
+import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
@@ -43,7 +44,8 @@ import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 
 public class ContentSettingsFragment extends BasePreferenceFragment {
     private static final String ZIP_MIME_TYPE = "application/zip";
-    private static final SimpleDateFormat EXPORT_DATE_FORMAT
+
+    private final SimpleDateFormat exportDateFormat
             = new SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US);
 
     private ContentSettingsManager manager;
@@ -52,7 +54,8 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
     private String thumbnailLoadToggleKey;
     private String youtubeRestrictedModeEnabledKey;
 
-    @Nullable private Uri lastImportExportDataUri = null;
+    @Nullable
+    private Uri lastImportExportDataUri = null;
     private Localization initialSelectedLocalization;
     private ContentCountry initialSelectedContentCountry;
     private String initialLanguage;
@@ -86,7 +89,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
 
             requestExportPathLauncher.launch(
                     StoredFileHelper.getNewPicker(requireContext(),
-                            "NewPipeData-" + EXPORT_DATE_FORMAT.format(new Date()) + ".zip",
+                            "NewPipeData-" + exportDateFormat.format(new Date()) + ".zip",
                             ZIP_MIME_TYPE, getImportExportDataUri()));
             return true;
         });
@@ -216,7 +219,7 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
 
         try {
             if (!manager.ensureDbDirectoryExists()) {
-                throw new Exception("Could not create databases dir");
+                throw new IOException("Could not create databases dir");
             }
 
             if (!manager.extractDb(file)) {