From a7723373a0fc846323e34556c40688055e9f9a02 Mon Sep 17 00:00:00 2001
From: XiangRongLin <41164160+XiangRongLin@users.noreply.github.com>
Date: Tue, 15 Dec 2020 20:18:25 +0100
Subject: [PATCH] Fix compile error caused by auto merging

#5176 changed `homeDir` from type `String` to `File`. #5059 was based on `homeDir` being a `String`. It was incorrectly auto-resolved by git.
---
 .../org/schabi/newpipe/settings/ContentSettingsManager.kt   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 b0ea89993..2682ac5e0 100644
--- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
+++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
@@ -15,9 +15,9 @@ class ContentSettingsManager(
     private val newpipeSettings: File
 ) {
 
-    constructor(homeDir: String) : this(
-        File("$homeDir/databases/newpipe.db"),
-        File("$homeDir/databases/newpipe.settings")
+    constructor(homeDir: File) : this(
+        File(homeDir, "databases/newpipe.db"),
+        File(homeDir, "databases/newpipe.settings")
     )
 
     /**