dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

moved init to oncreate to try and stop flashing

This commit is contained in:
n8fr8 2012-10-25 15:15:11 +05:30
parent bc9a466189
commit 29573d1c0f
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/org/torproject/android/settings/SettingsPreferences.java
View File

@ -6,27 +6,24 @@ package org.torproject.android.settings;
import java.util.Locale; import java.util.Locale;
import org.torproject.android.R; import org.torproject.android.R;
import org.torproject.android.R.xml;
import org.torproject.android.TorConstants; import org.torproject.android.TorConstants;
import org.torproject.android.service.TorServiceUtils; import org.torproject.android.service.TorServiceUtils;
import org.torproject.android.service.TorTransProxy; import org.torproject.android.service.TorTransProxy;
import com.actionbarsherlock.app.SherlockPreferenceActivity;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Bundle; import android.os.Bundle;
import android.preference.CheckBoxPreference; import android.preference.CheckBoxPreference;
import android.preference.Preference; import android.preference.Preference;
import android.preference.PreferenceManager;
import android.preference.Preference.OnPreferenceClickListener; import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceActivity;
import android.preference.PreferenceCategory; import android.preference.PreferenceCategory;
import android.preference.PreferenceManager;
import android.util.Log; import android.util.Log;
import android.widget.Toast; import android.widget.Toast;
import com.actionbarsherlock.app.SherlockPreferenceActivity;
public class SettingsPreferences public class SettingsPreferences
extends SherlockPreferenceActivity implements OnPreferenceClickListener { extends SherlockPreferenceActivity implements OnPreferenceClickListener {
@ -40,13 +37,13 @@ public class SettingsPreferences
private boolean hasRoot = false; private boolean hasRoot = false;
private final static int HIDDEN_SERVICE_PREF_IDX = 6; private final static int HIDDEN_SERVICE_PREF_IDX = 6;
private final static int TRANSPROXY_GROUP_IDX = 1; private final static int TRANSPROXY_GROUP_IDX = 1;
protected void onCreate(Bundle savedInstanceState) protected void onCreate(Bundle savedInstanceState)
{ {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.preferences); addPreferencesFromResource(R.xml.preferences);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
@ -58,6 +55,8 @@ public class SettingsPreferences
hasRoot = prefs.getBoolean("use_whispercore", false); hasRoot = prefs.getBoolean("use_whispercore", false);
} }
init();
} }
@ -66,6 +65,10 @@ public class SettingsPreferences
super.onResume(); super.onResume();
}
private void init ()
{
int REQUEST_ROOT_IDX = 1; int REQUEST_ROOT_IDX = 1;
int SET_LOCALE_IDX = 3; int SET_LOCALE_IDX = 3;
@ -194,21 +197,11 @@ public class SettingsPreferences
prefcBTransProxyAll.setEnabled(prefCBTransProxy.isChecked()); prefcBTransProxyAll.setEnabled(prefCBTransProxy.isChecked());
prefTransProxyApps.setEnabled(prefCBTransProxy.isChecked() && (!prefcBTransProxyAll.isChecked())); prefTransProxyApps.setEnabled(prefCBTransProxy.isChecked() && (!prefcBTransProxyAll.isChecked()));
if (!prefCBTransProxy.isChecked())
clearTransProxyState ();
} }
return true; return true;
} }
private void clearTransProxyState ()
{
try {
new TorTransProxy().clearTransparentProxyingAll(this);
} catch (Exception e) {
Log.e(TorConstants.TAG,"error flushing iptables",e);
}
}
} }