From b3e97c4418793444a2b65984793c59239fba2ca7 Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Mon, 21 Mar 2016 21:44:11 +0100 Subject: [PATCH] move getFilesystemBrowseStart into FileUtils Thats far better than extending PlaybackActivity just for this --- .../android/vanilla/FileSystemAdapter.java | 4 +--- .../android/vanilla/FileUtils.java | 19 ++++++++++++++++--- .../vanilla/FilebrowserStartActivity.java | 7 ++----- .../android/vanilla/PlaybackActivity.java | 12 ------------ 4 files changed, 19 insertions(+), 23 deletions(-) diff --git a/src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java b/src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java index 36557a4a..2d480f5d 100644 --- a/src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java +++ b/src/ch/blinkenlights/android/vanilla/FileSystemAdapter.java @@ -26,8 +26,6 @@ package ch.blinkenlights.android.vanilla; import android.content.Context; import android.content.Intent; import android.graphics.drawable.Drawable; -import android.net.Uri; -import android.os.Environment; import android.os.FileObserver; import android.util.Log; import android.view.LayoutInflater; @@ -136,7 +134,7 @@ public class FileSystemAdapter mFolderIcon = activity.getResources().getDrawable(R.drawable.folder); mInflater = (LayoutInflater)activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); if (limiter == null) { - limiter = buildLimiter( activity.getFilesystemBrowseStart() ); + limiter = buildLimiter( FileUtils.getFilesystemBrowseStart(activity) ); } setLimiter(limiter); } diff --git a/src/ch/blinkenlights/android/vanilla/FileUtils.java b/src/ch/blinkenlights/android/vanilla/FileUtils.java index bd84abd5..7eac6d37 100644 --- a/src/ch/blinkenlights/android/vanilla/FileUtils.java +++ b/src/ch/blinkenlights/android/vanilla/FileUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2015 Adrian Ulrich + * Copyright (C) 2015-2016 Adrian Ulrich * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -17,11 +17,15 @@ package ch.blinkenlights.android.vanilla; -import android.content.Intent; -import android.net.Uri; import java.io.File; import java.net.URLConnection; +import android.content.Context; +import android.content.Intent; +import android.content.SharedPreferences; +import android.net.Uri; +import android.os.Environment; + /** * Provides some static File-related utility functions. @@ -75,4 +79,13 @@ public class FileUtils { return handled; } + /** + * Called by FileSystem adapter to get the start folder + * for browsing directories + */ + public static File getFilesystemBrowseStart(Context context) { + SharedPreferences prefs = PlaybackService.getSettings(context); + String folder = prefs.getString(PrefKeys.FILESYSTEM_BROWSE_START, PrefDefaults.FILESYSTEM_BROWSE_START); + return new File( folder.equals("") ? Environment.getExternalStorageDirectory().getAbsolutePath() : folder ); + } } diff --git a/src/ch/blinkenlights/android/vanilla/FilebrowserStartActivity.java b/src/ch/blinkenlights/android/vanilla/FilebrowserStartActivity.java index 20d8a16f..d3045a2e 100644 --- a/src/ch/blinkenlights/android/vanilla/FilebrowserStartActivity.java +++ b/src/ch/blinkenlights/android/vanilla/FilebrowserStartActivity.java @@ -17,7 +17,6 @@ package ch.blinkenlights.android.vanilla; -import java.util.ArrayList; import java.util.Arrays; import java.io.File; import android.app.Activity; @@ -27,14 +26,12 @@ import android.view.MenuItem; import android.view.Menu; import android.widget.TextView; import android.widget.Button; -import android.widget.AdapterView; -import android.widget.AdapterView.OnItemClickListener; import android.widget.ListView; import android.widget.Toast; import android.content.SharedPreferences; -public class FilebrowserStartActivity extends PlaybackActivity { +public class FilebrowserStartActivity extends Activity { private ListView mListView; private TextView mPathDisplay; @@ -50,7 +47,7 @@ public class FilebrowserStartActivity extends PlaybackActivity { setTitle(R.string.filebrowser_start); setContentView(R.layout.filebrowser_content); - mCurrentPath = (String)getFilesystemBrowseStart().getAbsolutePath(); + mCurrentPath = (String)FileUtils.getFilesystemBrowseStart(this).getAbsolutePath(); mPrefEditor = PlaybackService.getSettings(this).edit(); mListAdapter = new FilebrowserStartAdapter((FilebrowserStartActivity)this, 0); mPathDisplay = (TextView) findViewById(R.id.path_display); diff --git a/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java b/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java index c0fc3d33..eb7359db 100644 --- a/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java +++ b/src/ch/blinkenlights/android/vanilla/PlaybackActivity.java @@ -35,7 +35,6 @@ import android.os.HandlerThread; import android.os.Looper; import android.os.Message; import android.os.Process; -import android.os.Environment; import android.view.ContextMenu; import android.view.KeyEvent; import android.view.Menu; @@ -294,17 +293,6 @@ public abstract class PlaybackActivity extends Activity }); } - /** - * Called by FileSystem adapter to get the start folder - * for browsing directories - */ - protected File getFilesystemBrowseStart() { - SharedPreferences prefs = PlaybackService.getSettings(this); - String folder = prefs.getString(PrefKeys.FILESYSTEM_BROWSE_START, PrefDefaults.FILESYSTEM_BROWSE_START); - File fs_start = new File( folder.equals("") ? Environment.getExternalStorageDirectory().getAbsolutePath() : folder ); - return fs_start; - } - /** * Sets up onClick listeners for our common control buttons bar */