Skip to content

Commit

Permalink
Fix compile error caused by auto merging
Browse files Browse the repository at this point in the history
TeamNewPipe#5176 changed `homeDir` from type `String` to `File`. TeamNewPipe#5059 was based on `homeDir` being a `String`. It was incorrectly auto-resolved by git.
  • Loading branch information
XiangRongLin committed Dec 15, 2020
1 parent 7e469ea commit 2c93aef
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public void onCreatePreferences(final Bundle savedInstanceState, final String ro
newpipeSettings = new File(homeDir, "/databases/newpipe.settings");
newpipeSettings.delete();

manager = new ContentSettingsManager(homeDir);
manager = new ContentSettingsManager(homeDir.getAbsolutePath());

addPreferencesFromResource(R.xml.content_settings);

Expand Down

0 comments on commit 2c93aef

Please sign in to comment.