The file picker is working and I'm reordering the code to make it easier to follow
This commit is contained in:
David
parent
1b7cece306
commit
4a5190292c
2 changed files with 151 additions and 123 deletions
|
|
@ -18,6 +18,7 @@ import android.preference.Preference;
|
||||||
import android.preference.PreferenceActivity;
|
import android.preference.PreferenceActivity;
|
||||||
import android.preference.PreferenceFragment;
|
import android.preference.PreferenceFragment;
|
||||||
import android.preference.PreferenceManager;
|
import android.preference.PreferenceManager;
|
||||||
|
import android.preference.PreferenceScreen;
|
||||||
import android.support.annotation.LayoutRes;
|
import android.support.annotation.LayoutRes;
|
||||||
import android.support.annotation.NonNull;
|
import android.support.annotation.NonNull;
|
||||||
import android.support.v7.app.ActionBar;
|
import android.support.v7.app.ActionBar;
|
||||||
|
|
@ -57,7 +58,7 @@ import us.shandian.giga.util.Utility;
|
||||||
|
|
||||||
public class SettingsActivity extends PreferenceActivity {
|
public class SettingsActivity extends PreferenceActivity {
|
||||||
|
|
||||||
private static final int REQUEST_INSTALL_ORBOT = 0x1234;
|
public static final int REQUEST_INSTALL_ORBOT = 0x1234;
|
||||||
private AppCompatDelegate mDelegate = null;
|
private AppCompatDelegate mDelegate = null;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -77,117 +78,6 @@ public class SettingsActivity extends PreferenceActivity {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class SettingsFragment extends PreferenceFragment{
|
|
||||||
SharedPreferences.OnSharedPreferenceChangeListener prefListener;
|
|
||||||
|
|
||||||
// get keys
|
|
||||||
String DEFAULT_RESOLUTION_PREFERENCE;
|
|
||||||
String DEFAULT_AUDIO_FORMAT_PREFERENCE;
|
|
||||||
String SEARCH_LANGUAGE_PREFERENCE;
|
|
||||||
String DOWNLOAD_PATH_PREFERENCE;
|
|
||||||
String DOWNLOAD_PATH_AUDIO_PREFERENCE;
|
|
||||||
String USE_TOR_KEY;
|
|
||||||
|
|
||||||
private ListPreference defaultResolutionPreference;
|
|
||||||
private ListPreference defaultAudioFormatPreference;
|
|
||||||
private ListPreference searchLanguagePreference;
|
|
||||||
private Preference downloadPathPreference;
|
|
||||||
private EditTextPreference downloadPathAudioPreference;
|
|
||||||
private CheckBoxPreference useTorCheckBox;
|
|
||||||
private SharedPreferences defaultPreferences;
|
|
||||||
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onCreate(Bundle savedInstanceState) {
|
|
||||||
super.onCreate(savedInstanceState);
|
|
||||||
addPreferencesFromResource(R.xml.settings);
|
|
||||||
|
|
||||||
final Activity activity = getActivity();
|
|
||||||
|
|
||||||
defaultPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
|
|
||||||
|
|
||||||
// get keys
|
|
||||||
DEFAULT_RESOLUTION_PREFERENCE =getString(R.string.default_resolution_key);
|
|
||||||
DEFAULT_AUDIO_FORMAT_PREFERENCE =getString(R.string.default_audio_format_key);
|
|
||||||
SEARCH_LANGUAGE_PREFERENCE =getString(R.string.search_language_key);
|
|
||||||
DOWNLOAD_PATH_PREFERENCE = getString(R.string.download_path_key);
|
|
||||||
DOWNLOAD_PATH_AUDIO_PREFERENCE = getString(R.string.download_path_audio_key);
|
|
||||||
USE_TOR_KEY = getString(R.string.use_tor_key);
|
|
||||||
|
|
||||||
// get pref objects
|
|
||||||
defaultResolutionPreference =
|
|
||||||
(ListPreference) findPreference(DEFAULT_RESOLUTION_PREFERENCE);
|
|
||||||
defaultAudioFormatPreference =
|
|
||||||
(ListPreference) findPreference(DEFAULT_AUDIO_FORMAT_PREFERENCE);
|
|
||||||
searchLanguagePreference =
|
|
||||||
(ListPreference) findPreference(SEARCH_LANGUAGE_PREFERENCE);
|
|
||||||
downloadPathPreference = findPreference(DOWNLOAD_PATH_PREFERENCE);
|
|
||||||
downloadPathAudioPreference =
|
|
||||||
(EditTextPreference) findPreference(DOWNLOAD_PATH_AUDIO_PREFERENCE);
|
|
||||||
useTorCheckBox = (CheckBoxPreference) findPreference(USE_TOR_KEY);
|
|
||||||
|
|
||||||
prefListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
|
|
||||||
@Override
|
|
||||||
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
|
|
||||||
String key) {
|
|
||||||
Activity a = getActivity();
|
|
||||||
if(a != null) {
|
|
||||||
updateSummary();
|
|
||||||
|
|
||||||
if (defaultPreferences.getBoolean(USE_TOR_KEY, false)) {
|
|
||||||
if (OrbotHelper.isOrbotInstalled(a)) {
|
|
||||||
App.configureTor(true);
|
|
||||||
OrbotHelper.requestStartTor(a);
|
|
||||||
} else {
|
|
||||||
Intent intent = OrbotHelper.getOrbotInstallIntent(a);
|
|
||||||
a.startActivityForResult(intent, REQUEST_INSTALL_ORBOT);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
App.configureTor(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
};
|
|
||||||
defaultPreferences.registerOnSharedPreferenceChangeListener(prefListener);
|
|
||||||
|
|
||||||
downloadPathPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener(){
|
|
||||||
@Override
|
|
||||||
public boolean onPreferenceClick(Preference preference) {
|
|
||||||
Intent i = new Intent(getActivity(), FilePickerActivity.class);
|
|
||||||
|
|
||||||
i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false);
|
|
||||||
i.putExtra(FilePickerActivity.EXTRA_ALLOW_CREATE_DIR, true);
|
|
||||||
i.putExtra(FilePickerActivity.EXTRA_MODE, FilePickerActivity.MODE_DIR);
|
|
||||||
startActivityForResult(i, 233);
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
updateSummary();
|
|
||||||
}
|
|
||||||
|
|
||||||
// This is used to show the status of some preference in the description
|
|
||||||
private void updateSummary() {
|
|
||||||
defaultResolutionPreference.setSummary(
|
|
||||||
defaultPreferences.getString(DEFAULT_RESOLUTION_PREFERENCE,
|
|
||||||
getString(R.string.default_resolution_value)));
|
|
||||||
defaultAudioFormatPreference.setSummary(
|
|
||||||
defaultPreferences.getString(DEFAULT_AUDIO_FORMAT_PREFERENCE,
|
|
||||||
getString(R.string.default_audio_format_value)));
|
|
||||||
searchLanguagePreference.setSummary(
|
|
||||||
defaultPreferences.getString(SEARCH_LANGUAGE_PREFERENCE,
|
|
||||||
getString(R.string.default_language_value)));
|
|
||||||
downloadPathPreference.setSummary(
|
|
||||||
defaultPreferences.getString(DOWNLOAD_PATH_PREFERENCE,
|
|
||||||
getString(R.string.download_path_summary)));
|
|
||||||
downloadPathAudioPreference.setSummary(
|
|
||||||
defaultPreferences.getString(DOWNLOAD_PATH_AUDIO_PREFERENCE,
|
|
||||||
getString(R.string.download_path_audio_summary)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
|
||||||
|
|
||||||
|
|
@ -200,7 +90,6 @@ public class SettingsActivity extends PreferenceActivity {
|
||||||
if (clip != null) {
|
if (clip != null) {
|
||||||
for (int i = 0; i < clip.getItemCount(); i++) {
|
for (int i = 0; i < clip.getItemCount(); i++) {
|
||||||
Uri uri = clip.getItemAt(i).getUri();
|
Uri uri = clip.getItemAt(i).getUri();
|
||||||
// Do something with the URI
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// For Ice Cream Sandwich
|
// For Ice Cream Sandwich
|
||||||
|
|
@ -211,25 +100,22 @@ public class SettingsActivity extends PreferenceActivity {
|
||||||
if (paths != null) {
|
if (paths != null) {
|
||||||
for (String path: paths) {
|
for (String path: paths) {
|
||||||
Uri uri = Uri.parse(path);
|
Uri uri = Uri.parse(path);
|
||||||
// Do something with the URI
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
Uri uri = data.getData();
|
Uri uri = data.getData();
|
||||||
// Do something with the URI
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
else if(requestCode == REQUEST_INSTALL_ORBOT)
|
||||||
|
{
|
||||||
// try to start tor regardless of resultCode since clicking back after
|
// try to start tor regardless of resultCode since clicking back after
|
||||||
// installing the app does not necessarily return RESULT_OK
|
// installing the app does not necessarily return RESULT_OK
|
||||||
App.configureTor(requestCode == REQUEST_INSTALL_ORBOT
|
App.configureTor(requestCode == REQUEST_INSTALL_ORBOT
|
||||||
&& OrbotHelper.requestStartTor(this));
|
&& OrbotHelper.requestStartTor(this));
|
||||||
|
|
||||||
|
}
|
||||||
super.onActivityResult(requestCode, resultCode, data);
|
super.onActivityResult(requestCode, resultCode, data);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
142
app/src/main/java/org/schabi/newpipe/SettingsFragment.java
Normal file
142
app/src/main/java/org/schabi/newpipe/SettingsFragment.java
Normal file
|
|
@ -0,0 +1,142 @@
|
||||||
|
package org.schabi.newpipe;
|
||||||
|
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.content.SharedPreferences;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.preference.CheckBoxPreference;
|
||||||
|
import android.preference.EditTextPreference;
|
||||||
|
import android.preference.ListPreference;
|
||||||
|
import android.preference.Preference;
|
||||||
|
import android.preference.PreferenceFragment;
|
||||||
|
import android.preference.PreferenceManager;
|
||||||
|
import android.preference.PreferenceScreen;
|
||||||
|
|
||||||
|
import com.nononsenseapps.filepicker.FilePickerActivity;
|
||||||
|
|
||||||
|
import info.guardianproject.netcipher.proxy.OrbotHelper;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by david on 15/06/16.
|
||||||
|
*/
|
||||||
|
public class SettingsFragment extends PreferenceFragment
|
||||||
|
implements SharedPreferences.OnSharedPreferenceChangeListener
|
||||||
|
{
|
||||||
|
SharedPreferences.OnSharedPreferenceChangeListener prefListener;
|
||||||
|
|
||||||
|
// get keys
|
||||||
|
String DEFAULT_RESOLUTION_PREFERENCE;
|
||||||
|
String DEFAULT_AUDIO_FORMAT_PREFERENCE;
|
||||||
|
String SEARCH_LANGUAGE_PREFERENCE;
|
||||||
|
String DOWNLOAD_PATH_PREFERENCE;
|
||||||
|
String DOWNLOAD_PATH_AUDIO_PREFERENCE;
|
||||||
|
String USE_TOR_KEY;
|
||||||
|
|
||||||
|
private ListPreference defaultResolutionPreference;
|
||||||
|
private ListPreference defaultAudioFormatPreference;
|
||||||
|
private ListPreference searchLanguagePreference;
|
||||||
|
private Preference downloadPathPreference;
|
||||||
|
private EditTextPreference downloadPathAudioPreference;
|
||||||
|
private CheckBoxPreference useTorCheckBox;
|
||||||
|
private SharedPreferences defaultPreferences;
|
||||||
|
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
addPreferencesFromResource(R.xml.settings);
|
||||||
|
|
||||||
|
final Activity activity = getActivity();
|
||||||
|
|
||||||
|
defaultPreferences = PreferenceManager.getDefaultSharedPreferences(activity);
|
||||||
|
|
||||||
|
// get keys
|
||||||
|
DEFAULT_RESOLUTION_PREFERENCE = getString(R.string.default_resolution_key);
|
||||||
|
DEFAULT_AUDIO_FORMAT_PREFERENCE = getString(R.string.default_audio_format_key);
|
||||||
|
SEARCH_LANGUAGE_PREFERENCE = getString(R.string.search_language_key);
|
||||||
|
DOWNLOAD_PATH_PREFERENCE = getString(R.string.download_path_key);
|
||||||
|
DOWNLOAD_PATH_AUDIO_PREFERENCE = getString(R.string.download_path_audio_key);
|
||||||
|
USE_TOR_KEY = getString(R.string.use_tor_key);
|
||||||
|
|
||||||
|
// get pref objects
|
||||||
|
defaultResolutionPreference =
|
||||||
|
(ListPreference) findPreference(DEFAULT_RESOLUTION_PREFERENCE);
|
||||||
|
defaultAudioFormatPreference =
|
||||||
|
(ListPreference) findPreference(DEFAULT_AUDIO_FORMAT_PREFERENCE);
|
||||||
|
searchLanguagePreference =
|
||||||
|
(ListPreference) findPreference(SEARCH_LANGUAGE_PREFERENCE);
|
||||||
|
downloadPathPreference = findPreference(DOWNLOAD_PATH_PREFERENCE);
|
||||||
|
downloadPathAudioPreference =
|
||||||
|
(EditTextPreference) findPreference(DOWNLOAD_PATH_AUDIO_PREFERENCE);
|
||||||
|
useTorCheckBox = (CheckBoxPreference) findPreference(USE_TOR_KEY);
|
||||||
|
|
||||||
|
prefListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
|
||||||
|
@Override
|
||||||
|
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
|
||||||
|
String key) {
|
||||||
|
Activity a = getActivity();
|
||||||
|
|
||||||
|
if(a != null) {
|
||||||
|
updateSummary();
|
||||||
|
|
||||||
|
if (defaultPreferences.getBoolean(USE_TOR_KEY, false)) {
|
||||||
|
if (OrbotHelper.isOrbotInstalled(a)) {
|
||||||
|
App.configureTor(true);
|
||||||
|
OrbotHelper.requestStartTor(a);
|
||||||
|
} else {
|
||||||
|
Intent intent = OrbotHelper.getOrbotInstallIntent(a);
|
||||||
|
a.startActivityForResult(intent, SettingsActivity.REQUEST_INSTALL_ORBOT);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
App.configureTor(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
defaultPreferences.registerOnSharedPreferenceChangeListener(prefListener);
|
||||||
|
|
||||||
|
|
||||||
|
updateSummary();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
|
||||||
|
if(preference.getKey() == downloadPathPreference.getKey())
|
||||||
|
{
|
||||||
|
Activity activity = getActivity();
|
||||||
|
Intent i = new Intent(activity, FilePickerActivity.class);
|
||||||
|
|
||||||
|
i.putExtra(FilePickerActivity.EXTRA_ALLOW_MULTIPLE, false);
|
||||||
|
i.putExtra(FilePickerActivity.EXTRA_ALLOW_CREATE_DIR, true);
|
||||||
|
i.putExtra(FilePickerActivity.EXTRA_MODE, FilePickerActivity.MODE_DIR);
|
||||||
|
|
||||||
|
activity.startActivityForResult(i, 233);
|
||||||
|
}
|
||||||
|
|
||||||
|
return super.onPreferenceTreeClick(preferenceScreen, preference);
|
||||||
|
}
|
||||||
|
|
||||||
|
// This is used to show the status of some preference in the description
|
||||||
|
private void updateSummary() {
|
||||||
|
defaultResolutionPreference.setSummary(
|
||||||
|
defaultPreferences.getString(DEFAULT_RESOLUTION_PREFERENCE,
|
||||||
|
getString(R.string.default_resolution_value)));
|
||||||
|
defaultAudioFormatPreference.setSummary(
|
||||||
|
defaultPreferences.getString(DEFAULT_AUDIO_FORMAT_PREFERENCE,
|
||||||
|
getString(R.string.default_audio_format_value)));
|
||||||
|
searchLanguagePreference.setSummary(
|
||||||
|
defaultPreferences.getString(SEARCH_LANGUAGE_PREFERENCE,
|
||||||
|
getString(R.string.default_language_value)));
|
||||||
|
downloadPathPreference.setSummary(
|
||||||
|
defaultPreferences.getString(DOWNLOAD_PATH_PREFERENCE,
|
||||||
|
getString(R.string.download_path_summary)));
|
||||||
|
downloadPathAudioPreference.setSummary(
|
||||||
|
defaultPreferences.getString(DOWNLOAD_PATH_AUDIO_PREFERENCE,
|
||||||
|
getString(R.string.download_path_audio_summary)));
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Reference in a new issue