From f0167f2d933fb6e7d09cc2dd8b1b83c220faa6bb Mon Sep 17 00:00:00 2001
From: junhuicoding <chuajunhui.work@gmail.com>
Date: Sat, 3 Apr 2021 01:24:13 +0800
Subject: [PATCH] Resolve PR comments

---
 .../fragments/settings/DownloadsPreferencesFragment.java      | 2 +-
 app/src/main/java/awais/instagrabber/utils/DownloadUtils.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/awais/instagrabber/fragments/settings/DownloadsPreferencesFragment.java b/app/src/main/java/awais/instagrabber/fragments/settings/DownloadsPreferencesFragment.java
index 63a22dd8..4e75a97f 100644
--- a/app/src/main/java/awais/instagrabber/fragments/settings/DownloadsPreferencesFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/settings/DownloadsPreferencesFragment.java
@@ -53,7 +53,7 @@ public class DownloadsPreferencesFragment extends BasePreferencesFragment {
     private Preference getPrependUsernameToFilenamePreference(@NonNull final Context context) {
         final SwitchPreferenceCompat preference = new SwitchPreferenceCompat(context);
         preference.setKey(Constants.DOWNLOAD_PREPEND_USER_NAME);
-        preference.setTitle("Prepend Username to Filename");
+        preference.setTitle(R.string.download_prepend_username);
         preference.setIconSpaceReserved(false);
         return preference;
     }
diff --git a/app/src/main/java/awais/instagrabber/utils/DownloadUtils.java b/app/src/main/java/awais/instagrabber/utils/DownloadUtils.java
index cb3c5273..52b6a41d 100644
--- a/app/src/main/java/awais/instagrabber/utils/DownloadUtils.java
+++ b/app/src/main/java/awais/instagrabber/utils/DownloadUtils.java
@@ -142,7 +142,7 @@ public final class DownloadUtils {
                                             final String sliderPostfix,
                                             final String displayUrl,
                                             final String username) {
-        final String usernamePrepend = "".equals(username) ? "" : "@" + username + "_";
+        final String usernamePrepend = TextUtils.isEmpty(username) ? "" : "@" + username + "_";
         final String fileName = usernamePrepend + postId + sliderPostfix + getFileExtensionFromUrl(displayUrl);
         return new File(finalDir, fileName);
     }
@@ -228,7 +228,7 @@ public final class DownloadUtils {
                     final Media child = sliderItems.get(i);
                     if (child == null) continue;
                     final String url = ResponseBodyUtils.getImageUrl(child);
-                    final File file = getDownloadChildSaveFile(downloadDir, media.getCode(), i + 1, url, username);
+                    final File file = getDownloadChildSaveFile(downloadDir, media.getCode(), i + 1, url, usernamePrepend);
                     checkList.add(file.exists());
                 }
                 break;